Add overriden packages in main file

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 63106d603da53da37694a1fa8d4c1f659b80fcf7..280b69a989f15cfc48ebbc34eb3d7caf68eaca46 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -7,19 +7,20 @@
   eldiron = { config, pkgs, ... }:
     with import ../libs.nix;
     let
-        mypkgs = nixpkgs_unstable.callPackage ./packages.nix {
+        mypkgs = pkgs.callPackage ./packages.nix {
           inherit checkEnv fetchedGitPrivate fetchedGithub;
-          gitwebOverride = nixpkgs_unstable.gitweb.overrideAttrs(old: {
-            installPhase = old.installPhase + ''
-              cp -r ${./packages/gitweb} $out/gitweb-theme;
-              '';
-          });
         };
     in
   {
     # FIXME: they are not overriden in packages.nix
     # (see nix-store -q --tree /nix/var/nix/profiles/system)
     nixpkgs.config.packageOverrides = oldpkgs: rec {
+      gitolite = nixpkgs_unstable.gitolite;
+      gitweb = oldpkgs.gitweb.overrideAttrs(old: {
+        installPhase = old.installPhase + ''
+          cp -r ${./packages/gitweb} $out/gitweb-theme;
+          '';
+      });
       postgresql = postgresql111;
       postgresql111 = oldpkgs.postgresql100.overrideAttrs(old: rec {
         passthru = old.passthru // { psqlSchema = "11.0"; };

diff --git a/virtual/packages.nix b/virtual/packages.nix
index f3689b612d63e83b53739e3a5284b66e1f10df1e..03c8b891617f97e96331e4b1b45f6a28284bc9bc 100644 (file)
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -1,10 +1,10 @@
-{ callPackage, checkEnv, fetchedGitPrivate, fetchedGithub, gitwebOverride }:
+{ callPackage, checkEnv, fetchedGitPrivate, fetchedGithub }:
 let
   connexionswing = callPackage ./packages/connexionswing.nix { inherit checkEnv fetchedGitPrivate; };
   nextcloud = callPackage ./packages/nextcloud.nix { inherit checkEnv; };
   adminer = callPackage ./packages/adminer.nix {};
   ympd = callPackage ./packages/ympd.nix {};
-  gitweb = callPackage ./packages/gitweb.nix { gitweb = gitwebOverride; };
+  gitweb = callPackage ./packages/gitweb.nix {};
   mantisbt = callPackage ./packages/mantisbt.nix { inherit checkEnv fetchedGithub; };
 in
   {