Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

libgit2: add 0.21.x version as it's incompatible with the new 0.23

+28 -1
+2 -1
pkgs/desktops/gnome-3/3.16/default.nix
··· 369 370 gitg = callPackage ./misc/gitg { 371 webkitgtk = webkitgtk24x; 372 }; 373 374 libgda = callPackage ./misc/libgda { }; 375 376 libgit2-glib = callPackage ./misc/libgit2-glib { 377 - libgit2 = pkgs.libgit2.override { libssh2 = null; }; 378 }; 379 380 libmediaart = callPackage ./misc/libmediaart { };
··· 369 370 gitg = callPackage ./misc/gitg { 371 webkitgtk = webkitgtk24x; 372 + libgit2 = pkgs.libgit2_0_21; 373 }; 374 375 libgda = callPackage ./misc/libgda { }; 376 377 libgit2-glib = callPackage ./misc/libgit2-glib { 378 + libgit2 = pkgs.libgit2_0_21.override { libssh2 = null; }; 379 }; 380 381 libmediaart = callPackage ./misc/libmediaart { };
+24
pkgs/development/libraries/git2/0.21.nix
···
··· 1 + {stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}: 2 + 3 + stdenv.mkDerivation rec { 4 + version = "0.21.2"; 5 + name = "libgit2-${version}"; 6 + 7 + src = fetchurl { 8 + name = "${name}.tar.gz"; 9 + url = "https://github.com/libgit2/libgit2/tarball/v${version}"; 10 + sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y"; 11 + }; 12 + 13 + cmakeFlags = "-DTHREADSAFE=ON"; 14 + 15 + nativeBuildInputs = [ cmake python ]; 16 + buildInputs = [ zlib libssh2 openssl http-parser ]; 17 + 18 + meta = { 19 + description = "the Git linkable library"; 20 + homepage = http://libgit2.github.com/; 21 + license = stdenv.lib.licenses.gpl2; 22 + platforms = with stdenv.lib.platforms; all; 23 + }; 24 + }
+2
pkgs/top-level/all-packages.nix
··· 6276 6277 libgit2 = callPackage ../development/libraries/git2 { }; 6278 6279 glew = callPackage ../development/libraries/glew { }; 6280 6281 glfw = glfw3;
··· 6276 6277 libgit2 = callPackage ../development/libraries/git2 { }; 6278 6279 + libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; 6280 + 6281 glew = callPackage ../development/libraries/glew { }; 6282 6283 glfw = glfw3;