##// END OF EJS Templates
packages: use common overlay structure that vcsserver uses.
marcink -
r3140:00e2e53b default
parent child
Show More
@@ -0,0 +1,3
1 self: super: {
2
3 }
@@ -24,12 +24,19 args@
24 , doCheck ? false
24 , doCheck ? false
25 , ...
25 , ...
26 }:
26 }:
27 let pkgs_ = (import <nixpkgs> {}); in
27
28
28 let
29 let
29 # Use nixpkgs from args or import them. We use this indirect approach
30 # Use nixpkgs from args or import them. We use this indirect approach
30 # through args to be able to use the name `pkgs` for our customized packages.
31 # through args to be able to use the name `pkgs` for our customized packages.
31 # Otherwise we will end up with an infinite recursion.
32 # Otherwise we will end up with an infinite recursion.
32 pkgs = args.pkgs or (import <nixpkgs> { });
33 pkgs = args.pkgs or (import <nixpkgs> {
34 overlays = [
35 (import ./pkgs/overlays.nix)
36 ];
37 inherit (pkgs_)
38 system;
39 });
33
40
34 # Works with the new python-packages, still can fallback to the old
41 # Works with the new python-packages, still can fallback to the old
35 # variant.
42 # variant.
@@ -14,7 +14,6 let
14
14
15 enterprise-ce = import ./default.nix {
15 enterprise-ce = import ./default.nix {
16 inherit
16 inherit
17 pkgs
18 pythonPackages
17 pythonPackages
19 doCheck;
18 doCheck;
20 };
19 };
General Comments 0
You need to be logged in to leave comments. Login now