Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

gfbgraph: rename from gnome3.gfbgraph

+8 -10
+1 -3
pkgs/desktops/gnome-3/default.nix
··· 38 38 inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3 39 39 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 40 40 easytag meld orca rhythmbox shotwell gnome-usage 41 - clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart; 41 + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph; 42 42 43 43 libsoup = pkgs.libsoup.override { gnomeSupport = true; }; 44 44 libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; ··· 341 341 #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ 342 342 343 343 geary = callPackage ./misc/geary { }; 344 - 345 - gfbgraph = callPackage ./misc/gfbgraph { }; 346 344 347 345 gitg = callPackage ./misc/gitg { }; 348 346
+5 -7
pkgs/desktops/gnome-3/misc/gfbgraph/default.nix pkgs/development/libraries/gfbgraph/default.nix
··· 1 - { stdenv, fetchurl, pkgconfig, glib 1 + { stdenv, fetchurl, pkgconfig, glib, librest 2 2 , gnome3, libsoup, json-glib, gobject-introspection }: 3 3 4 - let 4 + stdenv.mkDerivation rec { 5 5 pname = "gfbgraph"; 6 6 version = "0.2.3"; 7 - in stdenv.mkDerivation rec { 8 - name = "${pname}-${version}"; 9 7 10 8 outputs = [ "out" "dev" "devdoc" ]; 11 9 12 10 src = fetchurl { 13 - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; 11 + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 14 12 sha256 = "1dp0v8ia35fxs9yhnqpxj3ir5lh018jlbiwifjfn8ayy7h47j4fs"; 15 13 }; 16 14 17 15 nativeBuildInputs = [ pkgconfig gobject-introspection ]; 18 16 buildInputs = [ glib gnome3.gnome-online-accounts ]; 19 - propagatedBuildInputs = [ libsoup json-glib gnome3.rest ]; 17 + propagatedBuildInputs = [ libsoup json-glib librest ]; 20 18 21 19 configureFlags = [ "--enable-introspection" ]; 22 20 ··· 25 23 passthru = { 26 24 updateScript = gnome3.updateScript { 27 25 packageName = pname; 28 - attrPath = "gnome3.${pname}"; 29 26 }; 30 27 }; 31 28 32 29 meta = with stdenv.lib; { 30 + homepage = https://wiki.gnome.org/Projects/GFBGraph; 33 31 description = "GLib/GObject wrapper for the Facebook Graph API"; 34 32 maintainers = gnome3.maintainers; 35 33 license = licenses.lgpl2;
+2
pkgs/top-level/all-packages.nix
··· 2875 2875 2876 2876 gftp = callPackage ../tools/networking/gftp { }; 2877 2877 2878 + gfbgraph = callPackage ../development/libraries/gfbgraph { }; 2879 + 2878 2880 ggobi = callPackage ../tools/graphics/ggobi { }; 2879 2881 2880 2882 gibo = callPackage ../tools/misc/gibo { };