From 8605b470ba3f416ddc156c0a0f907598ce958716 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Sep 2019 12:57:33 +0200 Subject: [PATCH 1/5] gnome2.gvfs: drop Not needed by anything and dropping it will allow us to clean up the expression. Changed to an alias as that is what it was in the first place. --- pkgs/desktops/gnome-2/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 16828f08bc2..6cc6848b316 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -57,8 +57,6 @@ lib.makeScope pkgs.newScope (self: with self; { #### DESKTOP - gvfs = pkgs.gvfs.override { gnome = self; }; - # Removed from recent GNOME releases, but still required scrollkeeper = callPackage ./desktop/scrollkeeper { }; @@ -78,7 +76,10 @@ lib.makeScope pkgs.newScope (self: with self; { glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 libcanberra-gtk2 # Included for backwards compatibility - libsoup libwnck gtk-doc gnome-doc-utils rarian; + libsoup libwnck gtk-doc gnome-doc-utils rarian + + gvfs # added 2019-09-03 + ; gtk = pkgs.gtk2; gtkmm = pkgs.gtkmm2; From ef19440dc5d873cea1e94781bf38d70d1e2d0e3f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Sep 2019 13:00:22 +0200 Subject: [PATCH 2/5] gvfs: only support GNOME 3, not GNOME 2 It will make the expression and calls nicer. --- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 1f16ff9d0b5..87bf2b7fe70 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -111,7 +111,7 @@ lib.makeScope pkgs.newScope (self: with self; { gucharmap = callPackage ./core/gucharmap { }; - gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; + gvfs = pkgs.gvfs.override { gnomeSupport = true; }; eog = callPackage ./core/eog { }; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 60188d77962..941f2862c68 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, gnome3, dbus +{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, dbus , glib, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp -, gnomeSupport ? false, gnome, gcr, wrapGAppsHook +, gnomeSupport ? false, gnome3, gcr, wrapGAppsHook , libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh , libsecret, libgdata, python3 }: @@ -37,7 +37,7 @@ in stdenv.mkDerivation rec { samba libmtp libcap polkit libimobiledevice libbluray libcdio-paranoia libnfs openssh # ToDo: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ + ] ++ stdenv.lib.optionals gnomeSupport (with gnome3; [ libsoup gcr glib-networking # TLS support gnome-online-accounts libsecret libgdata diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b574576b13..da920db65b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11265,9 +11265,7 @@ in gumbo = callPackage ../development/libraries/gumbo { }; - gvfs = callPackage ../development/libraries/gvfs { - gnome = res.gnome3; - }; + gvfs = callPackage ../development/libraries/gvfs { }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; From f5a54f388c6ccfb74880163527d1acfe2b30ef2f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Sep 2019 13:03:38 +0200 Subject: [PATCH 3/5] gvfs: format with nixpkgs-fmt --- pkgs/development/libraries/gvfs/default.nix | 97 ++++++++++++++++----- 1 file changed, 76 insertions(+), 21 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 941f2862c68..2e41f79b78c 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,20 +1,47 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, dbus -, glib, libgudev, udisks2, libgcrypt, libcap, polkit -, libgphoto2, avahi, libarchive, fuse, libcdio -, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_42, samba, libmtp -, gnomeSupport ? false, gnome3, gcr, wrapGAppsHook -, libimobiledevice, libbluray, libcdio-paranoia, libnfs, openssh -, libsecret, libgdata, python3 +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, dbus +, glib +, libgudev +, udisks2 +, libgcrypt +, libcap +, polkit +, libgphoto2 +, avahi +, libarchive +, fuse +, libcdio +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_42 +, samba +, libmtp +, gnomeSupport ? false +, gnome3 +, gcr +, wrapGAppsHook +, libimobiledevice +, libbluray +, libcdio-paranoia +, libnfs +, openssh +, libsecret +, libgdata +, python3 }: -let +stdenv.mkDerivation rec { pname = "gvfs"; version = "1.40.2"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; 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 = "07lpcfric3h0302n9b1pwa38mjb76r9s98kg2867y2d1qvzfivxx"; }; @@ -26,28 +53,56 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - meson ninja python3 - pkgconfig gettext wrapGAppsHook - libxml2 libxslt docbook_xsl docbook_xml_dtd_42 + meson + ninja + python3 + pkgconfig + gettext + wrapGAppsHook + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_42 ]; buildInputs = [ - glib libgudev udisks2 libgcrypt dbus - libgphoto2 avahi libarchive fuse libcdio - samba libmtp libcap polkit libimobiledevice libbluray - libcdio-paranoia libnfs openssh + glib + libgudev + udisks2 + libgcrypt + dbus + libgphoto2 + avahi + libarchive + fuse + libcdio + samba + libmtp + libcap + polkit + libimobiledevice + libbluray + libcdio-paranoia + libnfs + openssh # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome3; [ - libsoup gcr + libsoup + gcr glib-networking # TLS support - gnome-online-accounts libsecret libgdata + gnome-online-accounts + libsecret + libgdata ]); mesonFlags = [ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" "-Dtmpfilesdir=no" ] ++ stdenv.lib.optionals (!gnomeSupport) [ - "-Dgcr=false" "-Dgoa=false" "-Dkeyring=false" "-Dhttp=false" + "-Dgcr=false" + "-Dgoa=false" + "-Dkeyring=false" + "-Dhttp=false" "-Dgoogle=false" ] ++ stdenv.lib.optionals (samba == null) [ # Xfce don't want samba From 6fabbe513b72cb87b552d292d1f0438ad65a4d56 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Sep 2019 13:06:06 +0200 Subject: [PATCH 4/5] gnome3.gvfs: fix eval with allowAliases = false --- pkgs/development/libraries/gvfs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 2e41f79b78c..f622448b185 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -25,6 +25,7 @@ , gnomeSupport ? false , gnome3 , gcr +, gnome-online-accounts , wrapGAppsHook , libimobiledevice , libbluray @@ -85,15 +86,15 @@ stdenv.mkDerivation rec { libcdio-paranoia libnfs openssh - # ToDo: a ligther version of libsoup to have FTP/HTTP support? - ] ++ stdenv.lib.optionals gnomeSupport (with gnome3; [ - libsoup + # TODO: a ligther version of libsoup to have FTP/HTTP support? + ] ++ stdenv.lib.optionals gnomeSupport [ + gnome3.libsoup gcr - glib-networking # TLS support + gnome3.glib-networking # TLS support gnome-online-accounts libsecret libgdata - ]); + ]; mesonFlags = [ "-Dsystemduserunitdir=${placeholder "out"}/lib/systemd/user" From fa03881954a0957522785dc5c52f45d07cdae87d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 2 Sep 2019 13:53:11 +0200 Subject: [PATCH 5/5] gnome3.glib-networking: replace with alias Since we moved gsettings-desktop-schemas to top-level, gnome3.glib-networking was the same as glib-networking. We could try to make the top-level variant not depend on gsettings-desktop-schemas again but that is probably pointless, as the dependency is rather small compared to things like libproxy. Instead, we will just drop the package in gnome3 attr set and always rely on the top-level expression. --- nixos/modules/services/desktops/gnome3/glib-networking.nix | 6 +++--- pkgs/desktops/gnome-3/default.nix | 5 +---- pkgs/development/libraries/gvfs/default.nix | 3 ++- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome3/glib-networking.nix index 186668d7d38..fcd58509d6f 100644 --- a/nixos/modules/services/desktops/gnome3/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome3/glib-networking.nix @@ -22,11 +22,11 @@ with lib; config = mkIf config.services.gnome3.glib-networking.enable { - services.dbus.packages = [ pkgs.gnome3.glib-networking ]; + services.dbus.packages = [ pkgs.glib-networking ]; - systemd.packages = [ pkgs.gnome3.glib-networking ]; + systemd.packages = [ pkgs.glib-networking ]; - environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.gnome3.glib-networking.out}/lib/gio/modules" ]; + environment.variables.GIO_EXTRA_MODULES = [ "${pkgs.glib-networking.out}/lib/gio/modules" ]; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 87bf2b7fe70..21ecc7e64ee 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -53,10 +53,6 @@ lib.makeScope pkgs.newScope (self: with self; { gjs = callPackage ./core/gjs { }; - glib-networking = pkgs.glib-networking.override { - inherit (pkgs) gsettings-desktop-schemas; - }; - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; @@ -348,6 +344,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 inherit (pkgs) gnome-video-effects; # added 2019-08-19 inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23 + inherit (pkgs) glib-networking; # added 2019-09-02 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index f622448b185..8b3bc30a661 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -25,6 +25,7 @@ , gnomeSupport ? false , gnome3 , gcr +, glib-networking , gnome-online-accounts , wrapGAppsHook , libimobiledevice @@ -90,7 +91,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals gnomeSupport [ gnome3.libsoup gcr - gnome3.glib-networking # TLS support + glib-networking # TLS support gnome-online-accounts libsecret libgdata