public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #52068 from jtojnar/libglib2-0.27 

libgit2: drop 0.26
This commit is contained in:
Jan Tojnar 2018-12-16 23:22:12 +01:00 committed by GitHub
parent 3c0edcbb45 cc50638176
commit 5dac5e1f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 35 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/editors/gnome-builder/default.nix
View File

@ -7,6 +7,7 @@
, flatpak
, glibcLocales
, gnome3
, libgit2-glib
, gobject-introspection
, gspell
, gtk-doc
@ -61,7 +62,7 @@ in stdenv.mkDerivation {
ctags
flatpak
gnome3.devhelp
gnome3.libgit2-glib
libgit2-glib
gnome3.libpeas
gnome3.vte
gspell

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

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

4
pkgs/desktops/gnome-3/default.nix
View File

@ -38,7 +38,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda;
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib;
libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -371,8 +371,6 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnome-games-support = callPackage ./misc/libgnome-games-support { };
libgit2-glib = callPackage ./misc/libgit2-glib { };
libmediaart = callPackage ./misc/libmediaart { };
gexiv2 = callPackage ./misc/gexiv2 { };

9
pkgs/desktops/gnome-3/misc/gitg/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, vala, intltool, pkgconfig, gtk3, glib
{ stdenv, fetchurl, fetchpatch, vala, intltool, pkgconfig, gtk3, glib
, json-glib, wrapGAppsHook, libpeas, bash, gobject-introspection
, gnome3, gtkspell3, shared-mime-info, libgee, libgit2-glib, libsecret
, meson, ninja, python3
@ -15,6 +15,13 @@ in stdenv.mkDerivation rec {
sha256 = "1fz8q1aiql6k740savdjh0vzbyhcflgf94cfdhvzcrrvm929n2ss";
};
patches = [
(fetchpatch {
url = https://gitlab.gnome.org/GNOME/gitg/commit/42bceea265f53fe7fd4a41037b936deed975fc6c.patch;
sha256 = "1xq245rsi1bi66lswk33pdiazfaagxf77836ds5q73900rx4r7fw";
})
];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py

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.7";
name = "libgit2-${version}";
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha";
};
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;
};
}

19
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";
# keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib
stdenv.mkDerivation rec {
pname = "libgit2";
version = "0.27.7";
# keep the version in sync with pythonPackages.pygit2 and libgit2-glib
src = fetchFromGitHub {
owner = "libgit2";
repo = "libgit2";
rev = "v${version}";
sha256 = "17pjvprmdrx4h6bb1hhc98w9qi6ki7yl57f090n9kbhswxqfs7s3";
sha256 = "1q3mp7xjpbmdsnk4sdzf2askbb4pgbxcmr1h7y7zk2738dndwkha";
};
cmakeFlags = [ "-DTHREADSAFE=ON" ];
@ -22,7 +22,7 @@ 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;
@ -34,5 +34,4 @@ stdenv.mkDerivation (rec {
license = licenses.gpl2;
platforms = with platforms; all;
};
} // stdenv.lib.optionalAttrs (!stdenv.isLinux) {
})
}

13
pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix → pkgs/development/libraries/libgit2-glib/default.nix
View File

@ -2,12 +2,12 @@
, gtk-doc, gobject-introspection, libgit2, glib, python3 }:
stdenv.mkDerivation rec {
name = "libgit2-glib-${version}";
version = "0.26.4";
pname = "libgit2-glib";
version = "0.27.7";
src = fetchurl {
url = "mirror://gnome/sources/libgit2-glib/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
sha256 = "0nhyqas110q7ingw97bvyjdb7v4dzch517dq8sn8c33s8910wqcp";
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1hpgs8dx0dk25mc8jsizi2cwwhnmahrn3dyry9p7a1g48mnxyc8i";
};
postPatch = ''
@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
'';
passthru = {
updateScript = gnome3.updateScript { packageName = "libgit2-glib"; attrPath = "gnome3.libgit2-glib"; };
updateScript = gnome3.updateScript {
packageName = pname;
versionPolicy = "none";
};
};
nativeBuildInputs = [

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

@ -993,9 +993,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 { };
@ -9887,9 +9885,7 @@ 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 { };