yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update python to 3.8

Browse source
This commit is contained in:
DavHau 2021-05-23 13:05:16 +07:00
parent 038f820668
commit 46f7940ded
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interpreter.nix
View file

@ -1,7 +1,7 @@
# python interpreter for dev environment # python interpreter for dev environment
let let
pkgs = import (import ./mach_nix/nix/nixpkgs-src.nix) { config = {}; }; pkgs = import (import ./mach_nix/nix/nixpkgs-src.nix) { config = {}; };
python = pkgs.python37; python = pkgs.python38;
deps = (pkgs.lib.attrValues (import ./mach_nix/nix/python-deps.nix { inherit python; fetchurl = pkgs.fetchurl; })); deps = (pkgs.lib.attrValues (import ./mach_nix/nix/python-deps.nix { inherit python; fetchurl = pkgs.fetchurl; }));
in in
python.withPackages (ps: deps ++ [ python.withPackages (ps: deps ++ [

4
mach_nix/nix/compileOverrides.nix
View file

@ -12,8 +12,8 @@ let
nixpkgs_json = import ./nixpkgs-json.nix { nixpkgs_json = import ./nixpkgs-json.nix {
inherit overrides pkgs python; inherit overrides pkgs python;
}; };
builder_python = pkgs.pkgsBuildHost.python37.withPackages(ps: builder_python = pkgs.pkgsBuildHost.python38.withPackages(ps:
(pkgs.lib.attrValues (import ./python-deps.nix {python = pkgs.python37; fetchurl = pkgs.fetchurl; })) (pkgs.lib.attrValues (import ./python-deps.nix {python = pkgs.python38; fetchurl = pkgs.fetchurl; }))
); );
src = ./../../.; src = ./../../.;
db_and_fetcher = import ./deps-db-and-fetcher.nix { db_and_fetcher = import ./deps-db-and-fetcher.nix {

2
mach_nix/nix/python.nix
View file

@ -4,7 +4,7 @@
}: }:
with pkgs; with pkgs;
let let
python = python37; python = python38;
python_deps = (lib.attrValues (import ./python-deps.nix { inherit python; fetchurl = fetchurl; })); python_deps = (lib.attrValues (import ./python-deps.nix { inherit python; fetchurl = fetchurl; }));
in in
python.withPackages ( ps: python_deps ) python.withPackages ( ps: python_deps )

2
shell.nix
View file

@ -4,7 +4,7 @@
}: }:
with pkgs; with pkgs;
let let
python = python37; python = python38;
machnixDeps = (lib.attrValues (import ./mach_nix/nix/python-deps.nix { inherit python; fetchurl = fetchurl; })); machnixDeps = (lib.attrValues (import ./mach_nix/nix/python-deps.nix { inherit python; fetchurl = fetchurl; }));
in in
mkShell { mkShell {