mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00
Code Issues Wiki Activity

libgee: rename from gnome3.libgee

Browse source
This commit is contained in:
Jan Tojnar 2018-12-25 04:34:57 +01:00
parent df89d4ce41
commit 7ca5ec11b0
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
3 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 gtksourceviewmm gtksourceview4 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm 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 libgit2-glib libgxps libgdata libgepub libcroco libpeas; clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee;
libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libsoup = pkgs.libsoup.override { gnomeSupport = true; };
libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
@ -161,8 +161,6 @@ lib.makeScope pkgs.newScope (self: with self; {
eog = callPackage ./core/eog { }; eog = callPackage ./core/eog { };
libgee = callPackage ./core/libgee { };
libgweather = callPackage ./core/libgweather { }; libgweather = callPackage ./core/libgweather { };
libzapojit = callPackage ./core/libzapojit { }; libzapojit = callPackage ./core/libzapojit { };

9
pkgs/desktops/gnome-3/core/libgee/default.nix → pkgs/development/libraries/libgee/default.nix
View file

@ -1,15 +1,13 @@
{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }: { stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobject-introspection, gnome3 }:
let
stdenv.mkDerivation rec {
pname = "libgee"; pname = "libgee";
version = "0.20.1"; version = "0.20.1";
in
stdenv.mkDerivation rec {
name = "${pname}-${version}";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v"; sha256 = "0c26x8gi3ivmhlbqcmiag4jwrkvcy28ld24j55nqr3jikb904a5v";
}; };
@ -24,7 +22,6 @@ stdenv.mkDerivation rec {
passthru = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {
packageName = pname; packageName = pname;
attrPath = "gnome3.${pname}";
}; };
}; };

20
pkgs/top-level/all-packages.nix
View file

@ -1981,7 +1981,7 @@ in
libpinyin = callPackage ../development/libraries/libpinyin { }; libpinyin = callPackage ../development/libraries/libpinyin { };
libskk = callPackage ../development/libraries/libskk { libskk = callPackage ../development/libraries/libskk {
inherit (gnome3) gnome-common libgee; inherit (gnome3) gnome-common;
}; };
m17n_db = callPackage ../tools/inputmethods/m17n-db { }; m17n_db = callPackage ../tools/inputmethods/m17n-db { };
@ -1999,9 +1999,7 @@ in
inherit (pythonPackages) marisa; inherit (pythonPackages) marisa;
}; };
libkkc = callPackage ../tools/inputmethods/libkkc { libkkc = callPackage ../tools/inputmethods/libkkc { };
inherit (gnome3) libgee;
};
ibus = callPackage ../tools/inputmethods/ibus { ibus = callPackage ../tools/inputmethods/ibus {
gconf = gnome2.GConf; gconf = gnome2.GConf;
@ -6205,9 +6203,7 @@ in
urlwatch = callPackage ../tools/networking/urlwatch { }; urlwatch = callPackage ../tools/networking/urlwatch { };
valum = callPackage ../development/web/valum { valum = callPackage ../development/web/valum { };
inherit (gnome3) libgee;
};
inherit (callPackages ../servers/varnish { }) inherit (callPackages ../servers/varnish { })
varnish4 varnish5 varnish6; varnish4 varnish5 varnish6;
@ -10768,6 +10764,8 @@ in
libgdata = callPackage ../development/libraries/libgdata { }; libgdata = callPackage ../development/libraries/libgdata { };
libgee = callPackage ../development/libraries/libgee { };
libgepub = callPackage ../development/libraries/libgepub { }; libgepub = callPackage ../development/libraries/libgepub { };
libgig = callPackage ../development/libraries/libgig { }; libgig = callPackage ../development/libraries/libgig { };
@ -18408,9 +18406,7 @@ in
ruby = ruby_2_3.override { cursesSupport = true; }; ruby = ruby_2_3.override { cursesSupport = true; };
}; };
synapse = callPackage ../applications/misc/synapse { synapse = callPackage ../applications/misc/synapse { };
inherit (gnome3) libgee;
};
synapse-bt = callPackage ../applications/networking/p2p/synapse-bt { synapse-bt = callPackage ../applications/networking/p2p/synapse-bt {
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
@ -18657,7 +18653,6 @@ in
pdfgrep = callPackage ../tools/typesetting/pdfgrep { }; pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
pdfpc = callPackage ../applications/misc/pdfpc { pdfpc = callPackage ../applications/misc/pdfpc {
inherit (gnome3) libgee;
inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gst_all_1) gstreamer gst-plugins-base;
}; };
@ -19243,7 +19238,6 @@ in
lightdm_qt = lightdm.override { withQt5 = true; }; lightdm_qt = lightdm.override { withQt5 = true; };
lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter { lightdm-enso-os-greeter = callPackage ../applications/display-managers/lightdm-enso-os-greeter {
inherit (gnome3) libgee;
inherit (xorg) libX11 libXdmcp libpthreadstubs; inherit (xorg) libX11 libXdmcp libpthreadstubs;
}; };
@ -23085,7 +23079,7 @@ in
iterm2 = callPackage ../applications/misc/iterm2 {}; iterm2 = callPackage ../applications/misc/iterm2 {};
sequeler = callPackage ../applications/misc/sequeler { sequeler = callPackage ../applications/misc/sequeler {
inherit (gnome3) gtksourceview libgda libgee; inherit (gnome3) gtksourceview libgda;
}; };
sequelpro = callPackage ../applications/misc/sequelpro {}; sequelpro = callPackage ../applications/misc/sequelpro {};