diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-04 18:10:02 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-04 18:10:02 +0100 |
commit | 712ccefd39a5a71287ada2c7441c28e5cdd80f08 (patch) | |
tree | cff1dac3f607ae7c3a04759f89db4c43de685a76 /virtual/eldiron.nix | |
parent | 5c101474d350289370105c99bbf65f8bb3a4ef39 (diff) | |
download | Nix-712ccefd39a5a71287ada2c7441c28e5cdd80f08.tar.gz Nix-712ccefd39a5a71287ada2c7441c28e5cdd80f08.tar.zst Nix-712ccefd39a5a71287ada2c7441c28e5cdd80f08.zip |
Add overriden packages in main file
Diffstat (limited to 'virtual/eldiron.nix')
-rw-r--r-- | virtual/eldiron.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 63106d6..280b69a 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix | |||
@@ -7,19 +7,20 @@ | |||
7 | eldiron = { config, pkgs, ... }: | 7 | eldiron = { config, pkgs, ... }: |
8 | with import ../libs.nix; | 8 | with import ../libs.nix; |
9 | let | 9 | let |
10 | mypkgs = nixpkgs_unstable.callPackage ./packages.nix { | 10 | mypkgs = pkgs.callPackage ./packages.nix { |
11 | inherit checkEnv fetchedGitPrivate fetchedGithub; | 11 | inherit checkEnv fetchedGitPrivate fetchedGithub; |
12 | gitwebOverride = nixpkgs_unstable.gitweb.overrideAttrs(old: { | ||
13 | installPhase = old.installPhase + '' | ||
14 | cp -r ${./packages/gitweb} $out/gitweb-theme; | ||
15 | ''; | ||
16 | }); | ||
17 | }; | 12 | }; |
18 | in | 13 | in |
19 | { | 14 | { |
20 | # FIXME: they are not overriden in packages.nix | 15 | # FIXME: they are not overriden in packages.nix |
21 | # (see nix-store -q --tree /nix/var/nix/profiles/system) | 16 | # (see nix-store -q --tree /nix/var/nix/profiles/system) |
22 | nixpkgs.config.packageOverrides = oldpkgs: rec { | 17 | nixpkgs.config.packageOverrides = oldpkgs: rec { |
18 | gitolite = nixpkgs_unstable.gitolite; | ||
19 | gitweb = oldpkgs.gitweb.overrideAttrs(old: { | ||
20 | installPhase = old.installPhase + '' | ||
21 | cp -r ${./packages/gitweb} $out/gitweb-theme; | ||
22 | ''; | ||
23 | }); | ||
23 | postgresql = postgresql111; | 24 | postgresql = postgresql111; |
24 | postgresql111 = oldpkgs.postgresql100.overrideAttrs(old: rec { | 25 | postgresql111 = oldpkgs.postgresql100.overrideAttrs(old: rec { |
25 | passthru = old.passthru // { psqlSchema = "11.0"; }; | 26 | passthru = old.passthru // { psqlSchema = "11.0"; }; |