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

libgit2-glib: move to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2018-12-14 16:05:44 +01:00
parent aead6e12f9
commit 4c40adceb9
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
5 changed files with 11 additions and 8 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 , flatpak
, glibcLocales , glibcLocales
, gnome3 , gnome3
, libgit2-glib
, gobject-introspection , gobject-introspection
, gspell , gspell
, gtk-doc , gtk-doc
@ -61,7 +62,7 @@ in stdenv.mkDerivation {
ctags ctags
flatpak flatpak
gnome3.devhelp gnome3.devhelp
gnome3.libgit2-glib libgit2-glib
gnome3.libpeas gnome3.libpeas
gnome3.vte gnome3.vte
gspell gspell

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 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage 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; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; 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 { }; libgnome-games-support = callPackage ./misc/libgnome-games-support { };
libgit2-glib = callPackage ./misc/libgit2-glib { };
libmediaart = callPackage ./misc/libmediaart { }; libmediaart = callPackage ./misc/libmediaart { };
gexiv2 = callPackage ./misc/gexiv2 { }; gexiv2 = callPackage ./misc/gexiv2 { };

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

@ -6,7 +6,7 @@
stdenv.mkDerivation (rec { stdenv.mkDerivation (rec {
name = "libgit2-${version}"; name = "libgit2-${version}";
version = "0.26.6"; version = "0.26.6";
# keep the version in sync with pythonPackages.pygit2 and gnome3.libgit2-glib # keep the version in sync with pythonPackages.pygit2 and libgit2-glib
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "libgit2"; owner = "libgit2";

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

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

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

@ -9891,6 +9891,8 @@ in
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
libgit2-glib = callPackage ../development/libraries/libgit2-glib { };
glbinding = callPackage ../development/libraries/glbinding { }; glbinding = callPackage ../development/libraries/glbinding { };
gle = callPackage ../development/libraries/gle { }; gle = callPackage ../development/libraries/gle { };