nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 03:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

libgit2: remove 0.26, default to 0.27

Browse Source
This commit is contained in:
Franz Pletz 2019-06-17 09:47:10 +02:00 committed by Frederik Rietdijk
parent 6daac686c5
commit 10812379fa
6 changed files with 19 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/gitstatus/romkatv_libgit2.nix
View File

@ -1,6 +1,6 @@
{fetchFromGitHub, libgit2_0_27, ...}:
{fetchFromGitHub, libgit2, ...}:
libgit2_0_27.overrideAttrs (oldAttrs: rec {
libgit2.overrideAttrs (oldAttrs: rec {
cmakeFlags = oldAttrs.cmakeFlags ++ [
"-DUSE_BUNDLED_ZLIB=ON"
"-DUSE_ICONV=OFF"

4
pkgs/applications/version-management/git-and-tools/grv/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2_0_27, ncurses, pkgconfig, readline }:
{ stdenv, buildGoPackage, fetchFromGitHub, curl, libgit2, ncurses, pkgconfig, readline }:
let
version = "0.3.1";
in
buildGoPackage {
name = "grv-${version}";
buildInputs = [ ncurses readline curl libgit2_0_27 ];
buildInputs = [ ncurses readline curl libgit2 ];
nativeBuildInputs = [ pkgconfig ];
goPackagePath = "github.com/rgburke/grv";

36
pkgs/development/libraries/git2/0.27.nix
View File

@ -1,36 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
, zlib, libssh2, openssl, http-parser, curl
, libiconv, Security
}:
stdenv.mkDerivation rec {
version = "0.27.8";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
};
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;
};
}

23
pkgs/development/libraries/git2/default.nix
View File

@ -1,18 +1,18 @@
{ stdenv, fetchFromGitHub, pkgconfig, cmake
, zlib, python, libssh2, openssl, curl, http-parser
{ stdenv, fetchFromGitHub, cmake, pkgconfig, python
, zlib, libssh2, openssl, http-parser, curl
, libiconv, Security
}:
stdenv.mkDerivation (rec {
name = "libgit2-${version}";
version = "0.26.6";
stdenv.mkDerivation rec {
pname = "libgit2";
version = "0.27.8";
# keep the version in sync with pythonPackages.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
sha256 = "0wzx8nkyy9m7mx6cks58chjd4289vjsw97mxm9w6f1ggqsfnmbr9";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
@ -22,17 +22,16 @@ stdenv.mkDerivation (rec {
buildInputs = [ zlib libssh2 openssl http-parser curl ]
++ stdenv.lib.optional stdenv.isDarwin Security;
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) [ libiconv ];
propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
enableParallelBuilding = true;
doCheck = false; # hangs. or very expensive?
meta = with stdenv.lib; {
meta = {
description = "The Git linkable library";
homepage = https://libgit2.github.com/;
license = licenses.gpl2;
platforms = with platforms; all;
license = stdenv.lib.licenses.gpl2;
platforms = with stdenv.lib.platforms; all;
};
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
})
}

6
pkgs/development/python-modules/pygit2/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2_0_27, six, cffi }:
{ stdenv, lib, buildPythonPackage, fetchPypi, fetchpatch, isPyPy, libgit2, six, cffi }:
buildPythonPackage rec {
pname = "pygit2";
@ -10,7 +10,7 @@ buildPythonPackage rec {
};
preConfigure = lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="${libgit2_0_27}/lib"
export DYLD_LIBRARY_PATH="${libgit2}/lib"
'';
patches = [ (fetchpatch {
@ -19,7 +19,7 @@ buildPythonPackage rec {
sha256 = "18x1fpmywhjjr4lvakwmy34zpxfqi8pqqj48g1wcib39lh3s7l4f";
}) ];
propagatedBuildInputs = [ libgit2_0_27 six ] ++ lib.optional (!isPyPy) cffi;
propagatedBuildInputs = [ libgit2 six ] ++ lib.optional (!isPyPy) cffi;
preCheck = ''
# disable tests that require networking

8
pkgs/top-level/all-packages.nix
View File

@ -1083,9 +1083,7 @@ in
blockdiag = with python3Packages; toPythonApplication blockdiag;
blsd = callPackage ../tools/misc/blsd {
libgit2 = libgit2_0_27;
};
blsd = callPackage ../tools/misc/blsd { };
bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { };
@ -10512,10 +10510,6 @@ in
inherit (darwin.apple_sdk.frameworks) Security;
};
libgit2_0_27 = callPackage ../development/libraries/git2/0.27.nix {
inherit (darwin.apple_sdk.frameworks) Security;
};
libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
glbinding = callPackage ../development/libraries/glbinding { };