summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-11-05 05:03:17 +0000
committerOrivej Desh <orivej@gmx.fr>2017-11-05 18:43:30 +0000
commitce1b0c05a52f70fbf03c277018384c9bac3fdf56 (patch)
tree7ea5eb4da737c3831c277fcbd67d88c099a66493 /pkgs/top-level
parent1aef6f40bbbe3348986058a12898e57afd4c0ba6 (diff)
downloadnixlib-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar
nixlib-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.gz
nixlib-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.bz2
nixlib-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.lz
nixlib-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.xz
nixlib-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.tar.zst
nixlib-ce1b0c05a52f70fbf03c277018384c9bac3fdf56.zip
libgit2: 0.25.1 -> 0.26.0
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix10
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e87a3f73472f..b02213de79d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8293,11 +8293,13 @@ with pkgs;
 
   icon-lang = callPackage ../development/interpreters/icon-lang { };
 
-  libgit2 = callPackage ../development/libraries/git2 (
-    stdenv.lib.optionalAttrs stdenv.isDarwin {
+  inherit (rec {
+    arg = stdenv.lib.optionalAttrs stdenv.isDarwin {
       inherit (darwin) libiconv;
-    }
-  );
+    };
+    libgit2 = callPackage ../development/libraries/git2 arg;
+    libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix arg;
+  }) libgit2 libgit2_0_25;
 
   gle = callPackage ../development/libraries/gle { };