From 67d73657a95b3cc7da7d3361bb5ab17be00b6bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Mon, 2 Jan 2017 02:45:57 +0100 Subject: [PATCH] Revert "libgit2: reinit at 0.23.2" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2e15a8f2dde53484082d48b14d3557b8009f61ac. libgit2 v0.23.2 is no longer necessary due to edbe73dc13e6090269f0d8b2bb759c7957a83ec1 Signed-off-by: Maximilian Güntner --- pkgs/development/libraries/git2/0.23.nix | 27 ------------------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 28 deletions(-) delete mode 100644 pkgs/development/libraries/git2/0.23.nix diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix deleted file mode 100644 index 3cf429ab1d7..00000000000 --- a/pkgs/development/libraries/git2/0.23.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: - -stdenv.mkDerivation (rec { - version = "0.23.2"; - name = "libgit2-${version}"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; - }; - - cmakeFlags = "-DTHREADSAFE=ON"; - - nativeBuildInputs = [ cmake python pkgconfig ]; - buildInputs = [ zlib libssh2 openssl http-parser ]; - - meta = { - description = "the Git linkable library"; - homepage = http://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - }; -} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { - NIX_LDFLAGS = "-liconv"; - propagatedBuildInputs = [ libiconv ]; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d0675116ab..de561fa6391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7202,7 +7202,6 @@ in ); libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; - libgit2_0_23 = callPackage ../development/libraries/git2/0.23.nix { }; gle = callPackage ../development/libraries/gle { };