mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-18 02:40:07 +00:00
add a python3 expression
most deps are in nixpkgs now but we still need an overlay for th very very recent collections-extended dependency
This commit is contained in:
parent
49ee4b8acf
commit
5a3028bdab
@ -449,6 +449,7 @@ jobs:
|
|||||||
|
|
||||||
environment:
|
environment:
|
||||||
NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.09-small.tar.gz"
|
NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.09-small.tar.gz"
|
||||||
|
SOURCE: "nix/"
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- "checkout"
|
- "checkout"
|
||||||
@ -465,7 +466,7 @@ jobs:
|
|||||||
# build a couple simple little dependencies that don't take
|
# build a couple simple little dependencies that don't take
|
||||||
# advantage of multiple cores and we get a little speedup by doing
|
# advantage of multiple cores and we get a little speedup by doing
|
||||||
# them in parallel.
|
# them in parallel.
|
||||||
nix-build --cores 3 --max-jobs 2 nix/
|
nix-build --cores 3 --max-jobs 2 "$SOURCE"
|
||||||
|
|
||||||
nixos-21-05:
|
nixos-21-05:
|
||||||
<<: *NIXOS
|
<<: *NIXOS
|
||||||
@ -474,7 +475,8 @@ jobs:
|
|||||||
# Note this doesn't look more similar to the 19.09 NIX_PATH URL because
|
# Note this doesn't look more similar to the 19.09 NIX_PATH URL because
|
||||||
# there was some internal shuffling by the NixOS project about how they
|
# there was some internal shuffling by the NixOS project about how they
|
||||||
# publish stable revisions.
|
# publish stable revisions.
|
||||||
NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-21.05-small.tar.gz"
|
NIX_PATH: "nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/d32b07e6df276d78e3640eb43882b80c9b2b3459.tar.gz"
|
||||||
|
SOURCE: "nix/py3.nix"
|
||||||
|
|
||||||
typechecks:
|
typechecks:
|
||||||
docker:
|
docker:
|
||||||
|
@ -23,4 +23,11 @@ self: super: {
|
|||||||
collections-extended = python-super.pythonPackages.callPackage ./collections-extended.nix { };
|
collections-extended = python-super.pythonPackages.callPackage ./collections-extended.nix { };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
python39 = super.python39.override {
|
||||||
|
packageOverrides = python-self: python-super: {
|
||||||
|
# collections-extended is not part of nixpkgs at this time.
|
||||||
|
collections-extended = python-super.pythonPackages.callPackage ./collections-extended.nix { };
|
||||||
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
7
nix/py3.nix
Normal file
7
nix/py3.nix
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
# This is the main entrypoint for the Tahoe-LAFS derivation.
|
||||||
|
{ pkgs ? import <nixpkgs> { } }:
|
||||||
|
# Add our Python packages to nixpkgs to simplify the expression for the
|
||||||
|
# Tahoe-LAFS derivation.
|
||||||
|
let pkgs' = pkgs.extend (import ./overlays.nix);
|
||||||
|
# Evaluate the expression for our Tahoe-LAFS derivation.
|
||||||
|
in pkgs'.python39.pkgs.callPackage ./tahoe-lafs.nix { }
|
Loading…
Reference in New Issue
Block a user