From 712ccefd39a5a71287ada2c7441c28e5cdd80f08 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Fri, 4 Jan 2019 18:10:02 +0100
Subject: [PATCH] Add overriden packages in main file

---
 virtual/eldiron.nix  | 13 +++++++------
 virtual/packages.nix |  4 ++--
 2 files changed, 9 insertions(+), 8 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 @@
   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 f3689b6..03c8b89 100644
--- 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
   {
-- 
2.41.0