diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2018-07-27 13:35:24 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2018-07-27 13:35:24 +0100 |
| commit | f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab (patch) | |
| tree | 9a430526ade2b2c3455b338b3ea2c8fbaed8dbc9 /pkgs | |
| parent | 84c75d5a504fb74014794945980982c19f3df203 (diff) | |
| download | nixlib-f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab.tar nixlib-f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab.tar.gz nixlib-f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab.tar.bz2 nixlib-f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab.tar.lz nixlib-f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab.tar.xz nixlib-f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab.tar.zst nixlib-f026e85080bae5993fc2c2fd433b3b5e1d1ec9ab.zip | |
libgit2_0_25: remove
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/git2/0.25.nix | 36 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 9 |
2 files changed, 2 insertions, 43 deletions
diff --git a/pkgs/development/libraries/git2/0.25.nix b/pkgs/development/libraries/git2/0.25.nix deleted file mode 100644 index 6bb1de2cf348..000000000000 --- a/pkgs/development/libraries/git2/0.25.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, python -, zlib, libssh2, openssl, http-parser, curl -, libiconv, Security -}: - -stdenv.mkDerivation rec { - version = "0.25.1"; - name = "libgit2-${version}"; - - src = fetchFromGitHub { - owner = "libgit2"; - repo = "libgit2"; - rev = "v${version}"; - sha256 = "1jhikg0gqpdzfzhgv44ybdpm24lvgkc7ki4306lc5lvmj1s2nylj"; - }; - - cmakeFlags = [ "-DTHREADSAFE=ON" ]; - - nativeBuildInputs = [ cmake python pkgconfig ]; - - buildInputs = [ zlib libssh2 openssl http-parser curl ] - ++ stdenv.lib.optional stdenv.isDarwin Security; - - propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; - - enableParallelBuilding = true; - - doCheck = false; # hangs. or very expensive? - - meta = { - description = "The Git linkable library"; - homepage = https://libgit2.github.com/; - license = stdenv.lib.licenses.gpl2; - platforms = with stdenv.lib.platforms; all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3687b45856c..3cc36804527c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6796,7 +6796,6 @@ with pkgs; julia_05 = callPackage ../development/compilers/julia/0.5.nix { gmp = gmp6; - libgit2 = libgit2_0_25; openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; llvm = llvm_38; @@ -9335,10 +9334,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; - libgit2_0_25 = callPackage ../development/libraries/git2/0.25.nix { - inherit (darwin.apple_sdk.frameworks) Security; - }; - libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -11868,7 +11863,7 @@ with pkgs; sofia_sip = callPackage ../development/libraries/sofia-sip { }; soil = callPackage ../development/libraries/soil { }; - + sonic = callPackage ../development/libraries/sonic { }; soprano = callPackage ../development/libraries/soprano { }; @@ -20943,7 +20938,7 @@ with pkgs; spyder = pythonPackages.spyder; openspace = callPackage ../applications/science/astronomy/openspace { }; - + stellarium = libsForQt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip { |