##// END OF EJS Templates
packaging: use common structure that rhodecode-enterprise-ce is using for easier diffs
marcink -
r568:b4b7374c default
parent child
Show More
@@ -15,15 +15,13 let pkgs_ = (import <nixpkgs> {}); in
15 15
16 16 let
17 17
18 # TODO: Currently we ignore the passed in pkgs, instead we should use it
19 # somehow as a base and apply overlays to it.
20 pkgs = import <nixpkgs> {
18 pkgs = args.pkgs or (import <nixpkgs> {
21 19 overlays = [
22 20 (import ./pkgs/overlays.nix)
23 21 ];
24 22 inherit (pkgs_)
25 23 system;
26 };
24 });
27 25
28 26 # Works with the new python-packages, still can fallback to the old
29 27 # variant.
@@ -10,7 +10,6 let
10 10
11 11 vcsserver = import ./default.nix {
12 12 inherit
13 pkgs
14 13 doCheck;
15 14 };
16 15
General Comments 0
You need to be logged in to leave comments. Login now