diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index a66b3ba6322..d57e7e856a3 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -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 diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 626f4652ece..536e0f52a2d 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -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 { }; diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 48d595137b3..358fc31fc80 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (rec { name = "libgit2-${version}"; 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 { owner = "libgit2"; diff --git a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix similarity index 80% rename from pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix rename to pkgs/development/libraries/libgit2-glib/default.nix index 8d078ea41e7..477a4a63431 100644 --- a/pkgs/desktops/gnome-3/misc/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -2,11 +2,11 @@ , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { - name = "libgit2-glib-${version}"; + pname = "libgit2-glib"; version = "0.26.4"; 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"; }; @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { packageName = "libgit2-glib"; attrPath = "gnome3.libgit2-glib"; }; + updateScript = gnome3.updateScript { + packageName = pname; + }; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad64b26bffd..5e1b04774ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9891,6 +9891,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + libgit2-glib = callPackage ../development/libraries/libgit2-glib { }; + glbinding = callPackage ../development/libraries/glbinding { }; gle = callPackage ../development/libraries/gle { };