From fac090c8dd5941be79b0d632487ad7629027e080 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 23 Aug 2019 02:45:09 +0200 Subject: gnome-online-accounts: move from gnome3 --- pkgs/applications/backup/deja-dup/default.nix | 4 +- .../networking/feedreaders/feedreader/default.nix | 4 +- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 4 +- .../gnome-3/core/gnome-online-accounts/default.nix | 52 ---------------------- pkgs/desktops/gnome-3/default.nix | 3 +- pkgs/development/libraries/gfbgraph/default.nix | 4 +- .../libraries/gnome-online-accounts/default.nix | 52 ++++++++++++++++++++++ pkgs/development/libraries/libgdata/default.nix | 3 +- pkgs/development/libraries/libzapojit/default.nix | 4 +- pkgs/top-level/all-packages.nix | 4 +- 10 files changed, 68 insertions(+), 66 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix create mode 100644 pkgs/development/libraries/gnome-online-accounts/default.nix (limited to 'pkgs') diff --git a/pkgs/applications/backup/deja-dup/default.nix b/pkgs/applications/backup/deja-dup/default.nix index 4f8e520cb9f2..2ff51db54041 100644 --- a/pkgs/applications/backup/deja-dup/default.nix +++ b/pkgs/applications/backup/deja-dup/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, substituteAll, meson, ninja, pkgconfig, vala_0_40, gettext -, gnome3, libnotify, itstool, glib, gtk3, libxml2 +, gnome3, libnotify, itstool, glib, gtk3, libxml2, gnome-online-accounts , coreutils, libpeas, libsecret, pcre, libxkbcommon, wrapGAppsHook , libpthreadstubs, libXdmcp, epoxy, at-spi2-core, dbus, libgpgerror , appstream-glib, desktop-file-utils, duplicity @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { buildInputs = [ libnotify libpeas glib gtk3 libsecret pcre libxkbcommon libpthreadstubs libXdmcp epoxy gnome3.nautilus - at-spi2-core dbus gnome3.gnome-online-accounts libgpgerror + at-spi2-core dbus gnome-online-accounts libgpgerror ]; propagatedUserEnvPkgs = [ duplicity ]; diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index fea062805d0f..959649c4b150 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, vala, gettext, python3 -, appstream-glib, desktop-file-utils, wrapGAppsHook +, appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas, hicolor-icon-theme , curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo gtk3 libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas - gnome3.gnome-online-accounts + gnome-online-accounts hicolor-icon-theme # for setup hook ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 2941d629f8f7..9fb3ca99d097 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -1,6 +1,6 @@ { stdenv, meson, ninja, gettext, fetchurl, pkgconfig , wrapGAppsHook, itstool, desktop-file-utils, python3 -, glib, gtk3, evolution-data-server +, glib, gtk3, evolution-data-server, gnome-online-accounts , libuuid, webkitgtk, zeitgeist , gnome3, libxml2, gsettings-desktop-schemas }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gtk3 libuuid webkitgtk gnome3.tracker - gnome3.gnome-online-accounts zeitgeist + gnome-online-accounts zeitgeist gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme diff --git a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix deleted file mode 100644 index 9ae4a572d93b..000000000000 --- a/pkgs/desktops/gnome-3/core/gnome-online-accounts/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook -, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection -, gettext, icu, glib-networking, hicolor-icon-theme -, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos -}: - -let - pname = "gnome-online-accounts"; - version = "3.32.0"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w"; - }; - - outputs = [ "out" "man" "dev" "devdoc" ]; - - configureFlags = [ - "--enable-media-server" - "--enable-kerberos" - "--enable-lastfm" - "--enable-todoist" - "--enable-gtk-doc" - "--enable-documentation" - ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - pkgconfig gobject-introspection vala gettext wrapGAppsHook - libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc - hicolor-icon-theme # for setup-hook - ]; - buildInputs = [ - glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup - gcr kerberos - ]; - - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - - meta = with stdenv.lib; { - platforms = platforms.linux; - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 5a6dad2a7945..3a81bc523b94 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -113,8 +113,6 @@ lib.makeScope pkgs.newScope (self: with self; { libgnome-keyring = callPackage ./core/libgnome-keyring { }; - gnome-online-accounts = callPackage ./core/gnome-online-accounts { }; - gnome-online-miners = callPackage ./core/gnome-online-miners { }; gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; @@ -391,6 +389,7 @@ lib.makeScope pkgs.newScope (self: with self; { 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 gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gnome-video-effects; # added 2019-08-19 + inherit (pkgs) gnome-online-accounts; # added 2019-08-23 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 1bdcb7d8b28d..235cd1950713 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, librest +{ stdenv, fetchurl, pkgconfig, glib, librest, gnome-online-accounts , gnome3, libsoup, json-glib, gobject-introspection }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig gobject-introspection ]; - buildInputs = [ glib gnome3.gnome-online-accounts ]; + buildInputs = [ glib gnome-online-accounts ]; propagatedBuildInputs = [ libsoup json-glib librest ]; configureFlags = [ "--enable-introspection" ]; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix new file mode 100644 index 000000000000..9ae4a572d93b --- /dev/null +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, pkgconfig, vala, glib, libxslt, gtk3, wrapGAppsHook +, webkitgtk, json-glib, librest, libsecret, gtk-doc, gobject-introspection +, gettext, icu, glib-networking, hicolor-icon-theme +, libsoup, docbook_xsl, docbook_xml_dtd_412, gnome3, gcr, kerberos +}: + +let + pname = "gnome-online-accounts"; + version = "3.32.0"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1anlx0rb2hafg9929pgfms25mdz23sd0vdva06h6zlf8f5byc68w"; + }; + + outputs = [ "out" "man" "dev" "devdoc" ]; + + configureFlags = [ + "--enable-media-server" + "--enable-kerberos" + "--enable-lastfm" + "--enable-todoist" + "--enable-gtk-doc" + "--enable-documentation" + ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + pkgconfig gobject-introspection vala gettext wrapGAppsHook + libxslt docbook_xsl docbook_xml_dtd_412 gtk-doc + hicolor-icon-theme # for setup-hook + ]; + buildInputs = [ + glib gtk3 webkitgtk json-glib librest libsecret glib-networking icu libsoup + gcr kerberos + ]; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + + meta = with stdenv.lib; { + platforms = platforms.linux; + maintainers = gnome3.maintainers; + }; +} diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 48cfa098c9fa..f61283aec4a0 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -10,6 +10,7 @@ , glib , json-glib , gcr +, gnome-online-accounts , gobject-introspection , liboauth , gnome3 @@ -70,7 +71,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.gnome-online-accounts + gnome-online-accounts json-glib ]; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 2ad017dc90be..215535fb8f13 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gobject-introspection }: +{ stdenv, fetchurl, pkgconfig, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; - propagatedBuildInputs = [ glib json-glib librest libsoup gnome3.gnome-online-accounts ]; # zapojit-0.0.pc + propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3ea05b72d68..de7f3a5c9f34 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9501,6 +9501,8 @@ in gnome-latex = callPackage ../applications/editors/gnome-latex/default.nix { }; + gnome-online-accounts = callPackage ../development/libraries/gnome-online-accounts { }; + gnome-video-effects = callPackage ../development/libraries/gnome-video-effects { }; gnum4 = callPackage ../development/tools/misc/gnum4 { }; @@ -18630,7 +18632,7 @@ in gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-online-accounts gnome-autoar; + inherit (gnome3) gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; -- cgit v1.2.3