From d6150339fcf26a17b80797a79132938d9c8e1ac9 Mon Sep 17 00:00:00 2001 From: Atemu Date: Thu, 8 Aug 2024 09:26:24 +0200 Subject: [PATCH 01/93] nixos/gdm: refactor file-global `with` --- .../services/x11/display-managers/gdm.nix | 58 +++++++++---------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index 6a915a3f2f09..fde97c92d61a 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.xserver.displayManager; @@ -40,24 +38,24 @@ in { imports = [ - (mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "enable" ] [ + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "enable" ] [ "services" "displayManager" "autoLogin" "enable" ]) - (mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "user" ] [ + (lib.mkRenamedOptionModule [ "services" "xserver" "displayManager" "gdm" "autoLogin" "user" ] [ "services" "displayManager" "autoLogin" "user" ]) - (mkRemovedOptionModule [ "services" "xserver" "displayManager" "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.") + (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "gdm" "nvidiaWayland" ] "We defer to GDM whether Wayland should be enabled.") ]; meta = { - maintainers = teams.gnome.members; + maintainers = lib.teams.gnome.members; }; ###### interface @@ -66,38 +64,38 @@ in services.xserver.displayManager.gdm = { - enable = mkEnableOption "GDM, the GNOME Display Manager"; + enable = lib.mkEnableOption "GDM, the GNOME Display Manager"; - debug = mkEnableOption "debugging messages in GDM"; + debug = lib.mkEnableOption "debugging messages in GDM"; # Auto login options specific to GDM - autoLogin.delay = mkOption { - type = types.int; + autoLogin.delay = lib.mkOption { + type = lib.types.int; default = 0; description = '' Seconds of inactivity after which the autologin will be performed. ''; }; - wayland = mkOption { - type = types.bool; + wayland = lib.mkOption { + type = lib.types.bool; default = true; description = '' Allow GDM to run on Wayland instead of Xserver. ''; }; - autoSuspend = mkOption { + autoSuspend = lib.mkOption { default = true; description = '' On the GNOME Display Manager login screen, suspend the machine after inactivity. (Does not affect automatic suspend while logged in, or at lock screen.) ''; - type = types.bool; + type = lib.types.bool; }; - banner = mkOption { - type = types.nullOr types.lines; + banner = lib.mkOption { + type = lib.types.nullOr lib.types.lines; default = null; example = '' foo @@ -109,7 +107,7 @@ in ''; }; - settings = mkOption { + settings = lib.mkOption { type = settingsFormat.type; default = { }; example = { @@ -128,7 +126,7 @@ in ###### implementation - config = mkIf cfg.gdm.enable { + config = lib.mkIf cfg.gdm.enable { services.xserver.displayManager.lightdm.enable = false; @@ -151,7 +149,7 @@ in { environment = { GDM_X_SERVER_EXTRA_ARGS = toString - (filter (arg: arg != "-terminate") cfg.xserverArgs); + (lib.filter (arg: arg != "-terminate") cfg.xserverArgs); XDG_DATA_DIRS = lib.makeSearchPath "share" [ gdm # for gnome-login.session config.services.displayManager.sessionData.desktops @@ -159,14 +157,14 @@ in pkgs.adwaita-icon-theme pkgs.hicolor-icon-theme # empty icon theme as a base ]; - } // optionalAttrs (xSessionWrapper != null) { + } // lib.optionalAttrs (xSessionWrapper != null) { # Make GDM use this wrapper before running the session, which runs the # configured setupCommands. This relies on a patched GDM which supports # this environment variable. GDM_X_SESSION_WRAPPER = "${xSessionWrapper}"; }; execCmd = "exec ${gdm}/bin/gdm"; - preStart = optionalString (defaultSessionName != null) '' + preStart = lib.optionalString (defaultSessionName != null) '' # Set default session in session chooser to a specified values – basically ignore session history. ${setSessionScript}/bin/set-session ${config.services.displayManager.sessionData.autologinSession} ''; @@ -174,10 +172,10 @@ in systemd.tmpfiles.rules = [ "d /run/gdm/.config 0711 gdm gdm" - ] ++ optionals config.hardware.pulseaudio.enable [ + ] ++ lib.optionals config.hardware.pulseaudio.enable [ "d /run/gdm/.config/pulse 0711 gdm gdm" "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}" - ] ++ optionals config.services.gnome.gnome-initial-setup.enable [ + ] ++ lib.optionals config.services.gnome.gnome-initial-setup.enable [ # Create stamp file for gnome-initial-setup to prevent it starting in GDM. "f /run/gdm/.config/gnome-initial-setup-done 0711 gdm gdm - yes" ]; @@ -219,7 +217,7 @@ in # conflicts display-manager.service, then when nixos-rebuild # switch starts multi-user.target, display-manager.service is # stopped so plymouth-quit.service can be started.) - systemd.services.plymouth-quit = mkIf config.boot.plymouth.enable { + systemd.services.plymouth-quit = lib.mkIf config.boot.plymouth.enable { wantedBy = lib.mkForce []; }; @@ -261,20 +259,20 @@ in # Otherwise with TimedLogin with zero seconds the prompt is still # presented and there's a little delay. services.xserver.displayManager.gdm.settings = { - daemon = mkMerge [ + daemon = lib.mkMerge [ { WaylandEnable = cfg.gdm.wayland; } # nested if else didn't work - (mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay != 0 ) { + (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay != 0 ) { TimedLoginEnable = true; TimedLogin = config.services.displayManager.autoLogin.user; TimedLoginDelay = cfg.gdm.autoLogin.delay; }) - (mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay == 0 ) { + (lib.mkIf (config.services.displayManager.autoLogin.enable && cfg.gdm.autoLogin.delay == 0 ) { AutomaticLoginEnable = true; AutomaticLogin = config.services.displayManager.autoLogin.user; }) ]; - debug = mkIf cfg.gdm.debug { + debug = lib.mkIf cfg.gdm.debug { Enable = true; }; }; @@ -327,9 +325,9 @@ in # This would block password prompt when included by gdm-password. # GDM will instead run gdm-fingerprint in parallel. - login.fprintAuth = mkIf config.services.fprintd.enable false; + login.fprintAuth = lib.mkIf config.services.fprintd.enable false; - gdm-fingerprint.text = mkIf config.services.fprintd.enable '' + gdm-fingerprint.text = lib.mkIf config.services.fprintd.enable '' auth required pam_shells.so auth requisite pam_nologin.so auth requisite pam_faillock.so preauth From ef660a9c864227c377674b991ce33c153fd0c9b5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:20:32 +0200 Subject: [PATCH 02/93] gnome.gnome-online-miners: Remove It is abandoned upstream, it is mostly broken and has been removed from GNOME: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1748 --- .../desktops/gnome/gnome-online-miners.nix | 40 +----- .../services/x11/desktop-managers/budgie.nix | 1 - .../services/x11/desktop-managers/gnome.nix | 1 - .../core/gnome-online-miners/default.nix | 116 ------------------ pkgs/desktops/gnome/default.nix | 3 +- 5 files changed, 5 insertions(+), 156 deletions(-) delete mode 100644 pkgs/desktops/gnome/core/gnome-online-miners/default.nix diff --git a/nixos/modules/services/desktops/gnome/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome/gnome-online-miners.nix index 9496752ed3a2..3882b90ad78a 100644 --- a/nixos/modules/services/desktops/gnome/gnome-online-miners.nix +++ b/nixos/modules/services/desktops/gnome/gnome-online-miners.nix @@ -1,41 +1,9 @@ # GNOME Online Miners daemon. -{ config, pkgs, lib, ... }: +{ lib, ... }: { - - meta = { - maintainers = lib.teams.gnome.members; - }; - - ###### interface - - options = { - - services.gnome.gnome-online-miners = { - - enable = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Whether to enable GNOME Online Miners, a service that - crawls through your online content. - ''; - }; - - }; - - }; - - - ###### implementation - - config = lib.mkIf config.services.gnome.gnome-online-miners.enable { - - environment.systemPackages = [ pkgs.gnome.gnome-online-miners ]; - - services.dbus.packages = [ pkgs.gnome.gnome-online-miners ]; - - }; - + imports = [ + (lib.mkRemovedOptionModule [ "services" "gnome" "gnome-online-miners" ] "It was broken for a while now.") + ]; } diff --git a/nixos/modules/services/x11/desktop-managers/budgie.nix b/nixos/modules/services/x11/desktop-managers/budgie.nix index 987f114ec5e1..8e36b8cc3947 100644 --- a/nixos/modules/services/x11/desktop-managers/budgie.nix +++ b/nixos/modules/services/x11/desktop-managers/budgie.nix @@ -222,7 +222,6 @@ in { # For BCC's Online Accounts panel. services.gnome.gnome-online-accounts.enable = mkDefault true; - services.gnome.gnome-online-miners.enable = true; # For BCC's Printers panel. services.printing.enable = mkDefault true; diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 11d5fcbfee23..74a78d2fefdd 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -266,7 +266,6 @@ in services.gnome.evolution-data-server.enable = true; services.gnome.gnome-keyring.enable = true; services.gnome.gnome-online-accounts.enable = mkDefault true; - services.gnome.gnome-online-miners.enable = true; services.gnome.tracker-miners.enable = mkDefault true; services.gnome.tracker.enable = mkDefault true; services.hardware.bolt.enable = mkDefault true; diff --git a/pkgs/desktops/gnome/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix deleted file mode 100644 index 29f602898db3..000000000000 --- a/pkgs/desktops/gnome/core/gnome-online-miners/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, autoconf-archive -, autoreconfHook -, pkg-config -, glib -, gnome -, libxml2 -, libgdata -, grilo -, libzapojit -, grilo-plugins -, gnome-online-accounts -, libmediaart -, tracker -, gfbgraph -, librest -, libsoup -, json-glib -, gmp -, openssl -, dleyna-server -, wrapGAppsHook3 -}: - -stdenv.mkDerivation rec { - pname = "gnome-online-miners"; - version = "3.34.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1n2jz9i8a42zwxx5h8j2gdy6q1vyydh4vl00r0al7w8jzdh24p44"; - }; - - patches = [ - # Fix use after free - # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/4 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/9eb57c6a8cd1a925c508646edae936eee0a8e46b.patch"; - sha256 = "O1GRnzs33I0mFzrNDFkTGiBKstq5krYg7fwj60367TA="; - }) - - # Port to Tracker 3 - # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/2d3798252807cad9eb061ed2b37e35170c1a1daf.patch"; - sha256 = "hwrkxroMpTfOwJAPkYQFdDCroZ2qSsvOgDetrJDig20="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/1548c0c527f0e4389047448d7d3b6cff55278c8e.patch"; - sha256 = "U9w81c9Kze7kv5KHeGqvDeSNHzSayVrUG0XYsYMa1sg="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/941ebd8890c9ac4f75a1f58ccbea9731f46ad912.patch"; - sha256 = "JHtDlZ54/BlSiUA3ROHfCTtTKSin3g6JNm8NS6pYML8="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/d1681a64bc3f65894af2549e3ba2bffbaf6f539a.patch"; - sha256 = "9ZEatz5I81UAnjS1qCGWYDQQOxg/qp9Tg3xG/a+3goc="; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gnome-online-miners/commit/3d2af8785c84d6e50d8a8e6a2569a4b709184e94.patch"; - sha256 = "7bdUE2k6g3Z8sdGYEb6pUm1/wbKDe4BHbylXUzfuTG0="; - }) - ]; - - nativeBuildInputs = [ - # patch changes configure.ac - autoconf-archive - autoreconfHook - - pkg-config - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - libgdata - libxml2 - libsoup - gmp - openssl - grilo - libzapojit - grilo-plugins - gnome-online-accounts - libmediaart - tracker - gfbgraph - json-glib - librest - dleyna-server - ]; - - env.NIX_CFLAGS_COMPILE = toString [ - "-Wno-error=format-security" # https://gitlab.gnome.org/GNOME/gnome-online-miners/merge_requests/3/diffs#note_942747 - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-online-miners"; - attrPath = "gnome.gnome-online-miners"; - }; - }; - - meta = with lib; { - homepage = "https://gitlab.gnome.org/Archive/gnome-online-miners"; - description = "Set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = teams.gnome.members; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 5cfe889da4aa..420e97015fd5 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -38,8 +38,6 @@ in gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; - gnome-online-miners = callPackage ./core/gnome-online-miners { }; - gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; gnome-session = callPackage ./core/gnome-session { }; @@ -177,6 +175,7 @@ in gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 + gnome-online-miners = throw "The ‘gnome.gnome-online-miners’ was removed, it was broken and abandoned."; # added on 2024-08-11. accerciser = lib.warn "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly." pkgs.accerciser; # Added on 2024-06-22. adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22. From 079379cfeffc00cb183248b612cc4754253cf10d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:32:45 +0200 Subject: [PATCH 03/93] gnome-connections: Format with nixfmt --- .../gnome/apps/gnome-connections/default.nix | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix index 2b7993a01583..0ae01fc27aee 100644 --- a/pkgs/desktops/gnome/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, vala -, gettext -, itstool -, desktop-file-utils -, wrapGAppsHook3 -, glib -, gtk3 -, libhandy -, libsecret -, libxml2 -, gtk-vnc -, gtk-frdp -, gnome +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + vala, + gettext, + itstool, + desktop-file-utils, + wrapGAppsHook3, + glib, + gtk3, + libhandy, + libsecret, + libxml2, + gtk-vnc, + gtk-frdp, + gnome, }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-connections/${lib.versions.major version}/gnome-connections-${version}.tar.xz"; hash = "sha256-+xzqaOeTC73B2yi3zQqaN80xDUtOeHL+gU9QoWqNJdM="; }; @@ -51,9 +52,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = pname; - }; + updateScript = gnome.updateScript { packageName = "gnome-connections"; }; }; meta = with lib; { From 788630942d1592e575224eddc02b9dd8acc356cc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:32:46 +0200 Subject: [PATCH 04/93] gnome-connections: Move to by-name --- .../default.nix => by-name/gn/gnome-connections/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-connections/default.nix => by-name/gn/gnome-connections/package.nix} (100%) diff --git a/pkgs/desktops/gnome/apps/gnome-connections/default.nix b/pkgs/by-name/gn/gnome-connections/package.nix similarity index 100% rename from pkgs/desktops/gnome/apps/gnome-connections/default.nix rename to pkgs/by-name/gn/gnome-connections/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f038510a9820..7f7fc0bbcb04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36749,8 +36749,6 @@ with pkgs; gnome46Extensions ; - gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; - gnome-extensions-cli = python3Packages.callPackage ../desktops/gnome/misc/gnome-extensions-cli { }; gnome-text-editor = callPackage ../desktops/gnome/apps/gnome-text-editor { }; From f6245d22dc133c5ce612170830cc19704433b667 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:37 +0200 Subject: [PATCH 05/93] gnome.gnome-boxes: Format with nixfmt --- .../gnome/apps/gnome-boxes/default.nix | 114 +++++++++--------- 1 file changed, 60 insertions(+), 54 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 613dbe758f24..580a761bed7b 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -1,50 +1,51 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, wrapGAppsHook3 -, pkg-config -, gettext -, itstool -, libvirt-glib -, glib -, gobject-introspection -, libxml2 -, gtk3 -, libvirt -, spice-gtk -, spice-protocol -, libhandy -, libsoup_3 -, libosinfo -, systemd -, vala -, libcap -, yajl -, gmp -, gdbm -, cyrus_sasl -, gnome -, adwaita-icon-theme -, librsvg -, desktop-file-utils -, mtools -, cdrkit -, libcdio -, libusb1 -, libarchive -, acl -, libgudev -, libcap_ng -, numactl -, libapparmor -, json-glib -, webkitgtk_4_1 -, vte -, glib-networking -, qemu-utils -, libportal-gtk3 +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + wrapGAppsHook3, + pkg-config, + gettext, + itstool, + libvirt-glib, + glib, + gobject-introspection, + libxml2, + gtk3, + libvirt, + spice-gtk, + spice-protocol, + libhandy, + libsoup_3, + libosinfo, + systemd, + vala, + libcap, + yajl, + gmp, + gdbm, + cyrus_sasl, + gnome, + adwaita-icon-theme, + librsvg, + desktop-file-utils, + mtools, + cdrkit, + libcdio, + libusb1, + libarchive, + acl, + libgudev, + libcap_ng, + numactl, + libapparmor, + json-glib, + webkitgtk_4_1, + vte, + glib-networking, + qemu-utils, + libportal-gtk3, }: stdenv.mkDerivation rec { @@ -52,7 +53,7 @@ stdenv.mkDerivation rec { version = "46.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz"; hash = "sha256-kAwXf2diZANwpmNM+efTzYIH5Jg2eopmemtzGwQRYDY="; }; @@ -80,9 +81,7 @@ stdenv.mkDerivation rec { ]; # Required for USB redirection PolicyKit rules file - propagatedUserEnvPkgs = [ - spice-gtk - ]; + propagatedUserEnvPkgs = [ spice-gtk ]; buildInputs = [ acl @@ -118,13 +117,20 @@ stdenv.mkDerivation rec { ]; preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ mtools cdrkit libcdio qemu-utils ]}") + gappsWrapperArgs+=(--prefix PATH : "${ + lib.makeBinPath [ + mtools + cdrkit + libcdio + qemu-utils + ] + }") ''; passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-boxes"; + attrPath = "gnome.gnome-boxes"; }; }; From 16b5886034c9ede11fe81bc00d17031a1b7a311d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:38 +0200 Subject: [PATCH 06/93] gnome-boxes: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../apps => by-name/gn}/gnome-boxes/fix-gir-lib-path.patch | 0 .../default.nix => by-name/gn/gnome-boxes/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps => by-name/gn}/gnome-boxes/fix-gir-lib-path.patch (100%) rename pkgs/{desktops/gnome/apps/gnome-boxes/default.nix => by-name/gn/gnome-boxes/package.nix} (95%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 74a78d2fefdd..c4c02e8f181c 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -489,7 +489,7 @@ in # it doesn't function well enough to be included # in default configurations. # https://github.com/NixOS/nixpkgs/issues/60908 - /* gnome-boxes */ + /* pkgs.gnome-boxes */ ] config.environment.gnome.excludePackages; services.sysprof.enable = notExcluded pkgs.sysprof; diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch b/pkgs/by-name/gn/gnome-boxes/fix-gir-lib-path.patch similarity index 100% rename from pkgs/desktops/gnome/apps/gnome-boxes/fix-gir-lib-path.patch rename to pkgs/by-name/gn/gnome-boxes/fix-gir-lib-path.patch diff --git a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix b/pkgs/by-name/gn/gnome-boxes/package.nix similarity index 95% rename from pkgs/desktops/gnome/apps/gnome-boxes/default.nix rename to pkgs/by-name/gn/gnome-boxes/package.nix index 580a761bed7b..2333fc247eb1 100644 --- a/pkgs/desktops/gnome/apps/gnome-boxes/default.nix +++ b/pkgs/by-name/gn/gnome-boxes/package.nix @@ -128,10 +128,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-boxes"; - attrPath = "gnome.gnome-boxes"; - }; + updateScript = gnome.updateScript { packageName = "gnome-boxes"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 420e97015fd5..918f36dd2470 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-boxes = callPackage ./apps/gnome-boxes { }; - gnome-characters = callPackage ./apps/gnome-characters { }; gnome-clocks = callPackage ./apps/gnome-clocks { }; @@ -192,6 +190,7 @@ in ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. + gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. From 19a51d23df27887b57998cff9f702ebf80784041 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:38 +0200 Subject: [PATCH 07/93] gnome.gnome-characters: Format with nixfmt --- .../gnome/apps/gnome-characters/default.nix | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix index 9a6676ad4c29..3a0edd4050cf 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, gnome -, glib -, gtk4 -, pango -, wrapGAppsHook4 -, desktop-file-utils -, gobject-introspection -, gjs -, libunistring -, libadwaita -, gsettings-desktop-schemas -, gnome-desktop +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + gettext, + gnome, + glib, + gtk4, + pango, + wrapGAppsHook4, + desktop-file-utils, + gobject-introspection, + gjs, + libunistring, + libadwaita, + gsettings-desktop-schemas, + gnome-desktop, }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz"; hash = "sha256-pOjixRC/SCBLmZSk581TeEQkbnTIqYb52+BOIj9dgnw="; }; @@ -38,7 +39,6 @@ stdenv.mkDerivation rec { wrapGAppsHook4 ]; - buildInputs = [ gjs glib @@ -62,8 +62,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-characters"; + attrPath = "gnome.gnome-characters"; }; }; From c9550b704d5308f6e6262da362c69f0a6b785f3e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:39 +0200 Subject: [PATCH 08/93] gnome-characters: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-characters/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-characters/default.nix => by-name/gn/gnome-characters/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c4c02e8f181c..3dddb260263a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -403,7 +403,7 @@ in pkgs.gnome-text-editor pkgs.gnome-calculator pkgs.gnome-calendar - gnome-characters + pkgs.gnome-characters gnome-clocks pkgs.gnome-console gnome-contacts diff --git a/pkgs/desktops/gnome/apps/gnome-characters/default.nix b/pkgs/by-name/gn/gnome-characters/package.nix similarity index 91% rename from pkgs/desktops/gnome/apps/gnome-characters/default.nix rename to pkgs/by-name/gn/gnome-characters/package.nix index 3a0edd4050cf..04a5dac98cd4 100644 --- a/pkgs/desktops/gnome/apps/gnome-characters/default.nix +++ b/pkgs/by-name/gn/gnome-characters/package.nix @@ -61,10 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-characters"; - attrPath = "gnome.gnome-characters"; - }; + updateScript = gnome.updateScript { packageName = "gnome-characters"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 918f36dd2470..a645a44f373b 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-characters = callPackage ./apps/gnome-characters { }; - gnome-clocks = callPackage ./apps/gnome-clocks { }; gnome-logs = callPackage ./apps/gnome-logs { }; @@ -191,6 +189,7 @@ in gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. + gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. From dcfb124855c8e0dc1316b675c4c36d1251867125 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:40 +0200 Subject: [PATCH 09/93] gnome-clocks: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-clocks/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-clocks/default.nix => by-name/gn/gnome-clocks/package.nix} (93%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 3dddb260263a..e43adf9d8ab8 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -404,7 +404,7 @@ in pkgs.gnome-calculator pkgs.gnome-calendar pkgs.gnome-characters - gnome-clocks + pkgs.gnome-clocks pkgs.gnome-console gnome-contacts pkgs.gnome-font-viewer diff --git a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix b/pkgs/by-name/gn/gnome-clocks/package.nix similarity index 93% rename from pkgs/desktops/gnome/apps/gnome-clocks/default.nix rename to pkgs/by-name/gn/gnome-clocks/package.nix index 6a9eb730ec41..5828a26a149a 100644 --- a/pkgs/desktops/gnome/apps/gnome-clocks/default.nix +++ b/pkgs/by-name/gn/gnome-clocks/package.nix @@ -67,10 +67,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-clocks"; - attrPath = "gnome.gnome-clocks"; - }; + updateScript = gnome.updateScript { packageName = "gnome-clocks"; }; }; meta = { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a645a44f373b..f1f12a9f9183 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-clocks = callPackage ./apps/gnome-clocks { }; - gnome-logs = callPackage ./apps/gnome-logs { }; gnome-maps = callPackage ./apps/gnome-maps { }; @@ -190,6 +188,7 @@ in gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. + gnome-clocks = lib.warn "The ‘gnome.gnome-clocks’ was moved to top-level. Please use ‘pkgs.gnome-clocks’ directly." pkgs.gnome-clocks; # Added on 2024-08-11. gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. From ebfe4df5bc3ce15b83611ed6ef45ff2c8ef43f83 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:40 +0200 Subject: [PATCH 10/93] gnome.gnome-logs: Format with nixfmt --- .../gnome/apps/gnome-logs/default.nix | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix index 05c6c6a14940..b7c897f5b267 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -1,23 +1,24 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gnome -, glib -, gtk4 -, desktop-file-utils -, wrapGAppsHook4 -, gettext -, itstool -, libadwaita -, libxml2 -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_43 -, systemd -, gsettings-desktop-schemas +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + gnome, + glib, + gtk4, + desktop-file-utils, + wrapGAppsHook4, + gettext, + itstool, + libadwaita, + libxml2, + libxslt, + docbook-xsl-nons, + docbook_xml_dtd_43, + systemd, + gsettings-desktop-schemas, }: stdenv.mkDerivation rec { @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { version = "45.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz"; hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI="; }; @@ -53,9 +54,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas ]; - mesonFlags = [ - "-Dman=true" - ]; + mesonFlags = [ "-Dman=true" ]; doCheck = true; From 2d62b2f940486e5d1f3eaeb95522a9d8b738b94a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:41 +0200 Subject: [PATCH 11/93] gnome-logs: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-logs/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-logs/default.nix => by-name/gn/gnome-logs/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e43adf9d8ab8..2bea020d6c95 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -408,7 +408,7 @@ in pkgs.gnome-console gnome-contacts pkgs.gnome-font-viewer - gnome-logs + pkgs.gnome-logs gnome-maps gnome-music pkgs.gnome-system-monitor diff --git a/pkgs/desktops/gnome/apps/gnome-logs/default.nix b/pkgs/by-name/gn/gnome-logs/package.nix similarity index 91% rename from pkgs/desktops/gnome/apps/gnome-logs/default.nix rename to pkgs/by-name/gn/gnome-logs/package.nix index b7c897f5b267..3b2723e7fb06 100644 --- a/pkgs/desktops/gnome/apps/gnome-logs/default.nix +++ b/pkgs/by-name/gn/gnome-logs/package.nix @@ -59,10 +59,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-logs"; - attrPath = "gnome.gnome-logs"; - }; + updateScript = gnome.updateScript { packageName = "gnome-logs"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index f1f12a9f9183..cfbe02144593 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-logs = callPackage ./apps/gnome-logs { }; - gnome-maps = callPackage ./apps/gnome-maps { }; gnome-music = callPackage ./apps/gnome-music { }; @@ -196,6 +194,7 @@ in gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22. gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. + gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. From 10192d932c9a2f712b557efa2b7965f9d129ca0e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:41 +0200 Subject: [PATCH 12/93] gnome.gnome-maps: Format with nixfmt --- .../gnome/apps/gnome-maps/default.nix | 55 ++++++++++--------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix index 7bc6880496c4..b51a1661d609 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -1,30 +1,31 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, gettext -, python3 -, pkg-config -, gnome -, glib -, gtk4 -, gobject-introspection -, gdk-pixbuf -, librest_1_0 -, libgweather -, geoclue2 -, wrapGAppsHook4 -, desktop-file-utils -, libportal -, libshumate -, libsecret -, libsoup_3 -, gsettings-desktop-schemas -, gjs -, libadwaita -, geocode-glib_2 -, tzdata +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + gettext, + python3, + pkg-config, + gnome, + glib, + gtk4, + gobject-introspection, + gdk-pixbuf, + librest_1_0, + libgweather, + geoclue2, + wrapGAppsHook4, + desktop-file-utils, + libportal, + libshumate, + libsecret, + libsoup_3, + gsettings-desktop-schemas, + gjs, + libadwaita, + geocode-glib_2, + tzdata, }: stdenv.mkDerivation (finalAttrs: { From a6cc36c2354cb8a2109812983ee25d54dc2e34ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:42 +0200 Subject: [PATCH 13/93] gnome-maps: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-maps/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-maps/default.nix => by-name/gn/gnome-maps/package.nix} (95%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 2bea020d6c95..88b34a1ba571 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -409,7 +409,7 @@ in gnome-contacts pkgs.gnome-font-viewer pkgs.gnome-logs - gnome-maps + pkgs.gnome-maps gnome-music pkgs.gnome-system-monitor gnome-weather diff --git a/pkgs/desktops/gnome/apps/gnome-maps/default.nix b/pkgs/by-name/gn/gnome-maps/package.nix similarity index 95% rename from pkgs/desktops/gnome/apps/gnome-maps/default.nix rename to pkgs/by-name/gn/gnome-maps/package.nix index b51a1661d609..85515a19ad70 100644 --- a/pkgs/desktops/gnome/apps/gnome-maps/default.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -98,10 +98,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-maps"; - attrPath = "gnome.gnome-maps"; - }; + updateScript = gnome.updateScript { packageName = "gnome-maps"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index cfbe02144593..42952c21efa5 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-maps = callPackage ./apps/gnome-maps { }; - gnome-music = callPackage ./apps/gnome-music { }; gnome-nettool = callPackage ./apps/gnome-nettool { }; @@ -195,6 +193,7 @@ in gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. + gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. From 49e50ecedad5828e1466e91642aa3988311bed91 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:42 +0200 Subject: [PATCH 14/93] gnome.gnome-music: Format with nixfmt --- .../gnome/apps/gnome-music/default.nix | 111 +++++++++--------- 1 file changed, 57 insertions(+), 54 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix index 8808d5f32186..7e29c199bef3 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -1,31 +1,32 @@ -{ lib -, meson -, ninja -, gettext -, fetchurl -, gdk-pixbuf -, tracker -, libxml2 -, python3 -, libnotify -, wrapGAppsHook4 -, libmediaart -, gobject-introspection -, gnome-online-accounts -, grilo -, grilo-plugins -, pkg-config -, gtk4 -, pango -, glib -, desktop-file-utils -, appstream-glib -, itstool -, gnome -, gst_all_1 -, libsoup_3 -, libadwaita -, gsettings-desktop-schemas +{ + lib, + meson, + ninja, + gettext, + fetchurl, + gdk-pixbuf, + tracker, + libxml2, + python3, + libnotify, + wrapGAppsHook4, + libmediaart, + gobject-introspection, + gnome-online-accounts, + grilo, + grilo-plugins, + pkg-config, + gtk4, + pango, + glib, + desktop-file-utils, + appstream-glib, + itstool, + gnome, + gst_all_1, + libsoup_3, + libadwaita, + gsettings-desktop-schemas, }: python3.pkgs.buildPythonApplication rec { @@ -35,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { format = "other"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz"; hash = "sha256-Eb4tbCib5NxDOwxPtZo9rDvtAcf1oorualRBl6NTv/0="; }; @@ -52,29 +53,31 @@ python3.pkgs.buildPythonApplication rec { gobject-introspection ]; - buildInputs = [ - gtk4 - pango - glib - libmediaart - gnome-online-accounts - gdk-pixbuf - python3 - grilo - grilo-plugins - libnotify - libsoup_3 - libadwaita - gsettings-desktop-schemas - tracker - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad - gst-plugins-ugly - gst-libav - ]); + buildInputs = + [ + gtk4 + pango + glib + libmediaart + gnome-online-accounts + gdk-pixbuf + python3 + grilo + grilo-plugins + libnotify + libsoup_3 + libadwaita + gsettings-desktop-schemas + tracker + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-libav + ]); pythonPath = with python3.pkgs; [ pycairo @@ -96,8 +99,8 @@ python3.pkgs.buildPythonApplication rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-music"; + attrPath = "gnome.gnome-music"; }; }; From 9ec24b9c32b29465ce9bb9a82bbeeda86987f393 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:43 +0200 Subject: [PATCH 15/93] gnome-music: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-music/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-music/default.nix => by-name/gn/gnome-music/package.nix} (94%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 88b34a1ba571..2cab8220b5e4 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -410,7 +410,7 @@ in pkgs.gnome-font-viewer pkgs.gnome-logs pkgs.gnome-maps - gnome-music + pkgs.gnome-music pkgs.gnome-system-monitor gnome-weather pkgs.loupe diff --git a/pkgs/desktops/gnome/apps/gnome-music/default.nix b/pkgs/by-name/gn/gnome-music/package.nix similarity index 94% rename from pkgs/desktops/gnome/apps/gnome-music/default.nix rename to pkgs/by-name/gn/gnome-music/package.nix index 7e29c199bef3..4452a9cc8ada 100644 --- a/pkgs/desktops/gnome/apps/gnome-music/default.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -98,10 +98,7 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-music"; - attrPath = "gnome.gnome-music"; - }; + updateScript = gnome.updateScript { packageName = "gnome-music"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 42952c21efa5..20863877d3d4 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-music = callPackage ./apps/gnome-music { }; - gnome-nettool = callPackage ./apps/gnome-nettool { }; gnome-notes = callPackage ./apps/gnome-notes { }; @@ -194,6 +192,7 @@ in gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. + gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. From 57662bfbd2685e0771f061280ff2dadf753bbd99 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:43 +0200 Subject: [PATCH 16/93] gnome.gnome-nettool: Format with nixfmt --- .../gnome/apps/gnome-nettool/default.nix | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix index 0ee7286e2314..54cb937c4bbf 100644 --- a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, desktop-file-utils -, itstool -, meson -, ninja -, pkg-config -, python3 -, wrapGAppsHook3 -, glib -, gtk3 -, libgtop -, dnsutils -, iputils -, nmap -, inetutils -, gnome +{ + stdenv, + lib, + fetchurl, + fetchpatch, + desktop-file-utils, + itstool, + meson, + ninja, + pkg-config, + python3, + wrapGAppsHook3, + glib, + gtk3, + libgtop, + dnsutils, + iputils, + nmap, + inetutils, + gnome, }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { version = "42.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-nettool/${lib.versions.major version}/gnome-nettool-${version}.tar.xz"; sha256 = "pU8p7vIDiu5pVRyLGcpPdY5eueIJCkvGtWM9/wGIdR8="; }; @@ -60,19 +61,21 @@ stdenv.mkDerivation rec { preFixup = '' gappsWrapperArgs+=( - --prefix PATH : "${lib.makeBinPath [ - dnsutils # for dig - iputils # for ping - nmap # for nmap - inetutils # for ping6, traceroute, whois - ]}" + --prefix PATH : "${ + lib.makeBinPath [ + dnsutils # for dig + iputils # for ping + nmap # for nmap + inetutils # for ping6, traceroute, whois + ] + }" ) ''; passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-nettool"; + attrPath = "gnome.gnome-nettool"; }; }; From 80ebfdbdd38a74f25031f18d6be18f39b60c040e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:44 +0200 Subject: [PATCH 17/93] gnome-nettool: Move from gnome scope to top-level --- .../default.nix => by-name/gn/gnome-nettool/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-nettool/default.nix => by-name/gn/gnome-nettool/package.nix} (93%) diff --git a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix b/pkgs/by-name/gn/gnome-nettool/package.nix similarity index 93% rename from pkgs/desktops/gnome/apps/gnome-nettool/default.nix rename to pkgs/by-name/gn/gnome-nettool/package.nix index 54cb937c4bbf..781851e18c89 100644 --- a/pkgs/desktops/gnome/apps/gnome-nettool/default.nix +++ b/pkgs/by-name/gn/gnome-nettool/package.nix @@ -73,10 +73,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-nettool"; - attrPath = "gnome.gnome-nettool"; - }; + updateScript = gnome.updateScript { packageName = "gnome-nettool"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 20863877d3d4..d9b983e4fbe5 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-nettool = callPackage ./apps/gnome-nettool { }; - gnome-notes = callPackage ./apps/gnome-notes { }; gnome-power-manager = callPackage ./apps/gnome-power-manager { }; @@ -193,6 +191,7 @@ in gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. + gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. From 3ed981036c9002a828efbaa101434893db00f3ea Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:44 +0200 Subject: [PATCH 18/93] gnome.gnome-notes: Format with nixfmt --- .../gnome/apps/gnome-notes/default.nix | 57 +++++++++---------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix index eb3e67a47a69..80c94c76afd3 100644 --- a/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -1,29 +1,30 @@ -{ stdenv -, lib -, meson -, ninja -, gettext -, fetchurl -, fetchpatch -, pkg-config -, wrapGAppsHook3 -, itstool -, desktop-file-utils -, python3 -, glib -, gtk3 -, evolution-data-server -, gnome-online-accounts -, json-glib -, libuuid -, curl -, libhandy -, webkitgtk -, gnome -, adwaita-icon-theme -, libxml2 -, gsettings-desktop-schemas -, tracker +{ + stdenv, + lib, + meson, + ninja, + gettext, + fetchurl, + fetchpatch, + pkg-config, + wrapGAppsHook3, + itstool, + desktop-file-utils, + python3, + glib, + gtk3, + evolution-data-server, + gnome-online-accounts, + json-glib, + libuuid, + curl, + libhandy, + webkitgtk, + gnome, + adwaita-icon-theme, + libxml2, + gsettings-desktop-schemas, + tracker, }: stdenv.mkDerivation rec { @@ -78,9 +79,7 @@ stdenv.mkDerivation rec { adwaita-icon-theme ]; - mesonFlags = [ - "-Dupdate_mimedb=false" - ]; + mesonFlags = [ "-Dupdate_mimedb=false" ]; passthru = { updateScript = gnome.updateScript { From c809e050bb98793669896452b81c42752ab7fa32 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:45 +0200 Subject: [PATCH 19/93] gnome-notes: Move from gnome scope to top-level --- .../default.nix => by-name/gn/gnome-notes/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-notes/default.nix => by-name/gn/gnome-notes/package.nix} (94%) diff --git a/pkgs/desktops/gnome/apps/gnome-notes/default.nix b/pkgs/by-name/gn/gnome-notes/package.nix similarity index 94% rename from pkgs/desktops/gnome/apps/gnome-notes/default.nix rename to pkgs/by-name/gn/gnome-notes/package.nix index 80c94c76afd3..278a84349abb 100644 --- a/pkgs/desktops/gnome/apps/gnome-notes/default.nix +++ b/pkgs/by-name/gn/gnome-notes/package.nix @@ -82,10 +82,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dupdate_mimedb=false" ]; passthru = { - updateScript = gnome.updateScript { - packageName = "bijiben"; - attrPath = "gnome.gnome-notes"; - }; + updateScript = gnome.updateScript { packageName = "bijiben"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index d9b983e4fbe5..3064a8fd1663 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-notes = callPackage ./apps/gnome-notes { }; - gnome-power-manager = callPackage ./apps/gnome-power-manager { }; gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; @@ -192,6 +190,7 @@ in gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11. + gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. From 329d59cb9e211ea8897f7e5270b1f80716f6820e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:45 +0200 Subject: [PATCH 20/93] gnome.gnome-power-manager: Format with nixfmt --- .../apps/gnome-power-manager/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix index 0f630593101b..88e8f2d0dc26 100644 --- a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -1,17 +1,18 @@ -{ stdenv -, lib -, gettext -, fetchurl -, pkg-config -, gtk3 -, glib -, meson -, ninja -, upower -, python3 -, desktop-file-utils -, wrapGAppsHook3 -, gnome +{ + stdenv, + lib, + gettext, + fetchurl, + pkg-config, + gtk3, + glib, + meson, + ninja, + upower, + python3, + desktop-file-utils, + wrapGAppsHook3, + gnome, }: stdenv.mkDerivation rec { From 5331a0c15cf3deed2967da388fd897bb83bb6b21 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:46 +0200 Subject: [PATCH 21/93] gnome-power-manager: Move from gnome scope to top-level --- .../gn/gnome-power-manager/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- pkgs/desktops/pantheon/default.nix | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-power-manager/default.nix => by-name/gn/gnome-power-manager/package.nix} (88%) diff --git a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix b/pkgs/by-name/gn/gnome-power-manager/package.nix similarity index 88% rename from pkgs/desktops/gnome/apps/gnome-power-manager/default.nix rename to pkgs/by-name/gn/gnome-power-manager/package.nix index 88e8f2d0dc26..607c5f084139 100644 --- a/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix +++ b/pkgs/by-name/gn/gnome-power-manager/package.nix @@ -44,10 +44,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-power-manager"; - attrPath = "gnome.gnome-power-manager"; - }; + updateScript = gnome.updateScript { packageName = "gnome-power-manager"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 3064a8fd1663..1d34ff900e0a 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-power-manager = callPackage ./apps/gnome-power-manager { }; - gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; gnome-weather = callPackage ./apps/gnome-weather { }; @@ -192,6 +190,7 @@ in gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11. gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. + gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index e0f08e6e2031..ac952130f482 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -155,9 +155,7 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { }; - wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { - inherit (gnome) gnome-power-manager; - }; + wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { }; wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; From b7e102ce3c693bfdb812daa1ff5e7811bde88880 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:46 +0200 Subject: [PATCH 22/93] gnome.gnome-sound-recorder: Format with nixfmt --- .../apps/gnome-sound-recorder/default.nix | 69 ++++++++++--------- 1 file changed, 36 insertions(+), 33 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 994dcf78854a..31aeadec7968 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -1,21 +1,22 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, gettext -, gobject-introspection -, wrapGAppsHook4 -, gjs -, glib -, gtk4 -, gdk-pixbuf -, gst_all_1 -, gnome -, meson -, ninja -, python3 -, desktop-file-utils -, libadwaita +{ + stdenv, + lib, + fetchurl, + pkg-config, + gettext, + gobject-introspection, + wrapGAppsHook4, + gjs, + glib, + gtk4, + gdk-pixbuf, + gst_all_1, + gnome, + meson, + ninja, + python3, + desktop-file-utils, + libadwaita, }: stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { version = "43.beta"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-sound-recorder/${lib.versions.major version}/gnome-sound-recorder-${version}.tar.xz"; sha256 = "bbbbmjsbUv0KtU+aW/Tymctx5SoTrF/fw+dOtGmFpOY="; }; @@ -38,18 +39,20 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - buildInputs = [ - gjs - glib - gtk4 - gdk-pixbuf - libadwaita - ] ++ (with gst_all_1; [ - gstreamer - gst-plugins-base - gst-plugins-good - gst-plugins-bad # for gstreamer-player-1.0 - ]); + buildInputs = + [ + gjs + glib + gtk4 + gdk-pixbuf + libadwaita + ] + ++ (with gst_all_1; [ + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad # for gstreamer-player-1.0 + ]); postPatch = '' chmod +x build-aux/meson_post_install.py @@ -60,8 +63,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-sound-recorder"; + attrPath = "gnome.gnome-sound-recorder"; }; }; From 30b3caaa5e6113d79f29c61f58a4e7c89dfe5c66 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:47 +0200 Subject: [PATCH 23/93] gnome-sound-recorder: Move from gnome scope to top-level --- .../gn/gnome-sound-recorder/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-sound-recorder/default.nix => by-name/gn/gnome-sound-recorder/package.nix} (91%) diff --git a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix b/pkgs/by-name/gn/gnome-sound-recorder/package.nix similarity index 91% rename from pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix rename to pkgs/by-name/gn/gnome-sound-recorder/package.nix index 31aeadec7968..846624fe6280 100644 --- a/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix +++ b/pkgs/by-name/gn/gnome-sound-recorder/package.nix @@ -62,10 +62,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-sound-recorder"; - attrPath = "gnome.gnome-sound-recorder"; - }; + updateScript = gnome.updateScript { packageName = "gnome-sound-recorder"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 1d34ff900e0a..d8271d979c8f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-sound-recorder = callPackage ./apps/gnome-sound-recorder { }; - gnome-weather = callPackage ./apps/gnome-weather { }; polari = callPackage ./apps/polari { }; @@ -192,6 +190,7 @@ in gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. + gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22. From 7388144cf296d3dc9399a1acaef1b3b806963fd6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:47 +0200 Subject: [PATCH 24/93] gnome.gnome-weather: Format with nixfmt --- .../gnome/apps/gnome-weather/default.nix | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix index 6f0f2e1d439c..c849b2db2ca7 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchurl -, desktop-file-utils -, pkg-config -, gnome -, adwaita-icon-theme -, gtk4 -, libadwaita -, wrapGAppsHook4 -, gjs -, gobject-introspection -, libgweather -, meson -, ninja -, geoclue2 -, python3 -, gsettings-desktop-schemas +{ + lib, + stdenv, + fetchurl, + desktop-file-utils, + pkg-config, + gnome, + adwaita-icon-theme, + gtk4, + libadwaita, + wrapGAppsHook4, + gjs, + gobject-introspection, + libgweather, + meson, + ninja, + geoclue2, + python3, + gsettings-desktop-schemas, }: stdenv.mkDerivation rec { @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz"; hash = "sha256-FTgmcFzPZy4U8v5N/Hgvjom3xMvkqv6VpVMvveej1J0="; }; From bb4d62ac72a3c8256d46bc02f6b274ce519cfd73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:48 +0200 Subject: [PATCH 25/93] gnome-weather: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-weather/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/apps/gnome-weather/default.nix => by-name/gn/gnome-weather/package.nix} (92%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 2cab8220b5e4..a41997b2fc5a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -412,7 +412,7 @@ in pkgs.gnome-maps pkgs.gnome-music pkgs.gnome-system-monitor - gnome-weather + pkgs.gnome-weather pkgs.loupe pkgs.nautilus pkgs.gnome-connections diff --git a/pkgs/desktops/gnome/apps/gnome-weather/default.nix b/pkgs/by-name/gn/gnome-weather/package.nix similarity index 92% rename from pkgs/desktops/gnome/apps/gnome-weather/default.nix rename to pkgs/by-name/gn/gnome-weather/package.nix index c849b2db2ca7..d593124ab7ed 100644 --- a/pkgs/desktops/gnome/apps/gnome-weather/default.nix +++ b/pkgs/by-name/gn/gnome-weather/package.nix @@ -63,10 +63,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-weather"; - attrPath = "gnome.gnome-weather"; - }; + updateScript = gnome.updateScript { packageName = "gnome-weather"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index d8271d979c8f..16ef1a07b115 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - gnome-weather = callPackage ./apps/gnome-weather { }; - polari = callPackage ./apps/polari { }; vinagre = callPackage ./apps/vinagre { }; @@ -196,6 +194,7 @@ in gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22. gnome-tweaks = lib.warn "The ‘gnome.gnome-tweaks’ was moved to top-level. Please use ‘pkgs.gnome-tweaks’ directly." pkgs.gnome-tweaks; # Added on 2024-06-22. gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. + gnome-weather = lib.warn "The ‘gnome.gnome-weather’ was moved to top-level. Please use ‘pkgs.gnome-weather’ directly." pkgs.gnome-weather; # Added on 2024-08-11. gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. From 5efca33abd5b076624013abb99b31c8f87468c3b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:48 +0200 Subject: [PATCH 26/93] gnome.polari: Format with nixfmt --- pkgs/desktops/gnome/apps/polari/default.nix | 65 ++++++++++----------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix index 65ff3851e6ae..bf4fe474121e 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,30 +1,31 @@ -{ stdenv -, lib -, itstool -, fetchurl -, gdk-pixbuf -, telepathy-glib -, gjs -, meson -, ninja -, gettext -, telepathy-idle -, libxml2 -, desktop-file-utils -, pkg-config -, gtk4 -, tracker -, libadwaita -, gtk3 -, glib -, libsecret -, libsoup_3 -, webkitgtk_4_1 -, gobject-introspection -, gnome -, wrapGAppsHook4 -, gspell -, gsettings-desktop-schemas +{ + stdenv, + lib, + itstool, + fetchurl, + gdk-pixbuf, + telepathy-glib, + gjs, + meson, + ninja, + gettext, + telepathy-idle, + libxml2, + desktop-file-utils, + pkg-config, + gtk4, + tracker, + libadwaita, + gtk3, + glib, + libsecret, + libsoup_3, + webkitgtk_4_1, + gobject-introspection, + gnome, + wrapGAppsHook4, + gspell, + gsettings-desktop-schemas, }: stdenv.mkDerivation rec { @@ -32,7 +33,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/polari/${lib.versions.major version}/polari-${version}.tar.xz"; hash = "sha256-0rFwnjeRiSlPU9TvFfA/i8u76MUvD0FeYvfV8Aw2CjE="; }; @@ -43,9 +44,7 @@ stdenv.mkDerivation rec { ./make-thumbnailer-wrappable.patch ]; - propagatedUserEnvPkgs = [ - telepathy-idle - ]; + propagatedUserEnvPkgs = [ telepathy-idle ]; nativeBuildInputs = [ meson @@ -81,8 +80,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "polari"; + attrPath = "gnome.polari"; }; }; From 1e2a2205f01123ca13d16ca8c7ac2b9a6bc20ebe Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:49 +0200 Subject: [PATCH 27/93] polari: Move from gnome scope to top-level --- .../po}/polari/make-thumbnailer-wrappable.patch | 0 .../polari/default.nix => by-name/po/polari/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{desktops/gnome/apps => by-name/po}/polari/make-thumbnailer-wrappable.patch (100%) rename pkgs/{desktops/gnome/apps/polari/default.nix => by-name/po/polari/package.nix} (94%) diff --git a/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/by-name/po/polari/make-thumbnailer-wrappable.patch similarity index 100% rename from pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch rename to pkgs/by-name/po/polari/make-thumbnailer-wrappable.patch diff --git a/pkgs/desktops/gnome/apps/polari/default.nix b/pkgs/by-name/po/polari/package.nix similarity index 94% rename from pkgs/desktops/gnome/apps/polari/default.nix rename to pkgs/by-name/po/polari/package.nix index bf4fe474121e..69cee89770dd 100644 --- a/pkgs/desktops/gnome/apps/polari/default.nix +++ b/pkgs/by-name/po/polari/package.nix @@ -79,10 +79,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "polari"; - attrPath = "gnome.polari"; - }; + updateScript = gnome.updateScript { packageName = "polari"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 16ef1a07b115..f87f6b1c9443 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -90,8 +90,6 @@ in #### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - polari = callPackage ./apps/polari { }; - vinagre = callPackage ./apps/vinagre { }; #### Games @@ -199,6 +197,7 @@ in gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. + polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. pomodoro = lib.warn "The ‘gnome.pomodoro’ was moved to top-level. Please use ‘pkgs.gnome-pomodoro’ directly." pkgs.gnome-pomodoro; # Added on 2024-06-22. rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22. seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22. From 1da4f864b63e4dd20f1355453a87687356c0cb08 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:49 +0200 Subject: [PATCH 28/93] gnome.vinagre: Format with nixfmt --- pkgs/desktops/gnome/apps/vinagre/default.nix | 38 +++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix index 636426ac2f37..e1dbf0a71882 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,12 +1,28 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, gtk3, gnome, adwaita-icon-theme, vte, libxml2, gtk-vnc, intltool -, libsecret, itstool, wrapGAppsHook3, librsvg }: +{ + lib, + stdenv, + fetchurl, + fetchpatch, + pkg-config, + gtk3, + gnome, + adwaita-icon-theme, + vte, + libxml2, + gtk-vnc, + intltool, + libsecret, + itstool, + wrapGAppsHook3, + librsvg, +}: stdenv.mkDerivation rec { pname = "vinagre"; version = "3.22.0"; src = fetchurl { - url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/vinagre/${lib.versions.majorMinor version}/vinagre-${version}.tar.xz"; sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; @@ -20,9 +36,21 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook3 ]; + nativeBuildInputs = [ + pkg-config + intltool + itstool + wrapGAppsHook3 + ]; + buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret adwaita-icon-theme librsvg + gtk3 + vte + libxml2 + gtk-vnc + libsecret + adwaita-icon-theme + librsvg ]; env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; From 885eab59d568b88f8a018fe496f41ee6897e0c51 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:50 +0200 Subject: [PATCH 29/93] vinagre: Move from gnome scope to top-level --- .../vinagre/default.nix => by-name/vi/vinagre/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) rename pkgs/{desktops/gnome/apps/vinagre/default.nix => by-name/vi/vinagre/package.nix} (92%) diff --git a/pkgs/desktops/gnome/apps/vinagre/default.nix b/pkgs/by-name/vi/vinagre/package.nix similarity index 92% rename from pkgs/desktops/gnome/apps/vinagre/default.nix rename to pkgs/by-name/vi/vinagre/package.nix index e1dbf0a71882..23c5cf647554 100644 --- a/pkgs/desktops/gnome/apps/vinagre/default.nix +++ b/pkgs/by-name/vi/vinagre/package.nix @@ -56,10 +56,7 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; passthru = { - updateScript = gnome.updateScript { - packageName = "vinagre"; - attrPath = "gnome.vinagre"; - }; + updateScript = gnome.updateScript { packageName = "vinagre"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index f87f6b1c9443..22a20af9094c 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -88,10 +88,6 @@ in nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; -#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/) - - vinagre = callPackage ./apps/vinagre { }; - #### Games aisleriot = callPackage ./games/aisleriot { }; @@ -204,6 +200,7 @@ in simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22. sushi = lib.warn "The ‘gnome.sushi’ was moved to top-level. Please use ‘pkgs.sushi’ directly." pkgs.sushi; # Added on 2024-06-22. totem = lib.warn "The ‘gnome.totem’ was moved to top-level. Please use ‘pkgs.totem’ directly." pkgs.totem; # Added on 2024-06-22. + vinagre = lib.warn "The ‘gnome.vinagre’ was moved to top-level. Please use ‘pkgs.vinagre’ directly." pkgs.vinagre; # Added on 2024-08-11. yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # Added on 2024-06-22. yelp-xsl = lib.warn "The ‘gnome.yelp-xsl’ was moved to top-level. Please use ‘pkgs.yelp-xsl’ directly." pkgs.yelp-xsl; # Added on 2024-06-22. zenity = lib.warn "The ‘gnome.zenity’ was moved to top-level. Please use ‘pkgs.zenity’ directly." pkgs.zenity; # Added on 2024-06-22. From a95a3350d8898839e7feecdd19929c45f9bbd438 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:50 +0200 Subject: [PATCH 30/93] gnome.gnome-contacts: Format with nixfmt --- .../gnome/core/gnome-contacts/default.nix | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix index 5dd008cc5c03..b06350742473 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -1,27 +1,28 @@ -{ lib -, stdenv -, gettext -, fetchurl -, evolution-data-server-gtk4 -, pkg-config -, libxslt -, docbook-xsl-nons -, docbook_xml_dtd_42 -, desktop-file-utils -, gtk4 -, glib -, libportal-gtk4 -, gnome-online-accounts -, qrencode -, wrapGAppsHook4 -, folks -, libxml2 -, gnome -, vala -, meson -, ninja -, libadwaita -, gsettings-desktop-schemas +{ + lib, + stdenv, + gettext, + fetchurl, + evolution-data-server-gtk4, + pkg-config, + libxslt, + docbook-xsl-nons, + docbook_xml_dtd_42, + desktop-file-utils, + gtk4, + glib, + libportal-gtk4, + gnome-online-accounts, + qrencode, + wrapGAppsHook4, + folks, + libxml2, + gnome, + vala, + meson, + ninja, + libadwaita, + gsettings-desktop-schemas, }: stdenv.mkDerivation rec { @@ -29,7 +30,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz"; hash = "sha256-cK606DWhx3+bzH5XotzCN22TvbYXVxYYJXRF9WxjcN8="; }; From 572d0e4403c3b4c091d19cd4325cd2b15220857b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:51 +0200 Subject: [PATCH 31/93] gnome-contacts: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-contacts/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/core/gnome-contacts/default.nix => by-name/gn/gnome-contacts/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index a41997b2fc5a..63d33d306009 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -406,7 +406,7 @@ in pkgs.gnome-characters pkgs.gnome-clocks pkgs.gnome-console - gnome-contacts + pkgs.gnome-contacts pkgs.gnome-font-viewer pkgs.gnome-logs pkgs.gnome-maps diff --git a/pkgs/desktops/gnome/core/gnome-contacts/default.nix b/pkgs/by-name/gn/gnome-contacts/package.nix similarity index 91% rename from pkgs/desktops/gnome/core/gnome-contacts/default.nix rename to pkgs/by-name/gn/gnome-contacts/package.nix index b06350742473..8adb73248323 100644 --- a/pkgs/desktops/gnome/core/gnome-contacts/default.nix +++ b/pkgs/by-name/gn/gnome-contacts/package.nix @@ -63,10 +63,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-contacts"; - attrPath = "gnome.gnome-contacts"; - }; + updateScript = gnome.updateScript { packageName = "gnome-contacts"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 22a20af9094c..57ef762df9ea 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -32,8 +32,6 @@ in gnome-color-manager = callPackage ./core/gnome-color-manager { }; - gnome-contacts = callPackage ./core/gnome-contacts { }; - gnome-control-center = callPackage ./core/gnome-control-center { }; gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; @@ -170,6 +168,7 @@ in gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. + gnome-contacts = lib.warn "The ‘gnome.gnome-contacts’ was moved to top-level. Please use ‘pkgs.gnome-contacts’ directly." pkgs.gnome-contacts; # Added on 2024-08-11. gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22. gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22. gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. From 0c660db41c9004ed0b54db6346581cd09257188d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:51 +0200 Subject: [PATCH 32/93] gnome.gnome-backgrounds: Format with nixfmt --- .../gnome/core/gnome-backgrounds/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index f60631ac2280..1b1f1a241173 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -1,9 +1,10 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, gnome +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + gnome, }: stdenv.mkDerivation rec { @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz"; hash = "sha256-Td06xDmkoGeHaAWSG7dfTTyLhaIY1Hwnbd3eiShEPC4="; }; From 6e8760f7f7121128e2037db44915a4a5450b6e67 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:52 +0200 Subject: [PATCH 33/93] gnome-backgrounds: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-backgrounds/package.nix} | 5 +---- .../core => by-name/gn}/gnome-backgrounds/stable-dir.patch | 0 pkgs/desktops/gnome/default.nix | 3 +-- 4 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/core/gnome-backgrounds/default.nix => by-name/gn/gnome-backgrounds/package.nix} (88%) rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-backgrounds/stable-dir.patch (100%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 63d33d306009..2f11e37b87e7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -374,7 +374,7 @@ in optionalPackages = with pkgs.gnome; [ pkgs.adwaita-icon-theme nixos-background-info - gnome-backgrounds + pkgs.gnome-backgrounds gnome-bluetooth gnome-color-manager gnome-control-center diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix similarity index 88% rename from pkgs/desktops/gnome/core/gnome-backgrounds/default.nix rename to pkgs/by-name/gn/gnome-backgrounds/package.nix index 1b1f1a241173..f9bf5ecf4ab5 100644 --- a/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix +++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix @@ -29,10 +29,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-backgrounds"; - attrPath = "gnome.gnome-backgrounds"; - }; + updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch b/pkgs/by-name/gn/gnome-backgrounds/stable-dir.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-backgrounds/stable-dir.patch rename to pkgs/by-name/gn/gnome-backgrounds/stable-dir.patch diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 57ef762df9ea..ae530b3e6c04 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -24,8 +24,6 @@ in gdm = callPackage ./core/gdm { }; - gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; @@ -162,6 +160,7 @@ in ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. gnome-autoar = lib.warn "The ‘gnome.gnome-autoar’ was moved to top-level. Please use ‘pkgs.gnome-autoar’ directly." pkgs.gnome-autoar; # Added on 2024-06-13. + gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11. gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. gnome-clocks = lib.warn "The ‘gnome.gnome-clocks’ was moved to top-level. Please use ‘pkgs.gnome-clocks’ directly." pkgs.gnome-clocks; # Added on 2024-08-11. From fa14462bbb32901befe241436a6883aec793908e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:53 +0200 Subject: [PATCH 34/93] gnome.gnome-bluetooth: Format with nixfmt --- .../gnome/core/gnome-bluetooth/default.nix | 72 ++++++++++--------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index f06954aec2fd..9e4944221c15 100644 --- a/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -1,28 +1,29 @@ -{ lib -, stdenv -, fetchurl -, gnome -, meson -, mesonEmulatorHook -, ninja -, pkg-config -, gtk4 -, libadwaita -, gettext -, glib -, udev -, upower -, itstool -, libxml2 -, wrapGAppsHook4 -, libnotify -, gsound -, gobject-introspection -, gtk-doc -, docbook-xsl-nons -, docbook_xml_dtd_43 -, python3 -, gsettings-desktop-schemas +{ + lib, + stdenv, + fetchurl, + gnome, + meson, + mesonEmulatorHook, + ninja, + pkg-config, + gtk4, + libadwaita, + gettext, + glib, + udev, + upower, + itstool, + libxml2, + wrapGAppsHook4, + libnotify, + gsound, + gobject-introspection, + gtk-doc, + docbook-xsl-nons, + docbook_xml_dtd_43, + python3, + gsettings-desktop-schemas, }: stdenv.mkDerivation rec { @@ -30,10 +31,15 @@ stdenv.mkDerivation rec { version = "46.1"; # TODO: split out "lib" - outputs = [ "out" "dev" "devdoc" "man" ]; + outputs = [ + "out" + "dev" + "devdoc" + "man" + ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-bluetooth/${lib.versions.major version}/gnome-bluetooth-${version}.tar.xz"; hash = "sha256-VsRKFwNFmOlgdFivrhvnXz3l798OYjVfCbpY/HvDEqw="; }; @@ -50,9 +56,7 @@ stdenv.mkDerivation rec { docbook-xsl-nons docbook_xml_dtd_43 python3 - ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ - mesonEmulatorHook - ]; + ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; buildInputs = [ glib @@ -65,14 +69,12 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas ]; - mesonFlags = [ - "-Dgtk_doc=true" - ]; + mesonFlags = [ "-Dgtk_doc=true" ]; passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-bluetooth"; + attrPath = "gnome.gnome-bluetooth"; }; }; From 3839d9787be953b9f5bbe7b2e2ba1bc7fac44801 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:54 +0200 Subject: [PATCH 35/93] gnome.gnome-color-manager: Format with nixfmt --- .../core/gnome-color-manager/default.nix | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 81681925b4cd..afdf6cf3fe92 100644 --- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -1,22 +1,24 @@ -{ lib, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, gettext -, itstool -, desktop-file-utils -, gnome -, glib -, gtk3 -, libexif -, libtiff -, colord -, colord-gtk -, libcanberra-gtk3 -, lcms2 -, vte -, exiv2 +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + gettext, + itstool, + desktop-file-utils, + gnome, + glib, + gtk3, + libexif, + libtiff, + colord, + colord-gtk, + libcanberra-gtk3, + lcms2, + vte, + exiv2, }: stdenv.mkDerivation rec { @@ -24,13 +26,11 @@ stdenv.mkDerivation rec { version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-color-manager/${lib.versions.majorMinor version}/gnome-color-manager-${version}.tar.xz"; sha256 = "1vpxa2zjz3lkq9ldjg0fl65db9s6b4kcs8nyaqfz3jygma7ifg3w"; }; - patches = [ - ./0001-Fix-build-with-Exiv2-0.28.patch - ]; + patches = [ ./0001-Fix-build-with-Exiv2-0.28.patch ]; nativeBuildInputs = [ meson @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-color-manager"; + attrPath = "gnome.gnome-color-manager"; freeze = true; }; }; From 138941d672ee443281aec00f52a892abb96438ff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:55 +0200 Subject: [PATCH 36/93] gnome-color-manager: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- pkgs/by-name/bu/budgie-control-center/package.nix | 3 ++- .../gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch | 0 .../default.nix => by-name/gn/gnome-color-manager/package.nix} | 1 - pkgs/desktops/gnome/default.nix | 3 +-- 5 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch (100%) rename pkgs/{desktops/gnome/core/gnome-color-manager/default.nix => by-name/gn/gnome-color-manager/package.nix} (96%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 2f11e37b87e7..9b17226a5bf1 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -376,7 +376,7 @@ in nixos-background-info pkgs.gnome-backgrounds gnome-bluetooth - gnome-color-manager + pkgs.gnome-color-manager gnome-control-center gnome-shell-extensions pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 65feaa196b9b..418a4d5493f1 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -21,6 +21,7 @@ glib-networking, glibc, gnome, + gnome-color-manager, gnome-desktop, gnome-user-share, gsettings-desktop-schemas, @@ -78,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { (substituteAll { src = ./paths.patch; budgie_desktop = budgie-desktop; - gcm = gnome.gnome-color-manager; + gcm = gnome-color-manager; inherit cups glibc diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch b/pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch rename to pkgs/by-name/gn/gnome-color-manager/0001-Fix-build-with-Exiv2-0.28.patch diff --git a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix b/pkgs/by-name/gn/gnome-color-manager/package.nix similarity index 96% rename from pkgs/desktops/gnome/core/gnome-color-manager/default.nix rename to pkgs/by-name/gn/gnome-color-manager/package.nix index afdf6cf3fe92..eddc4c5d432f 100644 --- a/pkgs/desktops/gnome/core/gnome-color-manager/default.nix +++ b/pkgs/by-name/gn/gnome-color-manager/package.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "gnome-color-manager"; - attrPath = "gnome.gnome-color-manager"; freeze = true; }; }; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index ae530b3e6c04..6a4827fae437 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -28,8 +28,6 @@ in gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; - gnome-color-manager = callPackage ./core/gnome-color-manager { }; - gnome-control-center = callPackage ./core/gnome-control-center { }; gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; @@ -164,6 +162,7 @@ in gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. gnome-clocks = lib.warn "The ‘gnome.gnome-clocks’ was moved to top-level. Please use ‘pkgs.gnome-clocks’ directly." pkgs.gnome-clocks; # Added on 2024-08-11. + gnome-color-manager = lib.warn "The ‘gnome.gnome-color-manager’ was moved to top-level. Please use ‘pkgs.gnome-color-manager’ directly." pkgs.gnome-color-manager; # Added on 2024-08-11. gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. gnome-calculator = lib.warn "The ‘gnome.gnome-calculator’ was moved to top-level. Please use ‘pkgs.gnome-calculator’ directly." pkgs.gnome-calculator; # Added on 2024-06-22. gnome-calendar = lib.warn "The ‘gnome.gnome-calendar’ was moved to top-level. Please use ‘pkgs.gnome-calendar’ directly." pkgs.gnome-calendar; # Added on 2024-06-22. From 4f1ded697ab711d758d574972a9ed1be6027b392 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:55 +0200 Subject: [PATCH 37/93] gnome.gnome-software: Format with nixfmt --- .../gnome/core/gnome-software/default.nix | 89 +++++++++---------- 1 file changed, 43 insertions(+), 46 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix index 3a6748723636..c7d2dc271f7a 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -1,43 +1,44 @@ -{ lib -, stdenv -, fetchurl -, substituteAll -, pkg-config -, meson -, ninja -, gettext -, gnome -, wrapGAppsHook4 -, packagekit -, ostree -, glib -, appstream -, libsoup_3 -, libadwaita -, polkit -, isocodes -, gspell -, libxslt -, gobject-introspection -, flatpak -, fwupd -, gtk4 -, gsettings-desktop-schemas -, gnome-desktop -, libgudev -, libxmlb -, malcontent -, json-glib -, glib-networking -, libsecret -, valgrind-light -, docbook-xsl-nons -, docbook_xml_dtd_42 -, docbook_xml_dtd_43 -, gtk-doc -, desktop-file-utils -, libsysprof-capture -, gst_all_1 +{ + lib, + stdenv, + fetchurl, + substituteAll, + pkg-config, + meson, + ninja, + gettext, + gnome, + wrapGAppsHook4, + packagekit, + ostree, + glib, + appstream, + libsoup_3, + libadwaita, + polkit, + isocodes, + gspell, + libxslt, + gobject-introspection, + flatpak, + fwupd, + gtk4, + gsettings-desktop-schemas, + gnome-desktop, + libgudev, + libxmlb, + malcontent, + json-glib, + glib-networking, + libsecret, + valgrind-light, + docbook-xsl-nons, + docbook_xml_dtd_42, + docbook_xml_dtd_43, + gtk-doc, + desktop-file-utils, + libsysprof-capture, + gst_all_1, }: let @@ -99,16 +100,12 @@ stdenv.mkDerivation (finalAttrs: { # For video screenshots gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - ] ++ lib.optionals withFwupd [ - fwupd - ]; + ] ++ lib.optionals withFwupd [ fwupd ]; mesonFlags = [ # Requires /etc/machine-id, D-Bus system bus, etc. "-Dtests=false" - ] ++ lib.optionals (!withFwupd) [ - "-Dfwupd=false" - ]; + ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; passthru = { updateScript = gnome.updateScript { From 967bb64c16724a1c37698d8ca59aaba9bd9ca6ba Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:56 +0200 Subject: [PATCH 38/93] gnome-software: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 3 +-- .../gnome/core => by-name/gn}/gnome-software/fix-paths.patch | 0 .../default.nix => by-name/gn/gnome-software/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-software/fix-paths.patch (100%) rename pkgs/{desktops/gnome/core/gnome-software/default.nix => by-name/gn/gnome-software/package.nix} (94%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 9b17226a5bf1..cf54adc1a24c 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -395,7 +395,6 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-45/elements/core/meta-gnome-core-utilities.bst (lib.mkIf serviceCfg.core-utilities.enable { environment.systemPackages = - with pkgs.gnome; utils.removePackagesByName ([ pkgs.baobab @@ -423,7 +422,7 @@ in ] ++ lib.optionals config.services.flatpak.enable [ # Since PackageKit Nix support is not there yet, # only install gnome-software if flatpak is enabled. - gnome-software + pkgs.gnome-software ]) config.environment.gnome.excludePackages; diff --git a/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch b/pkgs/by-name/gn/gnome-software/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-software/fix-paths.patch rename to pkgs/by-name/gn/gnome-software/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-software/default.nix b/pkgs/by-name/gn/gnome-software/package.nix similarity index 94% rename from pkgs/desktops/gnome/core/gnome-software/default.nix rename to pkgs/by-name/gn/gnome-software/package.nix index c7d2dc271f7a..8636bb0d3b36 100644 --- a/pkgs/desktops/gnome/core/gnome-software/default.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -108,10 +108,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!withFwupd) [ "-Dfwupd=false" ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-software"; - attrPath = "gnome.gnome-software"; - }; + updateScript = gnome.updateScript { packageName = "gnome-software"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 6a4827fae437..fdbd7b8e796f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -47,8 +47,6 @@ in # Using 43 to match Mutter used in Pantheon gnome-settings-daemon43 = callPackage ./core/gnome-settings-daemon/43 { }; - gnome-software = callPackage ./core/gnome-software { }; - gvfs = pkgs.gvfs.override { gnomeSupport = true; }; mutter = callPackage ./core/mutter { }; @@ -179,6 +177,7 @@ in gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. + gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. From 591060cf881adea044a03b1e28f1d8fdd6b3f8cb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:56 +0200 Subject: [PATCH 39/93] gnome.gnome-remote-desktop: Format with nixfmt --- .../core/gnome-remote-desktop/default.nix | 63 ++++++++++--------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix index 1c88978fcd75..2d80375c167f 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix @@ -1,31 +1,32 @@ -{ stdenv -, lib -, fetchurl -, cairo -, meson -, ninja -, pkg-config -, python3 -, asciidoc -, wrapGAppsHook3 -, glib -, libei -, libepoxy -, libdrm -, nv-codec-headers-11 -, pipewire -, systemd -, libsecret -, libnotify -, libopus -, libxkbcommon -, gdk-pixbuf -, freerdp3 -, fdk_aac -, tpm2-tss -, fuse3 -, gnome -, polkit +{ + stdenv, + lib, + fetchurl, + cairo, + meson, + ninja, + pkg-config, + python3, + asciidoc, + wrapGAppsHook3, + glib, + libei, + libepoxy, + libdrm, + nv-codec-headers-11, + pipewire, + systemd, + libsecret, + libnotify, + libopus, + libxkbcommon, + gdk-pixbuf, + freerdp3, + fdk_aac, + tpm2-tss, + fuse3, + gnome, + polkit, }: stdenv.mkDerivation rec { @@ -33,7 +34,7 @@ stdenv.mkDerivation rec { version = "46.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz"; hash = "sha256-KLwH6W2qFJy45NCldN8KLObsbOZHutyGFUzmEoIsxR4="; }; @@ -80,8 +81,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-remote-desktop"; + attrPath = "gnome.gnome-remote-desktop"; }; }; From 18859a6bad65a309ef7bdd844da020e7cd572aa7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:57 +0200 Subject: [PATCH 40/93] gnome-remote-desktop: Move from gnome scope to top-level --- .../services/desktops/gnome/gnome-remote-desktop.nix | 8 ++++---- pkgs/by-name/bu/budgie-control-center/package.nix | 3 ++- .../gn/gnome-remote-desktop/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 4 files changed, 8 insertions(+), 11 deletions(-) rename pkgs/{desktops/gnome/core/gnome-remote-desktop/default.nix => by-name/gn/gnome-remote-desktop/package.nix} (92%) diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix index d81a9edfa126..8ffb4a201e36 100644 --- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -16,12 +16,12 @@ ###### implementation config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable { services.pipewire.enable = true; - services.dbus.packages = [ pkgs.gnome.gnome-remote-desktop ]; + services.dbus.packages = [ pkgs.gnome-remote-desktop ]; - environment.systemPackages = [ pkgs.gnome.gnome-remote-desktop ]; + environment.systemPackages = [ pkgs.gnome-remote-desktop ]; - systemd.packages = [ pkgs.gnome.gnome-remote-desktop ]; - systemd.tmpfiles.packages = [ pkgs.gnome.gnome-remote-desktop ]; + systemd.packages = [ pkgs.gnome-remote-desktop ]; + systemd.tmpfiles.packages = [ pkgs.gnome-remote-desktop ]; # TODO: if possible, switch to using provided g-r-d sysusers.d users = { diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix index 418a4d5493f1..3efe7787db6f 100644 --- a/pkgs/by-name/bu/budgie-control-center/package.nix +++ b/pkgs/by-name/bu/budgie-control-center/package.nix @@ -23,6 +23,7 @@ gnome, gnome-color-manager, gnome-desktop, + gnome-remote-desktop, gnome-user-share, gsettings-desktop-schemas, gsound, @@ -116,7 +117,7 @@ stdenv.mkDerivation (finalAttrs: { adwaita-icon-theme cheese gnome.gnome-bluetooth_1_0 - gnome.gnome-remote-desktop + gnome-remote-desktop gnome.gnome-settings-daemon gnome-user-share gnome.mutter diff --git a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix similarity index 92% rename from pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix rename to pkgs/by-name/gn/gnome-remote-desktop/package.nix index 2d80375c167f..31896fef41b0 100644 --- a/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix +++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix @@ -80,10 +80,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-remote-desktop"; - attrPath = "gnome.gnome-remote-desktop"; - }; + updateScript = gnome.updateScript { packageName = "gnome-remote-desktop"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index fdbd7b8e796f..5f31400cd219 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -32,8 +32,6 @@ in gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; - gnome-remote-desktop = callPackage ./core/gnome-remote-desktop { }; - gnome-session = callPackage ./core/gnome-session { }; gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { }; @@ -176,6 +174,7 @@ in gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. + gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. From 82d86ea422fd8e0c31cf21ea84660e31a8459d40 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:57 +0200 Subject: [PATCH 41/93] gnome.aisleriot: Format with nixfmt --- .../gnome/games/aisleriot/default.nix | 40 +++++++++---------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix index 4e995a5098d1..8f9d2bee5c92 100644 --- a/pkgs/desktops/gnome/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchFromGitLab -, gitUpdater -, pkg-config -, itstool -, gtk3 -, wrapGAppsHook3 -, meson -, librsvg -, libxml2 -, desktop-file-utils -, guile -, libcanberra-gtk3 -, ninja -, yelp-tools +{ + stdenv, + lib, + fetchFromGitLab, + gitUpdater, + pkg-config, + itstool, + gtk3, + wrapGAppsHook3, + meson, + librsvg, + libxml2, + desktop-file-utils, + guile, + libcanberra-gtk3, + ninja, + yelp-tools, }: stdenv.mkDerivation (finalAttrs: { @@ -53,13 +54,10 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs src/lib/meson_compileschemas.py ''; - mesonFlags = [ - "-Dtheme_kde=false" - ]; + mesonFlags = [ "-Dtheme_kde=false" ]; passthru = { - updateScript = gitUpdater { - }; + updateScript = gitUpdater { }; }; meta = with lib; { From 659c2ac87ead9e08cb2517f9e32b2b1b8b3c7a73 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:58 +0200 Subject: [PATCH 42/93] aisleriot: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../aisleriot/default.nix => by-name/ai/aisleriot/package.nix} | 0 pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) rename pkgs/{desktops/gnome/games/aisleriot/default.nix => by-name/ai/aisleriot/package.nix} (100%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index cf54adc1a24c..423f3bfe9f07 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -455,7 +455,7 @@ in (lib.mkIf serviceCfg.games.enable { environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ - aisleriot + pkgs.aisleriot atomix five-or-more four-in-a-row diff --git a/pkgs/desktops/gnome/games/aisleriot/default.nix b/pkgs/by-name/ai/aisleriot/package.nix similarity index 100% rename from pkgs/desktops/gnome/games/aisleriot/default.nix rename to pkgs/by-name/ai/aisleriot/package.nix diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 5f31400cd219..d6f9df10ef8d 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - aisleriot = callPackage ./games/aisleriot { }; - atomix = callPackage ./games/atomix { }; five-or-more = callPackage ./games/five-or-more { }; @@ -141,6 +139,7 @@ in accerciser = lib.warn "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly." pkgs.accerciser; # Added on 2024-06-22. adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22. + aisleriot = lib.warn "The ‘gnome.aisleriot’ was moved to top-level. Please use ‘pkgs.aisleriot’ directly." pkgs.aisleriot; # Added on 2024-08-11. baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22. cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22. dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22. From 005b9b545b95cb888b3930a31d368154a2e7e6af Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:58 +0200 Subject: [PATCH 43/93] gnome.atomix: Format with nixfmt --- pkgs/desktops/gnome/games/atomix/default.nix | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix index 7b292054702b..2b6a5e72a708 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,17 +1,18 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, wrapGAppsHook3 -, python3 -, gettext -, gnome -, glib -, gtk3 -, libgnome-games-support -, gdk-pixbuf +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + wrapGAppsHook3, + python3, + gettext, + gnome, + glib, + gtk3, + libgnome-games-support, + gdk-pixbuf, }: stdenv.mkDerivation (finalAttrs: { From fcd5e77e535545f08d5cd598ba2c3f850dddf887 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:59 +0200 Subject: [PATCH 44/93] atomix: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../atomix/default.nix => by-name/at/atomix/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/atomix/default.nix => by-name/at/atomix/package.nix} (90%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 423f3bfe9f07..a9f9ca8f09e0 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -456,7 +456,7 @@ in (lib.mkIf serviceCfg.games.enable { environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ pkgs.aisleriot - atomix + pkgs.atomix five-or-more four-in-a-row pkgs.gnome-2048 diff --git a/pkgs/desktops/gnome/games/atomix/default.nix b/pkgs/by-name/at/atomix/package.nix similarity index 90% rename from pkgs/desktops/gnome/games/atomix/default.nix rename to pkgs/by-name/at/atomix/package.nix index 2b6a5e72a708..341e97d0c9ab 100644 --- a/pkgs/desktops/gnome/games/atomix/default.nix +++ b/pkgs/by-name/at/atomix/package.nix @@ -46,10 +46,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "atomix"; - attrPath = "gnome.atomix"; - }; + updateScript = gnome.updateScript { packageName = "atomix"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index d6f9df10ef8d..b11f5ce2a00f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - atomix = callPackage ./games/atomix { }; - five-or-more = callPackage ./games/five-or-more { }; four-in-a-row = callPackage ./games/four-in-a-row { }; @@ -140,6 +138,7 @@ in accerciser = lib.warn "The ‘gnome.accerciser’ was moved to top-level. Please use ‘pkgs.accerciser’ directly." pkgs.accerciser; # Added on 2024-06-22. adwaita-icon-theme = lib.warn "The ‘gnome.adwaita-icon-theme’ was moved to top-level. Please use ‘pkgs.adwaita-icon-theme’ directly." pkgs.adwaita-icon-theme; # Added on 2024-06-22. aisleriot = lib.warn "The ‘gnome.aisleriot’ was moved to top-level. Please use ‘pkgs.aisleriot’ directly." pkgs.aisleriot; # Added on 2024-08-11. + atomix = lib.warn "The ‘gnome.atomix’ was moved to top-level. Please use ‘pkgs.atomix’ directly." pkgs.atomix; # Added on 2024-08-11. baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22. cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22. dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22. From 4401fd2a058035fa999c10115a8eb5abfb772e92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:33:59 +0200 Subject: [PATCH 45/93] gnome.five-or-more: Format with nixfmt --- .../gnome/games/five-or-more/default.nix | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix index 099aecf7b411..870f1318716f 100644 --- a/pkgs/desktops/gnome/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gnome -, gtk3 -, wrapGAppsHook3 -, librsvg -, libgnome-games-support -, gettext -, itstool -, libxml2 -, python3 -, vala +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + gnome, + gtk3, + wrapGAppsHook3, + librsvg, + libgnome-games-support, + gettext, + itstool, + libxml2, + python3, + vala, }: stdenv.mkDerivation rec { @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { version = "3.32.3"; src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/five-or-more/${lib.versions.majorMinor version}/five-or-more-${version}.tar.xz"; sha256 = "LRDXLu/esyS0R9YyrwwySW4l/BWjwB230vAMm1HQnvQ="; }; From 31b95b8251e7b3ed8723f39ec3b35eb1701b9746 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:00 +0200 Subject: [PATCH 46/93] five-or-more: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/fi/five-or-more/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/five-or-more/default.nix => by-name/fi/five-or-more/package.nix} (90%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index a9f9ca8f09e0..55c91dc4f7c2 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -457,7 +457,7 @@ in environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ pkgs.aisleriot pkgs.atomix - five-or-more + pkgs.five-or-more four-in-a-row pkgs.gnome-2048 gnome-chess diff --git a/pkgs/desktops/gnome/games/five-or-more/default.nix b/pkgs/by-name/fi/five-or-more/package.nix similarity index 90% rename from pkgs/desktops/gnome/games/five-or-more/default.nix rename to pkgs/by-name/fi/five-or-more/package.nix index 870f1318716f..7c66f4da4a61 100644 --- a/pkgs/desktops/gnome/games/five-or-more/default.nix +++ b/pkgs/by-name/fi/five-or-more/package.nix @@ -50,10 +50,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "five-or-more"; - attrPath = "gnome.five-or-more"; - }; + updateScript = gnome.updateScript { packageName = "five-or-more"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b11f5ce2a00f..51e8704d65fe 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - five-or-more = callPackage ./games/five-or-more { }; - four-in-a-row = callPackage ./games/four-in-a-row { }; gnome-chess = callPackage ./games/gnome-chess { }; @@ -148,6 +146,7 @@ in evince = lib.warn "The ‘gnome.evince’ was moved to top-level. Please use ‘pkgs.evince’ directly." pkgs.evince; # Added on 2024-06-13. evolution-data-server = lib.warn "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly." pkgs.evolution-data-server; # Added on 2024-06-13. file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. + five-or-more = lib.warn "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly." pkgs.five-or-more; # Added on 2024-08-11. geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. From cc3c481aa3553fb5d7e149dd56cd3de1028d486f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:01 +0200 Subject: [PATCH 47/93] gnome.four-in-a-row: Format with nixfmt --- .../gnome/games/four-in-a-row/default.nix | 43 ++++++++++++++++--- 1 file changed, 36 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix index ed862db922fb..a64a6252fd05 100644 --- a/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -1,21 +1,50 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3 -, gettext, meson, gsound, librsvg, itstool, vala -, python3, ninja, desktop-file-utils }: +{ + lib, + stdenv, + fetchurl, + pkg-config, + gnome, + adwaita-icon-theme, + gtk3, + wrapGAppsHook3, + gettext, + meson, + gsound, + librsvg, + itstool, + vala, + python3, + ninja, + desktop-file-utils, +}: stdenv.mkDerivation rec { pname = "four-in-a-row"; version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/four-in-a-row/${lib.versions.majorMinor version}/four-in-a-row-${version}.tar.xz"; sha256 = "10ji60bdfdzb6wk5dkwjc3yww7hqi3yjcx1k1z7x2521h2dpdli1"; }; nativeBuildInputs = [ - pkg-config wrapGAppsHook3 gettext meson itstool vala - ninja python3 desktop-file-utils + pkg-config + wrapGAppsHook3 + gettext + meson + itstool + vala + ninja + python3 + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + gsound + librsvg + adwaita-icon-theme ]; - buildInputs = [ gtk3 gsound librsvg adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson_post_install.py From 076fe09eebc88d01901f2359281520abd7b1670f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:01 +0200 Subject: [PATCH 48/93] four-in-a-row: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/fo/four-in-a-row/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/four-in-a-row/default.nix => by-name/fo/four-in-a-row/package.nix} (90%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 55c91dc4f7c2..775244cd6e9a 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -458,7 +458,7 @@ in pkgs.aisleriot pkgs.atomix pkgs.five-or-more - four-in-a-row + pkgs.four-in-a-row pkgs.gnome-2048 gnome-chess gnome-klotski diff --git a/pkgs/desktops/gnome/games/four-in-a-row/default.nix b/pkgs/by-name/fo/four-in-a-row/package.nix similarity index 90% rename from pkgs/desktops/gnome/games/four-in-a-row/default.nix rename to pkgs/by-name/fo/four-in-a-row/package.nix index a64a6252fd05..f2b9b8335abe 100644 --- a/pkgs/desktops/gnome/games/four-in-a-row/default.nix +++ b/pkgs/by-name/fo/four-in-a-row/package.nix @@ -52,10 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "four-in-a-row"; - attrPath = "gnome.four-in-a-row"; - }; + updateScript = gnome.updateScript { packageName = "four-in-a-row"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 51e8704d65fe..efe5c465a459 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - four-in-a-row = callPackage ./games/four-in-a-row { }; - gnome-chess = callPackage ./games/gnome-chess { }; gnome-klotski = callPackage ./games/gnome-klotski { }; @@ -147,6 +145,7 @@ in evolution-data-server = lib.warn "The ‘gnome.evolution-data-server’ was moved to top-level. Please use ‘pkgs.evolution-data-server’ directly." pkgs.evolution-data-server; # Added on 2024-06-13. file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. five-or-more = lib.warn "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly." pkgs.five-or-more; # Added on 2024-08-11. + four-in-a-row = lib.warn "The ‘gnome.four-in-a-row’ was moved to top-level. Please use ‘pkgs.four-in-a-row’ directly." pkgs.four-in-a-row; # Added on 2024-08-11. geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. From 6b1e30370b62bab5372e0fbf4c742937762850eb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:02 +0200 Subject: [PATCH 49/93] gnome.gnome-chess: Format with nixfmt --- .../gnome/games/gnome-chess/default.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix index 53d656b93fc3..8ed5426d9e77 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, vala -, pkg-config -, desktop-file-utils -, wrapGAppsHook4 -, gobject-introspection -, gettext -, itstool -, libxml2 -, gnome -, glib -, gtk4 -, libadwaita -, librsvg -, pango +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + vala, + pkg-config, + desktop-file-utils, + wrapGAppsHook4, + gobject-introspection, + gettext, + itstool, + libxml2, + gnome, + glib, + gtk4, + libadwaita, + librsvg, + pango, }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz"; hash = "sha256-oryQ4KdUMSxXibkZi0knMDd1tiWDqOlnbSxqlztG/ec="; }; From fa58a27b35321608a576260953fd4750f53ba376 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:02 +0200 Subject: [PATCH 50/93] gnome-chess: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-chess/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-chess/default.nix => by-name/gn/gnome-chess/package.nix} (89%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 775244cd6e9a..e30ee1257148 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -460,7 +460,7 @@ in pkgs.five-or-more pkgs.four-in-a-row pkgs.gnome-2048 - gnome-chess + pkgs.gnome-chess gnome-klotski gnome-mahjongg gnome-mines diff --git a/pkgs/desktops/gnome/games/gnome-chess/default.nix b/pkgs/by-name/gn/gnome-chess/package.nix similarity index 89% rename from pkgs/desktops/gnome/games/gnome-chess/default.nix rename to pkgs/by-name/gn/gnome-chess/package.nix index 8ed5426d9e77..99acc2afb326 100644 --- a/pkgs/desktops/gnome/games/gnome-chess/default.nix +++ b/pkgs/by-name/gn/gnome-chess/package.nix @@ -51,10 +51,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-chess"; - attrPath = "gnome.gnome-chess"; - }; + updateScript = gnome.updateScript { packageName = "gnome-chess"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index efe5c465a459..a53b64279b97 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-chess = callPackage ./games/gnome-chess { }; - gnome-klotski = callPackage ./games/gnome-klotski { }; gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; @@ -153,6 +151,7 @@ in gnome-backgrounds = lib.warn "The ‘gnome.gnome-backgrounds’ was moved to top-level. Please use ‘pkgs.gnome-backgrounds’ directly." pkgs.gnome-backgrounds; # Added on 2024-08-11. gnome-boxes = lib.warn "The ‘gnome.gnome-boxes’ was moved to top-level. Please use ‘pkgs.gnome-boxes’ directly." pkgs.gnome-boxes; # Added on 2024-08-11. gnome-characters = lib.warn "The ‘gnome.gnome-characters’ was moved to top-level. Please use ‘pkgs.gnome-characters’ directly." pkgs.gnome-characters; # Added on 2024-08-11. + gnome-chess = lib.warn "The ‘gnome.gnome-chess’ was moved to top-level. Please use ‘pkgs.gnome-chess’ directly." pkgs.gnome-chess; # Added on 2024-08-11. gnome-clocks = lib.warn "The ‘gnome.gnome-clocks’ was moved to top-level. Please use ‘pkgs.gnome-clocks’ directly." pkgs.gnome-clocks; # Added on 2024-08-11. gnome-color-manager = lib.warn "The ‘gnome.gnome-color-manager’ was moved to top-level. Please use ‘pkgs.gnome-color-manager’ directly." pkgs.gnome-color-manager; # Added on 2024-08-11. gnome-common = lib.warn "The ‘gnome.gnome-common’ was moved to top-level. Please use ‘pkgs.gnome-common’ directly." pkgs.gnome-common; # Added on 2024-06-22. From fc0c1ea497cd136ecc8a7092636d0bb49fa56da5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:03 +0200 Subject: [PATCH 51/93] gnome.gnome-klotski: Format with nixfmt --- .../gnome/games/gnome-klotski/default.nix | 51 ++++++++++++++++--- 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix index c822d0e80c43..80b5fdc1b224 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -1,6 +1,25 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3, appstream-glib, desktop-file-utils -, glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support -, meson, ninja, python3 +{ + lib, + stdenv, + fetchurl, + pkg-config, + vala, + gnome, + adwaita-icon-theme, + gtk3, + wrapGAppsHook3, + appstream-glib, + desktop-file-utils, + glib, + librsvg, + libxml2, + gettext, + itstool, + libgee, + libgnome-games-support, + meson, + ninja, + python3, }: stdenv.mkDerivation rec { @@ -13,11 +32,27 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ - pkg-config vala meson ninja python3 wrapGAppsHook3 - gettext itstool libxml2 appstream-glib desktop-file-utils + pkg-config + vala + meson + ninja + python3 + wrapGAppsHook3 + gettext + itstool + libxml2 + appstream-glib + desktop-file-utils adwaita-icon-theme ]; - buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; + + buildInputs = [ + glib + gtk3 + librsvg + libgee + libgnome-games-support + ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -26,8 +61,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-klotski"; + attrPath = "gnome.gnome-klotski"; }; }; From b4e480f919774e078422b6cd6cf3ed4d23011e5c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:03 +0200 Subject: [PATCH 52/93] gnome-klotski: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-klotski/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-klotski/default.nix => by-name/gn/gnome-klotski/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e30ee1257148..1c56a2515abe 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -461,7 +461,7 @@ in pkgs.four-in-a-row pkgs.gnome-2048 pkgs.gnome-chess - gnome-klotski + pkgs.gnome-klotski gnome-mahjongg gnome-mines gnome-nibbles diff --git a/pkgs/desktops/gnome/games/gnome-klotski/default.nix b/pkgs/by-name/gn/gnome-klotski/package.nix similarity index 91% rename from pkgs/desktops/gnome/games/gnome-klotski/default.nix rename to pkgs/by-name/gn/gnome-klotski/package.nix index 80b5fdc1b224..11680d5466b2 100644 --- a/pkgs/desktops/gnome/games/gnome-klotski/default.nix +++ b/pkgs/by-name/gn/gnome-klotski/package.nix @@ -60,10 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-klotski"; - attrPath = "gnome.gnome-klotski"; - }; + updateScript = gnome.updateScript { packageName = "gnome-klotski"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a53b64279b97..b0179b1a4a1b 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-klotski = callPackage ./games/gnome-klotski { }; - gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; gnome-mines = callPackage ./games/gnome-mines { }; @@ -162,6 +160,7 @@ in gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22. gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. + gnome-klotski = lib.warn "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly." pkgs.gnome-klotski; # Added on 2024-08-11. gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. From 6ab301dbe244e69373fc96bf6e0571b75358ea68 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:04 +0200 Subject: [PATCH 53/93] gnome.gnome-mahjongg: Format with nixfmt --- .../gnome/games/gnome-mahjongg/default.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index 5d21f41e60dd..ce3a2402b9de 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,20 +1,21 @@ -{ stdenv -, lib -, fetchurl -, pkg-config -, gnome -, gtk4 -, wrapGAppsHook4 -, libadwaita -, librsvg -, gettext -, itstool -, libxml2 -, meson -, ninja -, glib -, vala -, desktop-file-utils +{ + stdenv, + lib, + fetchurl, + pkg-config, + gnome, + gtk4, + wrapGAppsHook4, + libadwaita, + librsvg, + gettext, + itstool, + libxml2, + meson, + ninja, + glib, + vala, + desktop-file-utils, }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.40.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.majorMinor version}/gnome-mahjongg-${version}.tar.xz"; hash = "sha256-jtVO7K3jawgzaQb9jmyQKg1ve7u7Z2U8I5Vqa2MSI/Y="; }; @@ -48,8 +49,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "gnome-mahjongg"; + attrPath = "gnome.gnome-mahjongg"; }; }; From 828635c72508386c5a73de11046708bd6ea37631 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:05 +0200 Subject: [PATCH 54/93] gnome-mahjongg: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-mahjongg/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-mahjongg/default.nix => by-name/gn/gnome-mahjongg/package.nix} (89%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 1c56a2515abe..43d990068c73 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -462,7 +462,7 @@ in pkgs.gnome-2048 pkgs.gnome-chess pkgs.gnome-klotski - gnome-mahjongg + pkgs.gnome-mahjongg gnome-mines gnome-nibbles gnome-robots diff --git a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix similarity index 89% rename from pkgs/desktops/gnome/games/gnome-mahjongg/default.nix rename to pkgs/by-name/gn/gnome-mahjongg/package.nix index ce3a2402b9de..85b4e5b93307 100644 --- a/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix +++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix @@ -48,10 +48,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-mahjongg"; - attrPath = "gnome.gnome-mahjongg"; - }; + updateScript = gnome.updateScript { packageName = "gnome-mahjongg"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b0179b1a4a1b..76bee393d770 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-mahjongg = callPackage ./games/gnome-mahjongg { }; - gnome-mines = callPackage ./games/gnome-mines { }; gnome-nibbles = callPackage ./games/gnome-nibbles { }; @@ -162,6 +160,7 @@ in gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. gnome-klotski = lib.warn "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly." pkgs.gnome-klotski; # Added on 2024-08-11. gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. + gnome-mahjongg = lib.warn "The ‘gnome.gnome-mahjongg’ was moved to top-level. Please use ‘pkgs.gnome-mahjongg’ directly." pkgs.gnome-mahjongg; # Added on 2024-08-11. gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11. From cf621377cc2ae5d2a78b066fbcb8c751cc3d0ba5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:05 +0200 Subject: [PATCH 55/93] gnome.gnome-mines: Format with nixfmt --- .../gnome/games/gnome-mines/default.nix | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix index 364b24121c5d..30d418f64bf8 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -1,20 +1,54 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gnome, adwaita-icon-theme, gtk3, wrapGAppsHook3 -, librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + vala, + pkg-config, + gnome, + adwaita-icon-theme, + gtk3, + wrapGAppsHook3, + librsvg, + gettext, + itstool, + python3, + libxml2, + libgnome-games-support, + libgee, + desktop-file-utils, +}: stdenv.mkDerivation rec { pname = "gnome-mines"; version = "40.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-mines/${lib.versions.major version}/gnome-mines-${version}.tar.xz"; sha256 = "NQLps/ccs7LnEcDmAZGH/rzCvKh349RW3KtwD3vjEnI="; }; nativeBuildInputs = [ - meson ninja vala pkg-config gettext itstool python3 - libxml2 wrapGAppsHook3 desktop-file-utils + meson + ninja + vala + pkg-config + gettext + itstool + python3 + libxml2 + wrapGAppsHook3 + desktop-file-utils + ]; + + buildInputs = [ + gtk3 + librsvg + adwaita-icon-theme + libgnome-games-support + libgee ]; - buildInputs = [ gtk3 librsvg adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x build-aux/meson_post_install.py From 38115466395a739e39a57a15f7574947e18e284c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:06 +0200 Subject: [PATCH 56/93] gnome-mines: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-mines/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-mines/default.nix => by-name/gn/gnome-mines/package.nix} (90%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 43d990068c73..c3acb9b1d5e6 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -463,7 +463,7 @@ in pkgs.gnome-chess pkgs.gnome-klotski pkgs.gnome-mahjongg - gnome-mines + pkgs.gnome-mines gnome-nibbles gnome-robots gnome-sudoku diff --git a/pkgs/desktops/gnome/games/gnome-mines/default.nix b/pkgs/by-name/gn/gnome-mines/package.nix similarity index 90% rename from pkgs/desktops/gnome/games/gnome-mines/default.nix rename to pkgs/by-name/gn/gnome-mines/package.nix index 30d418f64bf8..a1b6bc46f32c 100644 --- a/pkgs/desktops/gnome/games/gnome-mines/default.nix +++ b/pkgs/by-name/gn/gnome-mines/package.nix @@ -56,10 +56,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-mines"; - attrPath = "gnome.gnome-mines"; - }; + updateScript = gnome.updateScript { packageName = "gnome-mines"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 76bee393d770..3ab409f1e3fb 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-mines = callPackage ./games/gnome-mines { }; - gnome-nibbles = callPackage ./games/gnome-nibbles { }; gnome-robots = callPackage ./games/gnome-robots { }; @@ -162,6 +160,7 @@ in gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. gnome-mahjongg = lib.warn "The ‘gnome.gnome-mahjongg’ was moved to top-level. Please use ‘pkgs.gnome-mahjongg’ directly." pkgs.gnome-mahjongg; # Added on 2024-08-11. gnome-maps = lib.warn "The ‘gnome.gnome-maps’ was moved to top-level. Please use ‘pkgs.gnome-maps’ directly." pkgs.gnome-maps; # Added on 2024-08-11. + gnome-mines = lib.warn "The ‘gnome.gnome-mines’ was moved to top-level. Please use ‘pkgs.gnome-mines’ directly." pkgs.gnome-mines; # Added on 2024-08-11. gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11. gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11. From 798db4f748a53d38d4f1d13655fc8af1c7423866 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:06 +0200 Subject: [PATCH 57/93] gnome.gnome-nibbles: Format with nixfmt --- .../gnome/games/gnome-nibbles/default.nix | 37 ++++++++++--------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix index 58538d24bd49..ea33e299a6fd 100644 --- a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -1,21 +1,22 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gnome -, gtk4 -, wrapGAppsHook4 -, librsvg -, gsound -, gettext -, itstool -, vala -, libxml2 -, libgee -, libgnome-games-support_2_0 -, meson -, ninja -, desktop-file-utils +{ + lib, + stdenv, + fetchurl, + pkg-config, + gnome, + gtk4, + wrapGAppsHook4, + librsvg, + gsound, + gettext, + itstool, + vala, + libxml2, + libgee, + libgnome-games-support_2_0, + meson, + ninja, + desktop-file-utils, }: stdenv.mkDerivation (finalAttrs: { From b76db173dfccbe78f82bf2c242e1aef83a916254 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:07 +0200 Subject: [PATCH 58/93] gnome-nibbles: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-nibbles/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-nibbles/default.nix => by-name/gn/gnome-nibbles/package.nix} (89%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index c3acb9b1d5e6..a8da8a507f08 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -464,7 +464,7 @@ in pkgs.gnome-klotski pkgs.gnome-mahjongg pkgs.gnome-mines - gnome-nibbles + pkgs.gnome-nibbles gnome-robots gnome-sudoku gnome-taquin diff --git a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix similarity index 89% rename from pkgs/desktops/gnome/games/gnome-nibbles/default.nix rename to pkgs/by-name/gn/gnome-nibbles/package.nix index ea33e299a6fd..aba0819d9621 100644 --- a/pkgs/desktops/gnome/games/gnome-nibbles/default.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -49,10 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-nibbles"; - attrPath = "gnome.gnome-nibbles"; - }; + updateScript = gnome.updateScript { packageName = "gnome-nibbles"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 3ab409f1e3fb..140d88a490eb 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-nibbles = callPackage ./games/gnome-nibbles { }; - gnome-robots = callPackage ./games/gnome-robots { }; gnome-sudoku = callPackage ./games/gnome-sudoku { }; @@ -163,6 +161,7 @@ in gnome-mines = lib.warn "The ‘gnome.gnome-mines’ was moved to top-level. Please use ‘pkgs.gnome-mines’ directly." pkgs.gnome-mines; # Added on 2024-08-11. gnome-music = lib.warn "The ‘gnome.gnome-music’ was moved to top-level. Please use ‘pkgs.gnome-music’ directly." pkgs.gnome-music; # Added on 2024-08-11. gnome-nettool = lib.warn "The ‘gnome.gnome-nettool’ was moved to top-level. Please use ‘pkgs.gnome-nettool’ directly." pkgs.gnome-nettool; # Added on 2024-08-11. + gnome-nibbles = lib.warn "The ‘gnome.gnome-nibbles’ was moved to top-level. Please use ‘pkgs.gnome-nibbles’ directly." pkgs.gnome-nibbles; # Added on 2024-08-11. gnome-notes = lib.warn "The ‘gnome.gnome-notes’ was moved to top-level. Please use ‘pkgs.gnome-notes’ directly." pkgs.gnome-notes; # Added on 2024-08-11. gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. From 9588b7c15972e2af80dc37212c8be97208dce2b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:07 +0200 Subject: [PATCH 59/93] gnome.gnome-robots: Format with nixfmt --- .../gnome/games/gnome-robots/default.nix | 43 ++++++++++--------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-robots/default.nix b/pkgs/desktops/gnome/games/gnome-robots/default.nix index 5222fc81605c..92a5257ff531 100644 --- a/pkgs/desktops/gnome/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -1,23 +1,24 @@ -{ lib -, stdenv -, fetchurl -, pkg-config -, gnome -, gtk3 -, wrapGAppsHook3 -, librsvg -, gsound -, gettext -, itstool -, libxml2 -, libgnome-games-support -, libgee -, meson -, ninja -, vala -, python3 -, desktop-file-utils -, adwaita-icon-theme +{ + lib, + stdenv, + fetchurl, + pkg-config, + gnome, + gtk3, + wrapGAppsHook3, + librsvg, + gsound, + gettext, + itstool, + libxml2, + libgnome-games-support, + libgee, + meson, + ninja, + vala, + python3, + desktop-file-utils, + adwaita-icon-theme, }: stdenv.mkDerivation rec { @@ -25,7 +26,7 @@ stdenv.mkDerivation rec { version = "40.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-robots/${lib.versions.major version}/gnome-robots-${version}.tar.xz"; sha256 = "04fbykj576dq1h6cycgfhh8wd6yxmlsqykvj188sbwahay42zgvg"; }; From 82a1d2ed24f4c24553877273368ae2e43b19422b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:08 +0200 Subject: [PATCH 60/93] gnome-robots: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-robots/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-robots/default.nix => by-name/gn/gnome-robots/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index a8da8a507f08..e5db04ea9aac 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -465,7 +465,7 @@ in pkgs.gnome-mahjongg pkgs.gnome-mines pkgs.gnome-nibbles - gnome-robots + pkgs.gnome-robots gnome-sudoku gnome-taquin gnome-tetravex diff --git a/pkgs/desktops/gnome/games/gnome-robots/default.nix b/pkgs/by-name/gn/gnome-robots/package.nix similarity index 91% rename from pkgs/desktops/gnome/games/gnome-robots/default.nix rename to pkgs/by-name/gn/gnome-robots/package.nix index 92a5257ff531..5a4ceb8efb65 100644 --- a/pkgs/desktops/gnome/games/gnome-robots/default.nix +++ b/pkgs/by-name/gn/gnome-robots/package.nix @@ -58,10 +58,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-robots"; - attrPath = "gnome.gnome-robots"; - }; + updateScript = gnome.updateScript { packageName = "gnome-robots"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 140d88a490eb..86d8c41a723d 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-robots = callPackage ./games/gnome-robots { }; - gnome-sudoku = callPackage ./games/gnome-sudoku { }; gnome-taquin = callPackage ./games/gnome-taquin { }; @@ -166,6 +164,7 @@ in gnome-packagekit = lib.warn "The ‘gnome.gnome-packagekit’ was moved to top-level. Please use ‘pkgs.gnome-packagekit’ directly." pkgs.gnome-packagekit; # Added on 2024-06-22. gnome-power-manager = lib.warn "The ‘gnome.gnome-power-manager’ was moved to top-level. Please use ‘pkgs.gnome-power-manager’ directly." pkgs.gnome-power-manager; # Added on 2024-08-11. gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11. + gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. From 10a82e5f278c1f73106841a62c16b158e619bec4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:08 +0200 Subject: [PATCH 61/93] gnome.gnome-sudoku: Format with nixfmt --- .../gnome/games/gnome-sudoku/default.nix | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 39eaa426c365..1dcb1f6d5733 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -1,22 +1,23 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, vala -, pkg-config -, gobject-introspection -, gettext -, gtk4 -, gnome -, wrapGAppsHook4 -, libadwaita -, libgee -, json-glib -, qqwing -, itstool -, libxml2 -, desktop-file-utils +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + vala, + pkg-config, + gobject-introspection, + gettext, + gtk4, + gnome, + wrapGAppsHook4, + libadwaita, + libgee, + json-glib, + qqwing, + itstool, + libxml2, + desktop-file-utils, }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { version = "46.4"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz"; hash = "sha256-SmsMRQbolRIlOxyZO3P2QOjv2awfHrUqAkgZCHYjpKI="; }; From d988332cd44ca1cdb0914204dbff26188d880b04 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:09 +0200 Subject: [PATCH 62/93] gnome-sudoku: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-sudoku/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-sudoku/default.nix => by-name/gn/gnome-sudoku/package.nix} (89%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e5db04ea9aac..5375fe0eda8e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -466,7 +466,7 @@ in pkgs.gnome-mines pkgs.gnome-nibbles pkgs.gnome-robots - gnome-sudoku + pkgs.gnome-sudoku gnome-taquin gnome-tetravex hitori diff --git a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix similarity index 89% rename from pkgs/desktops/gnome/games/gnome-sudoku/default.nix rename to pkgs/by-name/gn/gnome-sudoku/package.nix index 1dcb1f6d5733..8e45b5e155ff 100644 --- a/pkgs/desktops/gnome/games/gnome-sudoku/default.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -51,10 +51,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-sudoku"; - attrPath = "gnome.gnome-sudoku"; - }; + updateScript = gnome.updateScript { packageName = "gnome-sudoku"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 86d8c41a723d..d27834cc2183 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-sudoku = callPackage ./games/gnome-sudoku { }; - gnome-taquin = callPackage ./games/gnome-taquin { }; gnome-tetravex = callPackage ./games/gnome-tetravex { }; @@ -168,6 +166,7 @@ in gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. + gnome-sudoku = lib.warn "The ‘gnome.gnome-sudoku’ was moved to top-level. Please use ‘pkgs.gnome-sudoku’ directly." pkgs.gnome-sudoku; # Added on 2024-08-11. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22. From 80545812574a69b036cbe66f0cbc772b724c3e07 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:09 +0200 Subject: [PATCH 63/93] gnome.gnome-taquin: Format with nixfmt --- .../gnome/games/gnome-taquin/default.nix | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix index 4a7a058491c4..9702a0358eb1 100644 --- a/pkgs/desktops/gnome/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, pkg-config -, gnome -, adwaita-icon-theme -, gtk3 -, wrapGAppsHook3 -, librsvg -, gsound -, gettext -, itstool -, libxml2 -, meson -, ninja -, vala -, python3 -, desktop-file-utils +{ + lib, + stdenv, + fetchurl, + fetchpatch, + pkg-config, + gnome, + adwaita-icon-theme, + gtk3, + wrapGAppsHook3, + librsvg, + gsound, + gettext, + itstool, + libxml2, + meson, + ninja, + vala, + python3, + desktop-file-utils, }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-taquin/${lib.versions.majorMinor version}/gnome-taquin-${version}.tar.xz"; sha256 = "0kw131q0ad0rbsp6qifjc8fjlhvjxyihil8a76kj8ya9mn7kvnwn"; }; @@ -52,6 +53,7 @@ stdenv.mkDerivation rec { vala desktop-file-utils ]; + buildInputs = [ gtk3 librsvg From f26fb6acad656a7d6654f97f0362be10d6958941 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:10 +0200 Subject: [PATCH 64/93] gnome-taquin: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-taquin/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-taquin/default.nix => by-name/gn/gnome-taquin/package.nix} (92%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 5375fe0eda8e..b94231d32546 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -467,7 +467,7 @@ in pkgs.gnome-nibbles pkgs.gnome-robots pkgs.gnome-sudoku - gnome-taquin + pkgs.gnome-taquin gnome-tetravex hitori iagno diff --git a/pkgs/desktops/gnome/games/gnome-taquin/default.nix b/pkgs/by-name/gn/gnome-taquin/package.nix similarity index 92% rename from pkgs/desktops/gnome/games/gnome-taquin/default.nix rename to pkgs/by-name/gn/gnome-taquin/package.nix index 9702a0358eb1..e570d9148b45 100644 --- a/pkgs/desktops/gnome/games/gnome-taquin/default.nix +++ b/pkgs/by-name/gn/gnome-taquin/package.nix @@ -62,10 +62,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-taquin"; - attrPath = "gnome.gnome-taquin"; - }; + updateScript = gnome.updateScript { packageName = "gnome-taquin"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index d27834cc2183..43834f2e4976 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-taquin = callPackage ./games/gnome-taquin { }; - gnome-tetravex = callPackage ./games/gnome-tetravex { }; hitori = callPackage ./games/hitori { }; @@ -168,6 +166,7 @@ in gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. gnome-sudoku = lib.warn "The ‘gnome.gnome-sudoku’ was moved to top-level. Please use ‘pkgs.gnome-sudoku’ directly." pkgs.gnome-sudoku; # Added on 2024-08-11. gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. + gnome-taquin = lib.warn "The ‘gnome.gnome-taquin’ was moved to top-level. Please use ‘pkgs.gnome-taquin’ directly." pkgs.gnome-taquin; # Added on 2024-08-11. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22. gnome-tweaks = lib.warn "The ‘gnome.gnome-tweaks’ was moved to top-level. Please use ‘pkgs.gnome-tweaks’ directly." pkgs.gnome-tweaks; # Added on 2024-06-22. From 1843392c64eab3f649c5fda932af5fc249413dc7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:10 +0200 Subject: [PATCH 65/93] gnome.gnome-tetravex: Format with nixfmt --- .../gnome/games/gnome-tetravex/default.nix | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 628b3bbfe217..6c12f85ce942 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,20 +1,21 @@ -{ stdenv -, lib -, fetchurl -, fetchpatch -, pkg-config -, gnome -, adwaita-icon-theme -, gtk3 -, wrapGAppsHook3 -, libxml2 -, gettext -, itstool -, meson -, ninja -, python3 -, vala -, desktop-file-utils +{ + stdenv, + lib, + fetchurl, + fetchpatch, + pkg-config, + gnome, + adwaita-icon-theme, + gtk3, + wrapGAppsHook3, + libxml2, + gettext, + itstool, + meson, + ninja, + python3, + vala, + desktop-file-utils, }: stdenv.mkDerivation rec { @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.38.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz"; sha256 = "06wihvqp2p52zd2dnknsc3rii69qib4a30yp15h558xrg44z3k8z"; }; @@ -51,9 +52,7 @@ stdenv.mkDerivation rec { desktop-file-utils ]; - buildInputs = [ - gtk3 - ]; + buildInputs = [ gtk3 ]; postPatch = '' chmod +x build-aux/meson_post_install.py From e0795cb2de6b8461710dc03e98992e310fdc4959 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:11 +0200 Subject: [PATCH 66/93] gnome-tetravex: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/gn/gnome-tetravex/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/gnome-tetravex/default.nix => by-name/gn/gnome-tetravex/package.nix} (92%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index b94231d32546..db57feafcb95 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -468,7 +468,7 @@ in pkgs.gnome-robots pkgs.gnome-sudoku pkgs.gnome-taquin - gnome-tetravex + pkgs.gnome-tetravex hitori iagno lightsoff diff --git a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix b/pkgs/by-name/gn/gnome-tetravex/package.nix similarity index 92% rename from pkgs/desktops/gnome/games/gnome-tetravex/default.nix rename to pkgs/by-name/gn/gnome-tetravex/package.nix index 6c12f85ce942..cdf2c28e291d 100644 --- a/pkgs/desktops/gnome/games/gnome-tetravex/default.nix +++ b/pkgs/by-name/gn/gnome-tetravex/package.nix @@ -60,10 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-tetravex"; - attrPath = "gnome.gnome-tetravex"; - }; + updateScript = gnome.updateScript { packageName = "gnome-tetravex"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 43834f2e4976..d5a4282dab14 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - gnome-tetravex = callPackage ./games/gnome-tetravex { }; - hitori = callPackage ./games/hitori { }; iagno = callPackage ./games/iagno { }; @@ -168,6 +166,7 @@ in gnome-system-monitor = lib.warn "The ‘gnome.gnome-system-monitor’ was moved to top-level. Please use ‘pkgs.gnome-system-monitor’ directly." pkgs.gnome-system-monitor; # Added on 2024-06-22. gnome-taquin = lib.warn "The ‘gnome.gnome-taquin’ was moved to top-level. Please use ‘pkgs.gnome-taquin’ directly." pkgs.gnome-taquin; # Added on 2024-08-11. gnome-terminal = lib.warn "The ‘gnome.gnome-terminal’ was moved to top-level. Please use ‘pkgs.gnome-terminal’ directly." pkgs.gnome-terminal; # Added on 2024-06-13. + gnome-tetravex = lib.warn "The ‘gnome.gnome-tetravex’ was moved to top-level. Please use ‘pkgs.gnome-tetravex’ directly." pkgs.gnome-tetravex; # Added on 2024-08-11. gnome-themes-extra = lib.warn "The ‘gnome.gnome-themes-extra’ was moved to top-level. Please use ‘pkgs.gnome-themes-extra’ directly." pkgs.gnome-themes-extra; # Added on 2024-06-22. gnome-tweaks = lib.warn "The ‘gnome.gnome-tweaks’ was moved to top-level. Please use ‘pkgs.gnome-tweaks’ directly." pkgs.gnome-tweaks; # Added on 2024-06-22. gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. From b0f258443f172aef285b4c387dd1de5c2711e35a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:11 +0200 Subject: [PATCH 67/93] gnome.hitori: Format with nixfmt --- pkgs/desktops/gnome/games/hitori/default.nix | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix index 77cc67f41a38..b46462c8be2b 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -1,19 +1,20 @@ -{ stdenv -, lib -, fetchurl -, meson -, ninja -, pkg-config -, gnome -, glib -, gtk3 -, cairo -, wrapGAppsHook3 -, libxml2 -, python3 -, gettext -, itstool -, desktop-file-utils +{ + stdenv, + lib, + fetchurl, + meson, + ninja, + pkg-config, + gnome, + glib, + gtk3, + cairo, + wrapGAppsHook3, + libxml2, + python3, + gettext, + itstool, + desktop-file-utils, }: stdenv.mkDerivation (finalAttrs: { From 8c4f0fc73e485f763459aa0aa286b816a12586d9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:12 +0200 Subject: [PATCH 68/93] hitori: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../hitori/default.nix => by-name/hi/hitori/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/hitori/default.nix => by-name/hi/hitori/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index db57feafcb95..dd0afa2b42c3 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -469,7 +469,7 @@ in pkgs.gnome-sudoku pkgs.gnome-taquin pkgs.gnome-tetravex - hitori + pkgs.hitori iagno lightsoff quadrapassel diff --git a/pkgs/desktops/gnome/games/hitori/default.nix b/pkgs/by-name/hi/hitori/package.nix similarity index 91% rename from pkgs/desktops/gnome/games/hitori/default.nix rename to pkgs/by-name/hi/hitori/package.nix index b46462c8be2b..b0fc149d42da 100644 --- a/pkgs/desktops/gnome/games/hitori/default.nix +++ b/pkgs/by-name/hi/hitori/package.nix @@ -50,10 +50,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "hitori"; - attrPath = "gnome.hitori"; - }; + updateScript = gnome.updateScript { packageName = "hitori"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index d5a4282dab14..0202864a1683 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - hitori = callPackage ./games/hitori { }; - iagno = callPackage ./games/iagno { }; lightsoff = callPackage ./games/lightsoff { }; @@ -173,6 +171,7 @@ in gnome-weather = lib.warn "The ‘gnome.gnome-weather’ was moved to top-level. Please use ‘pkgs.gnome-weather’ directly." pkgs.gnome-weather; # Added on 2024-08-11. gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. + hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. From 8cef7515916f35f42d4c6135527f120ac0e49069 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:12 +0200 Subject: [PATCH 69/93] gnome.iagno: Format with nixfmt --- pkgs/desktops/gnome/games/iagno/default.nix | 40 +++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/gnome/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix index 5d3edfe12170..6e2b7064dda0 100644 --- a/pkgs/desktops/gnome/games/iagno/default.nix +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -1,21 +1,23 @@ -{ lib, stdenv -, fetchurl -, fetchpatch -, pkg-config -, gtk3 -, gnome -, adwaita-icon-theme -, gdk-pixbuf -, librsvg -, wrapGAppsHook3 -, itstool -, gsound -, libxml2 -, meson -, ninja -, python3 -, vala -, desktop-file-utils +{ + lib, + stdenv, + fetchurl, + fetchpatch, + pkg-config, + gtk3, + gnome, + adwaita-icon-theme, + gdk-pixbuf, + librsvg, + wrapGAppsHook3, + itstool, + gsound, + libxml2, + meson, + ninja, + python3, + vala, + desktop-file-utils, }: stdenv.mkDerivation rec { @@ -23,7 +25,7 @@ stdenv.mkDerivation rec { version = "3.38.1"; src = fetchurl { - url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/iagno/${lib.versions.majorMinor version}/iagno-${version}.tar.xz"; sha256 = "097dw1l92l73xah9l56ka5mi3dvx48ffpiv33ni5i5rqw0ng7fc4"; }; From 31a54e038cd86ea779e9fb094f5462f10ffb4172 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:13 +0200 Subject: [PATCH 70/93] iagno: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../games/iagno/default.nix => by-name/ia/iagno/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/iagno/default.nix => by-name/ia/iagno/package.nix} (93%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index dd0afa2b42c3..211ebd5fd7d1 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -470,7 +470,7 @@ in pkgs.gnome-taquin pkgs.gnome-tetravex pkgs.hitori - iagno + pkgs.iagno lightsoff quadrapassel swell-foop diff --git a/pkgs/desktops/gnome/games/iagno/default.nix b/pkgs/by-name/ia/iagno/package.nix similarity index 93% rename from pkgs/desktops/gnome/games/iagno/default.nix rename to pkgs/by-name/ia/iagno/package.nix index 6e2b7064dda0..f5fa71b094b9 100644 --- a/pkgs/desktops/gnome/games/iagno/default.nix +++ b/pkgs/by-name/ia/iagno/package.nix @@ -64,10 +64,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "iagno"; - attrPath = "gnome.iagno"; - }; + updateScript = gnome.updateScript { packageName = "iagno"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 0202864a1683..7c8c0e8a4d95 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - iagno = callPackage ./games/iagno { }; - lightsoff = callPackage ./games/lightsoff { }; swell-foop = callPackage ./games/swell-foop { }; @@ -172,6 +170,7 @@ in gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11. + iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. From 2ef7b97c0e914028417f1f5989843bab71b0e7b9 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:13 +0200 Subject: [PATCH 71/93] gnome.lightsoff: Format with nixfmt --- .../gnome/games/lightsoff/default.nix | 49 ++++++++++++++++--- 1 file changed, 42 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix index c11c325194c3..5ff76e1d7a1b 100644 --- a/pkgs/desktops/gnome/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -1,21 +1,56 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, adwaita-icon-theme, gdk-pixbuf, librsvg, wrapGAppsHook3 -, gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib -, meson, ninja, python3 }: +{ + lib, + stdenv, + fetchurl, + vala, + pkg-config, + gtk3, + gnome, + adwaita-icon-theme, + gdk-pixbuf, + librsvg, + wrapGAppsHook3, + gettext, + itstool, + clutter, + clutter-gtk, + libxml2, + appstream-glib, + meson, + ninja, + python3, +}: stdenv.mkDerivation rec { pname = "lightsoff"; version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/lightsoff/${lib.versions.major version}/lightsoff-${version}.tar.xz"; hash = "sha256-ZysVMuBkX64C8oN6ltU57c/Uw7pPcuWR3HP+R567i5I="; }; nativeBuildInputs = [ - vala pkg-config wrapGAppsHook3 itstool gettext appstream-glib libxml2 - meson ninja python3 + vala + pkg-config + wrapGAppsHook3 + itstool + gettext + appstream-glib + libxml2 + meson + ninja + python3 + ]; + + buildInputs = [ + gtk3 + adwaita-icon-theme + gdk-pixbuf + librsvg + clutter + clutter-gtk ]; - buildInputs = [ gtk3 adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; postPatch = '' chmod +x build-aux/meson_post_install.py From 5db162af3a35a925231cc8bdf07014721e783a0a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:14 +0200 Subject: [PATCH 72/93] lightsoff: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/li/lightsoff/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/lightsoff/default.nix => by-name/li/lightsoff/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 211ebd5fd7d1..9c37d774a031 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -471,7 +471,7 @@ in pkgs.gnome-tetravex pkgs.hitori pkgs.iagno - lightsoff + pkgs.lightsoff quadrapassel swell-foop tali diff --git a/pkgs/desktops/gnome/games/lightsoff/default.nix b/pkgs/by-name/li/lightsoff/package.nix similarity index 91% rename from pkgs/desktops/gnome/games/lightsoff/default.nix rename to pkgs/by-name/li/lightsoff/package.nix index 5ff76e1d7a1b..02030cb169cc 100644 --- a/pkgs/desktops/gnome/games/lightsoff/default.nix +++ b/pkgs/by-name/li/lightsoff/package.nix @@ -58,10 +58,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "lightsoff"; - attrPath = "gnome.lightsoff"; - }; + updateScript = gnome.updateScript { packageName = "lightsoff"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 7c8c0e8a4d95..5ac13f124396 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - lightsoff = callPackage ./games/lightsoff { }; - swell-foop = callPackage ./games/swell-foop { }; tali = callPackage ./games/tali { }; @@ -171,6 +169,7 @@ in gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11. iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11. + lightsoff = lib.warn "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly." pkgs.lightsoff; # Added on 2024-08-11. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. From 5341a2e3caffb42364f5b3b17d897038c077a5a2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:15 +0200 Subject: [PATCH 73/93] gnome.swell-foop: Format with nixfmt --- .../gnome/games/swell-foop/default.nix | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/pkgs/desktops/gnome/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix index 6a8d64103509..97b2bc07b8a0 100644 --- a/pkgs/desktops/gnome/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -1,22 +1,23 @@ -{ lib -, stdenv -, fetchurl -, meson -, ninja -, pkg-config -, vala -, glib -, gtk4 -, libgee -, libgnome-games-support_2_0 -, pango -, gnome -, desktop-file-utils -, gettext -, itstool -, libxml2 -, wrapGAppsHook4 -, python3 +{ + lib, + stdenv, + fetchurl, + meson, + ninja, + pkg-config, + vala, + glib, + gtk4, + libgee, + libgnome-games-support_2_0, + pango, + gnome, + desktop-file-utils, + gettext, + itstool, + libxml2, + wrapGAppsHook4, + python3, }: stdenv.mkDerivation rec { @@ -24,7 +25,7 @@ stdenv.mkDerivation rec { version = "46.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/swell-foop/${lib.versions.major version}/swell-foop-${version}.tar.xz"; hash = "sha256-BvireAfXHOyUi4aDcfR/ut7vzLXDV+E9HvPISBiR/KM="; }; @@ -51,8 +52,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "swell-foop"; + attrPath = "gnome.swell-foop"; }; }; From 077dd2b94ca428c15cdbc9e1687748d183194618 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:15 +0200 Subject: [PATCH 74/93] swell-foop: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../default.nix => by-name/sw/swell-foop/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/swell-foop/default.nix => by-name/sw/swell-foop/package.nix} (90%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 9c37d774a031..ba5604106800 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -473,7 +473,7 @@ in pkgs.iagno pkgs.lightsoff quadrapassel - swell-foop + pkgs.swell-foop tali ] config.environment.gnome.excludePackages; }) diff --git a/pkgs/desktops/gnome/games/swell-foop/default.nix b/pkgs/by-name/sw/swell-foop/package.nix similarity index 90% rename from pkgs/desktops/gnome/games/swell-foop/default.nix rename to pkgs/by-name/sw/swell-foop/package.nix index 97b2bc07b8a0..85d6290e9354 100644 --- a/pkgs/desktops/gnome/games/swell-foop/default.nix +++ b/pkgs/by-name/sw/swell-foop/package.nix @@ -51,10 +51,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "swell-foop"; - attrPath = "gnome.swell-foop"; - }; + updateScript = gnome.updateScript { packageName = "swell-foop"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 5ac13f124396..eef9daa9cbf5 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - swell-foop = callPackage ./games/swell-foop { }; - tali = callPackage ./games/tali { }; quadrapassel = callPackage ./games/quadrapassel { }; @@ -178,6 +176,7 @@ in seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22. simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22. sushi = lib.warn "The ‘gnome.sushi’ was moved to top-level. Please use ‘pkgs.sushi’ directly." pkgs.sushi; # Added on 2024-06-22. + swell-foop = lib.warn "The ‘gnome.swell-foop’ was moved to top-level. Please use ‘pkgs.swell-foop’ directly." pkgs.swell-foop; # Added on 2024-08-11. totem = lib.warn "The ‘gnome.totem’ was moved to top-level. Please use ‘pkgs.totem’ directly." pkgs.totem; # Added on 2024-06-22. vinagre = lib.warn "The ‘gnome.vinagre’ was moved to top-level. Please use ‘pkgs.vinagre’ directly." pkgs.vinagre; # Added on 2024-08-11. yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # Added on 2024-06-22. From 0f0388822a7f9cbd5a62753aad91829d7049f9cc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:16 +0200 Subject: [PATCH 75/93] gnome.tali: Format with nixfmt --- pkgs/desktops/gnome/games/tali/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix index 1199cbbf6066..301e89482730 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { version = "40.9"; src = fetchurl { - url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/tali/${lib.versions.major version}/tali-${version}.tar.xz"; sha256 = "+p7eNm8KcuTKpSGJw6sLEMG1aoDHiFsBZgJVjETc59M="; }; @@ -55,8 +55,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "tali"; + attrPath = "gnome.tali"; }; }; From 1f3f0c2e4b53593ca4d778d2b7d2a1fcfb560648 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:16 +0200 Subject: [PATCH 76/93] tali: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 2 +- .../games/tali/default.nix => by-name/ta/tali/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) rename pkgs/{desktops/gnome/games/tali/default.nix => by-name/ta/tali/package.nix} (91%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index ba5604106800..e2729d98fdd0 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -474,7 +474,7 @@ in pkgs.lightsoff quadrapassel pkgs.swell-foop - tali + pkgs.tali ] config.environment.gnome.excludePackages; }) diff --git a/pkgs/desktops/gnome/games/tali/default.nix b/pkgs/by-name/ta/tali/package.nix similarity index 91% rename from pkgs/desktops/gnome/games/tali/default.nix rename to pkgs/by-name/ta/tali/package.nix index 301e89482730..8caab35e6c3c 100644 --- a/pkgs/desktops/gnome/games/tali/default.nix +++ b/pkgs/by-name/ta/tali/package.nix @@ -54,10 +54,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "tali"; - attrPath = "gnome.tali"; - }; + updateScript = gnome.updateScript { packageName = "tali"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index eef9daa9cbf5..9838e37a7d72 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -80,8 +80,6 @@ in #### Games - tali = callPackage ./games/tali { }; - quadrapassel = callPackage ./games/quadrapassel { }; #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ @@ -177,6 +175,7 @@ in simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22. sushi = lib.warn "The ‘gnome.sushi’ was moved to top-level. Please use ‘pkgs.sushi’ directly." pkgs.sushi; # Added on 2024-06-22. swell-foop = lib.warn "The ‘gnome.swell-foop’ was moved to top-level. Please use ‘pkgs.swell-foop’ directly." pkgs.swell-foop; # Added on 2024-08-11. + tali = lib.warn "The ‘gnome.tali’ was moved to top-level. Please use ‘pkgs.tali’ directly." pkgs.tali; # Added on 2024-08-11. totem = lib.warn "The ‘gnome.totem’ was moved to top-level. Please use ‘pkgs.totem’ directly." pkgs.totem; # Added on 2024-06-22. vinagre = lib.warn "The ‘gnome.vinagre’ was moved to top-level. Please use ‘pkgs.vinagre’ directly." pkgs.vinagre; # Added on 2024-08-11. yelp = lib.warn "The ‘gnome.yelp’ was moved to top-level. Please use ‘pkgs.yelp’ directly." pkgs.yelp; # Added on 2024-06-22. From d430528dae600401bd68fab31061b594ec6f4c94 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:17 +0200 Subject: [PATCH 77/93] gnome.quadrapassel: Format with nixfmt --- pkgs/desktops/gnome/games/quadrapassel/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix index 6fd72f444690..3359dfdecc26 100644 --- a/pkgs/desktops/gnome/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { version = "40.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz"; sha256 = "C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo="; }; @@ -59,8 +59,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "quadrapassel"; + attrPath = "gnome.quadrapassel"; }; }; From d364738c7622c8f1286023ac9112e814c29a36e3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:18 +0200 Subject: [PATCH 78/93] quadrapassel: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 4 ++-- .../default.nix => by-name/qu/quadrapassel/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) rename pkgs/{desktops/gnome/games/quadrapassel/default.nix => by-name/qu/quadrapassel/package.nix} (90%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index e2729d98fdd0..043c7e1fdfbc 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -454,7 +454,7 @@ in }) (lib.mkIf serviceCfg.games.enable { - environment.systemPackages = with pkgs.gnome; utils.removePackagesByName [ + environment.systemPackages = utils.removePackagesByName [ pkgs.aisleriot pkgs.atomix pkgs.five-or-more @@ -472,7 +472,7 @@ in pkgs.hitori pkgs.iagno pkgs.lightsoff - quadrapassel + pkgs.quadrapassel pkgs.swell-foop pkgs.tali ] config.environment.gnome.excludePackages; diff --git a/pkgs/desktops/gnome/games/quadrapassel/default.nix b/pkgs/by-name/qu/quadrapassel/package.nix similarity index 90% rename from pkgs/desktops/gnome/games/quadrapassel/default.nix rename to pkgs/by-name/qu/quadrapassel/package.nix index 3359dfdecc26..38578e8eb504 100644 --- a/pkgs/desktops/gnome/games/quadrapassel/default.nix +++ b/pkgs/by-name/qu/quadrapassel/package.nix @@ -58,10 +58,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "quadrapassel"; - attrPath = "gnome.quadrapassel"; - }; + updateScript = gnome.updateScript { packageName = "quadrapassel"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 9838e37a7d72..7869b92ba506 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -78,10 +78,6 @@ in nixos-gsettings-overrides = callPackage ./nixos/gsettings-overrides { }; -#### Games - - quadrapassel = callPackage ./games/quadrapassel { }; - #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ gnome-applets = callPackage ./misc/gnome-applets { }; @@ -170,6 +166,7 @@ in nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. pomodoro = lib.warn "The ‘gnome.pomodoro’ was moved to top-level. Please use ‘pkgs.gnome-pomodoro’ directly." pkgs.gnome-pomodoro; # Added on 2024-06-22. + quadrapassel = lib.warn "The ‘gnome.quadrapassel’ was moved to top-level. Please use ‘pkgs.quadrapassel’ directly." pkgs.quadrapassel; # Added on 2024-08-11. rygel = lib.warn "The ‘gnome.rygel’ was moved to top-level. Please use ‘pkgs.rygel’ directly." pkgs.rygel; # Added on 2024-06-22. seahorse = lib.warn "The ‘gnome.seahorse’ was moved to top-level. Please use ‘pkgs.seahorse’ directly." pkgs.seahorse; # Added on 2024-06-22. simple-scan = lib.warn "The ‘gnome.simple-scan’ was moved to top-level. Please use ‘pkgs.simple-scan’ directly." pkgs.simple-scan; # Added on 2024-06-22. From 5f5c3a54d4595c2400b5b97a686470555f4dc7e8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:18 +0200 Subject: [PATCH 79/93] gnome.gnome-initial-setup: Format with nixfmt --- .../core/gnome-initial-setup/default.nix | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 2d40503c1d70..6286830a0b88 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -1,37 +1,38 @@ -{ stdenv -, lib -, fetchurl -, substituteAll -, dconf -, gettext -, meson -, ninja -, pkg-config -, wrapGAppsHook4 -, gnome -, accountsservice -, fontconfig -, gdm -, geoclue2 -, geocode-glib_2 -, glib -, gnome-desktop -, gtk4 -, libgweather -, json-glib -, krb5 -, libpwquality -, libsecret -, networkmanager -, pango -, polkit -, webkitgtk_6_0 -, systemd -, libadwaita -, libnma-gtk4 -, tzdata -, gnome-tecla -, gsettings-desktop-schemas +{ + stdenv, + lib, + fetchurl, + substituteAll, + dconf, + gettext, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + gnome, + accountsservice, + fontconfig, + gdm, + geoclue2, + geocode-glib_2, + glib, + gnome-desktop, + gtk4, + libgweather, + json-glib, + krb5, + libpwquality, + libsecret, + networkmanager, + pango, + polkit, + webkitgtk_6_0, + systemd, + libadwaita, + libnma-gtk4, + tzdata, + gnome-tecla, + gsettings-desktop-schemas, }: stdenv.mkDerivation (finalAttrs: { From db9ae25dca40580497b79d6a638e62647e50ec53 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:18 +0200 Subject: [PATCH 80/93] gnome-initial-setup: Move from gnome scope to top-level --- .../modules/services/desktops/gnome/gnome-initial-setup.nix | 6 +++--- .../gn}/gnome-initial-setup/0001-fix-paths.patch | 0 .../gn/gnome-initial-setup/package.nix} | 5 +---- .../core => by-name/gn}/gnome-initial-setup/vendor.conf | 0 pkgs/desktops/gnome/default.nix | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-initial-setup/0001-fix-paths.patch (100%) rename pkgs/{desktops/gnome/core/gnome-initial-setup/default.nix => by-name/gn/gnome-initial-setup/package.nix} (92%) rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-initial-setup/vendor.conf (100%) diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index 8deb12ec18bf..4f1b23c8f36e 100644 --- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -64,13 +64,13 @@ in config = lib.mkIf config.services.gnome.gnome-initial-setup.enable { environment.systemPackages = [ - pkgs.gnome.gnome-initial-setup + pkgs.gnome-initial-setup ] ++ lib.optional (lib.versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart ; systemd.packages = [ - pkgs.gnome.gnome-initial-setup + pkgs.gnome-initial-setup ]; systemd.user.targets."gnome-session".wants = [ @@ -84,7 +84,7 @@ in ]; programs.dconf.profiles.gnome-initial-setup.databases = [ - "${pkgs.gnome.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults" + "${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults" ]; }; diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch rename to pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix similarity index 92% rename from pkgs/desktops/gnome/core/gnome-initial-setup/default.nix rename to pkgs/by-name/gn/gnome-initial-setup/package.nix index 6286830a0b88..e2d3e9eefdcb 100644 --- a/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix +++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix @@ -92,10 +92,7 @@ stdenv.mkDerivation (finalAttrs: { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-initial-setup"; - attrPath = "gnome.gnome-initial-setup"; - }; + updateScript = gnome.updateScript { packageName = "gnome-initial-setup"; }; }; meta = with lib; { diff --git a/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf b/pkgs/by-name/gn/gnome-initial-setup/vendor.conf similarity index 100% rename from pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf rename to pkgs/by-name/gn/gnome-initial-setup/vendor.conf diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 7869b92ba506..8714314df445 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -30,8 +30,6 @@ in gnome-control-center = callPackage ./core/gnome-control-center { }; - gnome-initial-setup = callPackage ./core/gnome-initial-setup { }; - gnome-session = callPackage ./core/gnome-session { }; gnome-session-ctl = callPackage ./core/gnome-session/ctl.nix { }; @@ -131,6 +129,7 @@ in gnome-dictionary = lib.warn "The ‘gnome.gnome-dictionary’ was moved to top-level. Please use ‘pkgs.gnome-dictionary’ directly." pkgs.gnome-dictionary; # Added on 2024-06-22. gnome-disk-utility = lib.warn "The ‘gnome.gnome-disk-utility’ was moved to top-level. Please use ‘pkgs.gnome-disk-utility’ directly." pkgs.gnome-disk-utility; # Added on 2024-06-22. gnome-font-viewer = lib.warn "The ‘gnome.gnome-font-viewer’ was moved to top-level. Please use ‘pkgs.gnome-font-viewer’ directly." pkgs.gnome-font-viewer; # Added on 2024-06-22. + gnome-initial-setup = lib.warn "The ‘gnome.gnome-initial-setup’ was moved to top-level. Please use ‘pkgs.gnome-initial-setup’ directly." pkgs.gnome-initial-setup; # Added on 2024-08-11. gnome-keyring = lib.warn "The ‘gnome.gnome-keyring’ was moved to top-level. Please use ‘pkgs.gnome-keyring’ directly." pkgs.gnome-keyring; # Added on 2024-06-22. gnome-klotski = lib.warn "The ‘gnome.gnome-klotski’ was moved to top-level. Please use ‘pkgs.gnome-klotski’ directly." pkgs.gnome-klotski; # Added on 2024-08-11. gnome-logs = lib.warn "The ‘gnome.gnome-logs’ was moved to top-level. Please use ‘pkgs.gnome-logs’ directly." pkgs.gnome-logs; # Added on 2024-08-11. From 214a26c550d5edc19cec7227baf12e3f5787c87e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:19 +0200 Subject: [PATCH 81/93] gnome.gdm: Format with nixfmt --- pkgs/desktops/gnome/core/gdm/default.nix | 78 +++++++++++++----------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index 3bf5ca788e02..23d1a317167f 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -1,35 +1,36 @@ -{ lib -, stdenv -, fetchurl -, fetchpatch -, substituteAll -, meson -, ninja -, pkg-config -, glib -, json-glib -, itstool -, xorg -, accountsservice -, libX11 -, gnome -, systemd -, dconf -, gtk3 -, libcanberra-gtk3 -, pam -, libgudev -, libselinux -, keyutils -, audit -, gobject-introspection -, plymouth -, coreutils -, xorgserver -, xwayland -, dbus -, nixos-icons -, runCommand +{ + lib, + stdenv, + fetchurl, + fetchpatch, + substituteAll, + meson, + ninja, + pkg-config, + glib, + json-glib, + itstool, + xorg, + accountsservice, + libX11, + gnome, + systemd, + dconf, + gtk3, + libcanberra-gtk3, + pam, + libgudev, + libselinux, + keyutils, + audit, + gobject-introspection, + plymouth, + coreutils, + xorgserver, + xwayland, + dbus, + nixos-icons, + runCommand, }: let @@ -45,7 +46,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdm"; version = "46.2"; - outputs = [ "out" "dev" ]; + outputs = [ + "out" + "dev" + ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; @@ -103,7 +107,13 @@ stdenv.mkDerivation (finalAttrs: { # Change hardcoded paths to nix store paths. (substituteAll { src = ./fix-paths.patch; - inherit coreutils plymouth xorgserver xwayland dbus; + inherit + coreutils + plymouth + xorgserver + xwayland + dbus + ; }) # The following patches implement certain environment variables in GDM which are set by From a0d15e0d04e8e8d3ac5a5ce21d19ba5e4ff15c7c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:34:19 +0200 Subject: [PATCH 82/93] gdm: Move from gnome scope to top-level --- nixos/modules/services/x11/display-managers/gdm.nix | 6 +++--- .../{desktops/gnome/core => by-name/gd}/gdm/fix-paths.patch | 0 .../gd}/gdm/gdm-session-worker_forward-vars.patch | 0 .../core => by-name/gd}/gdm/gdm-x-session_extra_args.patch | 0 .../gd}/gdm/gdm-x-session_session-wrapper.patch | 0 .../gd}/gdm/org.gnome.login-screen.gschema.override | 0 .../core/gdm/default.nix => by-name/gd/gdm/package.nix} | 5 +---- .../gnome/core => by-name/gd}/gdm/reset-environment.patch | 0 pkgs/desktops/gnome/default.nix | 3 +-- 9 files changed, 5 insertions(+), 9 deletions(-) rename pkgs/{desktops/gnome/core => by-name/gd}/gdm/fix-paths.patch (100%) rename pkgs/{desktops/gnome/core => by-name/gd}/gdm/gdm-session-worker_forward-vars.patch (100%) rename pkgs/{desktops/gnome/core => by-name/gd}/gdm/gdm-x-session_extra_args.patch (100%) rename pkgs/{desktops/gnome/core => by-name/gd}/gdm/gdm-x-session_session-wrapper.patch (100%) rename pkgs/{desktops/gnome/core => by-name/gd}/gdm/org.gnome.login-screen.gschema.override (100%) rename pkgs/{desktops/gnome/core/gdm/default.nix => by-name/gd/gdm/package.nix} (98%) rename pkgs/{desktops/gnome/core => by-name/gd}/gdm/reset-environment.patch (100%) diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index fde97c92d61a..c4987f1b6322 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -3,7 +3,7 @@ let cfg = config.services.xserver.displayManager; - gdm = pkgs.gnome.gdm; + gdm = pkgs.gdm; pamCfg = config.security.pam.services; settingsFormat = pkgs.formats.ini { }; configFile = settingsFormat.generate "custom.conf" cfg.gdm.settings; @@ -310,7 +310,7 @@ in auth requisite pam_nologin.so auth required pam_succeed_if.so uid >= 1000 quiet ${lib.optionalString pamCfg.login.enableGnomeKeyring '' - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} auth required pam_permit.so @@ -334,7 +334,7 @@ in auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so auth required pam_env.so ${lib.optionalString pamCfg.login.enableGnomeKeyring '' - auth [success=ok default=1] ${pkgs.gnome.gdm}/lib/security/pam_gdm.so + auth [success=ok default=1] ${gdm}/lib/security/pam_gdm.so auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so ''} diff --git a/pkgs/desktops/gnome/core/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/fix-paths.patch rename to pkgs/by-name/gd/gdm/fix-paths.patch diff --git a/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/by-name/gd/gdm/gdm-session-worker_forward-vars.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch rename to pkgs/by-name/gd/gdm/gdm-session-worker_forward-vars.patch diff --git a/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch b/pkgs/by-name/gd/gdm/gdm-x-session_extra_args.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch rename to pkgs/by-name/gd/gdm/gdm-x-session_extra_args.patch diff --git a/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch rename to pkgs/by-name/gd/gdm/gdm-x-session_session-wrapper.patch diff --git a/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/by-name/gd/gdm/org.gnome.login-screen.gschema.override similarity index 100% rename from pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override rename to pkgs/by-name/gd/gdm/org.gnome.login-screen.gschema.override diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/by-name/gd/gdm/package.nix similarity index 98% rename from pkgs/desktops/gnome/core/gdm/default.nix rename to pkgs/by-name/gd/gdm/package.nix index 23d1a317167f..0055b0cd378b 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -175,10 +175,7 @@ stdenv.mkDerivation (finalAttrs: { separateDebugInfo = true; passthru = { - updateScript = gnome.updateScript { - packageName = "gdm"; - attrPath = "gnome.gdm"; - }; + updateScript = gnome.updateScript { packageName = "gdm"; }; # Used in GDM NixOS module # Don't remove. diff --git a/pkgs/desktops/gnome/core/gdm/reset-environment.patch b/pkgs/by-name/gd/gdm/reset-environment.patch similarity index 100% rename from pkgs/desktops/gnome/core/gdm/reset-environment.patch rename to pkgs/by-name/gd/gdm/reset-environment.patch diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 8714314df445..b0c36527ca80 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -22,8 +22,6 @@ in caribou = callPackage ./core/caribou { }; - gdm = callPackage ./core/gdm { }; - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; @@ -112,6 +110,7 @@ in file-roller = lib.warn "The ‘gnome.file-roller’ was moved to top-level. Please use ‘pkgs.file-roller’ directly." pkgs.file-roller; # Added on 2024-06-13. five-or-more = lib.warn "The ‘gnome.five-or-more’ was moved to top-level. Please use ‘pkgs.five-or-more’ directly." pkgs.five-or-more; # Added on 2024-08-11. four-in-a-row = lib.warn "The ‘gnome.four-in-a-row’ was moved to top-level. Please use ‘pkgs.four-in-a-row’ directly." pkgs.four-in-a-row; # Added on 2024-08-11. + gdm = lib.warn "The ‘gnome.gdm’ was moved to top-level. Please use ‘pkgs.gdm’ directly." pkgs.gdm; # Added on 2024-08-11. geary = lib.warn "The ‘gnome.geary’ was moved to top-level. Please use ‘pkgs.geary’ directly." pkgs.geary; # Added on 2024-06-22. ghex = lib.warn "The ‘gnome.ghex’ was moved to top-level. Please use ‘pkgs.ghex’ directly." pkgs.ghex; # Added on 2024-06-22. gitg = lib.warn "The ‘gnome.gitg’ was moved to top-level. Please use ‘pkgs.gitg’ directly." pkgs.gitg; # Added on 2024-06-22. From 64438363f5c45363759b6c298249643aedbca5bf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 18:48:19 +0200 Subject: [PATCH 83/93] gnome-shell-extensions: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 4 ++-- .../gn}/gnome-shell-extensions/fix_gmenu.patch | 0 .../gn}/gnome-shell-extensions/fix_gtop.patch | 0 .../gn/gnome-shell-extensions/package.nix} | 5 +---- pkgs/by-name/gn/gnome-tweaks/package.nix | 3 ++- pkgs/desktops/gnome/default.nix | 3 +-- 6 files changed, 6 insertions(+), 9 deletions(-) rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell-extensions/fix_gmenu.patch (100%) rename pkgs/{desktops/gnome/core => by-name/gn}/gnome-shell-extensions/fix_gtop.patch (100%) rename pkgs/{desktops/gnome/core/gnome-shell-extensions/default.nix => by-name/gn/gnome-shell-extensions/package.nix} (92%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 043c7e1fdfbc..49c94760780e 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -312,7 +312,7 @@ in pkgs.gnome.gnome-shell ]; optionalPackages = [ - pkgs.gnome.gnome-shell-extensions + pkgs.gnome-shell-extensions ]; in mandatoryPackages @@ -378,7 +378,7 @@ in gnome-bluetooth pkgs.gnome-color-manager gnome-control-center - gnome-shell-extensions + pkgs.gnome-shell-extensions pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in. pkgs.gnome-user-docs pkgs.orca diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/by-name/gn/gnome-shell-extensions/fix_gmenu.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch rename to pkgs/by-name/gn/gnome-shell-extensions/fix_gmenu.patch diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch b/pkgs/by-name/gn/gnome-shell-extensions/fix_gtop.patch similarity index 100% rename from pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gtop.patch rename to pkgs/by-name/gn/gnome-shell-extensions/fix_gtop.patch diff --git a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix similarity index 92% rename from pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix rename to pkgs/by-name/gn/gnome-shell-extensions/package.nix index cb5feb26e408..dbcf91b5bc49 100644 --- a/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -66,10 +66,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "gnome-shell-extensions"; - attrPath = "gnome.gnome-shell-extensions"; - }; + updateScript = gnome.updateScript { packageName = "gnome-shell-extensions"; }; }; meta = with lib; { diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix index 3bbe91007b6d..0e3e44f345d5 100644 --- a/pkgs/by-name/gn/gnome-tweaks/package.nix +++ b/pkgs/by-name/gn/gnome-tweaks/package.nix @@ -8,6 +8,7 @@ , glib , gnome , gnome-desktop +, gnome-shell-extensions , gobject-introspection , gsettings-desktop-schemas , gtk4 @@ -50,7 +51,7 @@ python3Packages.buildPythonApplication rec { gnome.gnome-settings-daemon gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension - gnome.gnome-shell-extensions + gnome-shell-extensions gnome.mutter gsettings-desktop-schemas gtk4 diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b0c36527ca80..a1aad906e97c 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -34,8 +34,6 @@ in gnome-shell = callPackage ./core/gnome-shell { }; - gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { }; - gnome-settings-daemon = callPackage ./core/gnome-settings-daemon { }; # Using 43 to match Mutter used in Pantheon @@ -144,6 +142,7 @@ in gnome-remote-desktop = lib.warn "The ‘gnome.gnome-remote-desktop’ was moved to top-level. Please use ‘pkgs.gnome-remote-desktop’ directly." pkgs.gnome-remote-desktop; # Added on 2024-08-11. gnome-robots = lib.warn "The ‘gnome.gnome-robots’ was moved to top-level. Please use ‘pkgs.gnome-robots’ directly." pkgs.gnome-robots; # Added on 2024-08-11. gnome-screenshot = lib.warn "The ‘gnome.gnome-screenshot’ was moved to top-level. Please use ‘pkgs.gnome-screenshot’ directly." pkgs.gnome-screenshot; # Added on 2024-06-22. + gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11. gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. gnome-sudoku = lib.warn "The ‘gnome.gnome-sudoku’ was moved to top-level. Please use ‘pkgs.gnome-sudoku’ directly." pkgs.gnome-sudoku; # Added on 2024-08-11. From c1f4b33309306217ad1067cd32904d444ccc013a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 19:08:21 +0200 Subject: [PATCH 84/93] gnome.libchamplain: Remove It is unused. `libsoup` in top-level also has `gnomeSupport` enabled so no change there. --- pkgs/desktops/gnome/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index a1aad906e97c..75996a386387 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -13,7 +13,6 @@ in _gdkPixbufCacheBuilder_DO_NOT_USE = callPackage ./gdk-pixbuf-cache-builder.nix { }; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - libchamplain = pkgs.libchamplain.override { inherit (self) libsoup; }; # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -88,6 +87,7 @@ in }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22. + libchamplain = lib.warn "The ‘gnome.libchamplain’ was removed as unused. Please use ‘pkgs.libchamplain’ directly." pkgs.libchamplain; # Added on 2024-08-11. gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 From b8d83d9ac3bf308440da0df30174804c3012aef1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 19:09:57 +0200 Subject: [PATCH 85/93] gnome.libsoup: Remove MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is unused – everything in GNOME migrated to `libsoup_3`, which does not have a `libsoup-gnome-*.so`. And `libsoup` is enabling `gnomeSupport` by default. --- pkgs/desktops/gnome/default.nix | 3 +-- pkgs/development/libraries/osm-gps-map/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 75996a386387..9e70692530d3 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -12,8 +12,6 @@ in # This will go away, do not use outside Nixpkgs. _gdkPixbufCacheBuilder_DO_NOT_USE = callPackage ./gdk-pixbuf-cache-builder.nix { }; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; - # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -88,6 +86,7 @@ in #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22. libchamplain = lib.warn "The ‘gnome.libchamplain’ was removed as unused. Please use ‘pkgs.libchamplain’ directly." pkgs.libchamplain; # Added on 2024-08-11. + libsoup = lib.warn "The ‘gnome.libsoup’ was removed as unused. Please use ‘pkgs.libsoup’." pkgs.libsoup; # Added on 2024-08-11. gedit = throw "The ‘gnome.gedit’ alias was removed. Please use ‘pkgs.gedit’ directly."; # converted to throw on 2023-12-27 gnome-todo = throw "The ‘gnome.gnome-todo’ alias was removed. Please use ‘pkgs.endeavour’ directly."; # converted to throw on 2023-12-27 diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 1a13f6d48bb3..0be196597c90 100644 --- a/pkgs/development/libraries/osm-gps-map/default.nix +++ b/pkgs/development/libraries/osm-gps-map/default.nix @@ -1,4 +1,4 @@ -{ cairo, fetchzip, glib, gnome, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, libsoup, gnome-common, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib - gtk3 gnome.libsoup + gtk3 + libsoup ]; meta = with lib; { From e186593ede4eb4900fe81d1365f225ca48ae9825 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:28:53 +0200 Subject: [PATCH 86/93] gnome.caribou: Format with nixfmt --- pkgs/desktops/gnome/core/caribou/default.nix | 69 +++++++++++++++----- 1 file changed, 54 insertions(+), 15 deletions(-) diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix index ff8af6272799..881e24741d3a 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,16 +1,37 @@ -{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 -, libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook -, wrapGAppsHook3, libgee, vala }: +{ + fetchurl, + lib, + stdenv, + pkg-config, + gnome, + glib, + gtk3, + clutter, + dbus, + python3, + libxml2, + libxklavier, + libXtst, + gtk2, + intltool, + libxslt, + at-spi2-core, + autoreconfHook, + wrapGAppsHook3, + libgee, + vala, +}: let pname = "caribou"; version = "0.4.21"; - pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pythonEnv = python3.withPackages (ps: with ps; [ pygobject3 ]); +in +stdenv.mkDerivation rec { + name = "caribou-${version}"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/caribou/${lib.versions.majorMinor version}/${name}.tar.xz"; sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; @@ -38,14 +59,32 @@ in stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config intltool libxslt libxml2 autoreconfHook wrapGAppsHook3 vala ]; - - buildInputs = [ - glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 - libXtst gtk2 + nativeBuildInputs = [ + pkg-config + intltool + libxslt + libxml2 + autoreconfHook + wrapGAppsHook3 + vala ]; - propagatedBuildInputs = [ libgee libxklavier ]; + buildInputs = [ + glib + gtk3 + clutter + at-spi2-core + dbus + pythonEnv + python3.pkgs.pygobject3 + libXtst + gtk2 + ]; + + propagatedBuildInputs = [ + libgee + libxklavier + ]; postPatch = '' patchShebangs . @@ -54,8 +93,8 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "caribou"; + attrPath = "gnome.caribou"; }; }; From 81237a9e871ab2f335c589b31cee3366d512f39b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:28:54 +0200 Subject: [PATCH 87/93] caribou: Move from gnome scope to top-level --- .../caribou/default.nix => by-name/ca/caribou/package.nix} | 5 +---- pkgs/by-name/ci/cinnamon-common/package.nix | 6 +++--- pkgs/by-name/ci/cinnamon-screensaver/package.nix | 6 +++--- pkgs/desktops/gnome/default.nix | 3 +-- 4 files changed, 8 insertions(+), 12 deletions(-) rename pkgs/{desktops/gnome/core/caribou/default.nix => by-name/ca/caribou/package.nix} (95%) diff --git a/pkgs/desktops/gnome/core/caribou/default.nix b/pkgs/by-name/ca/caribou/package.nix similarity index 95% rename from pkgs/desktops/gnome/core/caribou/default.nix rename to pkgs/by-name/ca/caribou/package.nix index 881e24741d3a..34621a8d6a0a 100644 --- a/pkgs/desktops/gnome/core/caribou/default.nix +++ b/pkgs/by-name/ca/caribou/package.nix @@ -92,10 +92,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome.updateScript { - packageName = "caribou"; - attrPath = "gnome.caribou"; - }; + updateScript = gnome.updateScript { packageName = "caribou"; }; }; meta = with lib; { diff --git a/pkgs/by-name/ci/cinnamon-common/package.nix b/pkgs/by-name/ci/cinnamon-common/package.nix index 377d9e8d1ff6..ff9dbd7d543d 100644 --- a/pkgs/by-name/ci/cinnamon-common/package.nix +++ b/pkgs/by-name/ci/cinnamon-common/package.nix @@ -32,7 +32,7 @@ , wrapGAppsHook3 , libxml2 , gtk-doc -, gnome +, caribou , python3 , keybinder3 , cairo @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { # bindings cairo - gnome.caribou + caribou keybinder3 upower xapp @@ -176,7 +176,7 @@ stdenv.mkDerivation rec { preFixup = '' # https://github.com/NixOS/nixpkgs/issues/101881 gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" + --prefix XDG_DATA_DIRS : "${caribou}/share" ) buildPythonPath "$out ${python3.pkgs.python-xapp}" diff --git a/pkgs/by-name/ci/cinnamon-screensaver/package.nix b/pkgs/by-name/ci/cinnamon-screensaver/package.nix index f4ba7a16413d..cbcc481ca232 100644 --- a/pkgs/by-name/ci/cinnamon-screensaver/package.nix +++ b/pkgs/by-name/ci/cinnamon-screensaver/package.nix @@ -13,7 +13,7 @@ , libxslt , gtk3 , libgnomekbd -, gnome +, caribou , libtool , wrapGAppsHook3 , gobject-introspection @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { cinnamon-desktop cinnamon-common libgnomekbd - gnome.caribou + caribou ]; postPatch = '' @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { preFixup = '' # https://github.com/NixOS/nixpkgs/issues/101881 gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome.caribou}/share" + --prefix XDG_DATA_DIRS : "${caribou}/share" ) ''; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 9e70692530d3..b4de1637de15 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -17,8 +17,6 @@ in #### Core (http://ftp.acc.umu.se/pub/GNOME/core/) - caribou = callPackage ./core/caribou { }; - gnome-bluetooth = callPackage ./core/gnome-bluetooth { }; gnome-bluetooth_1_0 = callPackage ./core/gnome-bluetooth/1.0 { }; @@ -97,6 +95,7 @@ in aisleriot = lib.warn "The ‘gnome.aisleriot’ was moved to top-level. Please use ‘pkgs.aisleriot’ directly." pkgs.aisleriot; # Added on 2024-08-11. atomix = lib.warn "The ‘gnome.atomix’ was moved to top-level. Please use ‘pkgs.atomix’ directly." pkgs.atomix; # Added on 2024-08-11. baobab = lib.warn "The ‘gnome.baobab’ was moved to top-level. Please use ‘pkgs.baobab’ directly." pkgs.baobab; # Added on 2024-06-22. + caribou = lib.warn "The ‘gnome.caribou’ was moved to top-level. Please use ‘pkgs.caribou’ directly." pkgs.caribou; # Added on 2024-08-11. cheese = lib.warn "The ‘gnome.cheese’ was moved to top-level. Please use ‘pkgs.cheese’ directly." pkgs.cheese; # Added on 2024-06-22. dconf-editor = lib.warn "The ‘gnome.dconf-editor’ was moved to top-level. Please use ‘pkgs.dconf-editor’ directly." pkgs.dconf-editor; # Added on 2024-06-22. devhelp = lib.warn "The ‘gnome.devhelp’ was moved to top-level. Please use ‘pkgs.devhelp’ directly." pkgs.devhelp; # Added on 2024-06-22. From 6dd20f8a64541aaeb4da464bd8827783db0fbb5c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:28:55 +0200 Subject: [PATCH 88/93] gnome.metacity: Format with nixfmt --- pkgs/desktops/gnome/misc/metacity/default.nix | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix index 748ac320014b..ba14a9a7cdb1 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv -, fetchurl -, gettext -, glib -, gnome -, gsettings-desktop-schemas -, gtk3 -, xorg -, libcanberra-gtk3 -, libgtop -, libstartup_notification -, libxml2 -, pkg-config -, substituteAll -, wrapGAppsHook3 -, zenity +{ + lib, + stdenv, + fetchurl, + gettext, + glib, + gnome, + gsettings-desktop-schemas, + gtk3, + xorg, + libcanberra-gtk3, + libgtop, + libstartup_notification, + libxml2, + pkg-config, + substituteAll, + wrapGAppsHook3, + zenity, }: stdenv.mkDerivation rec { @@ -21,7 +23,7 @@ stdenv.mkDerivation rec { version = "3.52.0"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz"; hash = "sha256-pyQ4rObVkDrnkzjGCYsbNauRyKl8QyNwHTvvHz7rGRw="; }; @@ -56,8 +58,8 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; - attrPath = "gnome.${pname}"; + packageName = "metacity"; + attrPath = "gnome.metacity"; versionPolicy = "odd-unstable"; }; }; From f192bd9e5cc9bd42783c1b5e7f8b8538c1285cd6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:28:55 +0200 Subject: [PATCH 89/93] metacity: Move from gnome scope to top-level --- nixos/modules/services/x11/desktop-managers/gnome.nix | 4 ++-- nixos/modules/services/x11/window-managers/metacity.nix | 6 +++--- .../gnome/misc => by-name/me}/metacity/fix-paths.patch | 0 .../default.nix => by-name/me/metacity/package.nix} | 1 - pkgs/desktops/gnome/default.nix | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) rename pkgs/{desktops/gnome/misc => by-name/me}/metacity/fix-paths.patch (100%) rename pkgs/{desktops/gnome/misc/metacity/default.nix => by-name/me/metacity/package.nix} (97%) diff --git a/nixos/modules/services/x11/desktop-managers/gnome.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix index 49c94760780e..8b57dfe686d4 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -52,9 +52,9 @@ let flashbackEnabled = cfg.flashback.enableMetacity || lib.length cfg.flashback.customSessions > 0; flashbackWms = lib.optional cfg.flashback.enableMetacity { - wmName = "metacity"; + wmName = "pkgs.metacity"; wmLabel = "Metacity"; - wmCommand = "${pkgs.gnome.metacity}/bin/metacity"; + wmCommand = "${pkgs.metacity}/bin/metacity"; enableGnomePanel = true; } ++ cfg.flashback.customSessions; diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 600afe759b2c..6fd9f00374ad 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.metacity; - inherit (pkgs) gnome; + inherit (pkgs) metacity; in { @@ -18,12 +18,12 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - ${gnome.metacity}/bin/metacity & + ${metacity}/bin/metacity & waitPID=$! ''; }; - environment.systemPackages = [ gnome.metacity ]; + environment.systemPackages = [ metacity ]; }; diff --git a/pkgs/desktops/gnome/misc/metacity/fix-paths.patch b/pkgs/by-name/me/metacity/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome/misc/metacity/fix-paths.patch rename to pkgs/by-name/me/metacity/fix-paths.patch diff --git a/pkgs/desktops/gnome/misc/metacity/default.nix b/pkgs/by-name/me/metacity/package.nix similarity index 97% rename from pkgs/desktops/gnome/misc/metacity/default.nix rename to pkgs/by-name/me/metacity/package.nix index ba14a9a7cdb1..3904fb25edb2 100644 --- a/pkgs/desktops/gnome/misc/metacity/default.nix +++ b/pkgs/by-name/me/metacity/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { packageName = "metacity"; - attrPath = "gnome.metacity"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index b4de1637de15..9e371d26f64f 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -77,8 +77,6 @@ in gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { }; - metacity = callPackage ./misc/metacity { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. @@ -157,6 +155,7 @@ in hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11. iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11. lightsoff = lib.warn "The ‘gnome.lightsoff’ was moved to top-level. Please use ‘pkgs.lightsoff’ directly." pkgs.lightsoff; # Added on 2024-08-11. + metacity = lib.warn "The ‘gnome.metacity’ was moved to top-level. Please use ‘pkgs.metacity’ directly." pkgs.metacity; # Added on 2024-08-11. nautilus = lib.warn "The ‘gnome.nautilus’ was moved to top-level. Please use ‘pkgs.nautilus’ directly." pkgs.nautilus; # Added on 2024-06-13. nautilus-python = lib.warn "The ‘gnome.nautilus-python’ was moved to top-level. Please use ‘pkgs.nautilus-python’ directly." pkgs.nautilus-python; # Added on 2024-06-13. polari = lib.warn "The ‘gnome.polari’ was moved to top-level. Please use ‘pkgs.polari’ directly." pkgs.polari; # Added on 2024-08-11. From bd70d3211c2f7c29c35e613ebc10b0abe8df41ed Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:28:56 +0200 Subject: [PATCH 90/93] gnome.gtkhtml: Format with nixfmt --- pkgs/desktops/gnome/misc/gtkhtml/default.nix | 45 ++++++++++++++++---- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix index 34dca7091557..8a3eaae91057 100644 --- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,12 +1,25 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, pkg-config, gtk3, intltool -, gnome, adwaita-icon-theme, enchant, isocodes, gsettings-desktop-schemas }: +{ + lib, + stdenv, + fetchurl, + fetchpatch, + autoreconfHook, + pkg-config, + gtk3, + intltool, + gnome, + adwaita-icon-theme, + enchant, + isocodes, + gsettings-desktop-schemas, +}: stdenv.mkDerivation rec { pname = "gtkhtml"; version = "4.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/${lib.versions.majorMinor version}/gtkhtml-${version}.tar.xz"; sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; @@ -14,7 +27,7 @@ stdenv.mkDerivation rec { # Enables enchant2 support. # Upstream is dead, no further releases are coming. (fetchpatch { - name ="enchant-2.patch"; + name = "enchant-2.patch"; url = "https://aur.archlinux.org/cgit/aur.git/plain/enchant-2.patch?h=gtkhtml4&id=0218303a63d64c04d6483a6fe9bb55063fcfaa43"; sha256 = "f0OToWGHZwxvqf+0qosfA9FfwJ/IXfjIPP5/WrcvArI="; extraPrefix = ""; @@ -22,14 +35,28 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; + updateScript = gnome.updateScript { + packageName = "gtkhtml"; + attrPath = "gnome.gtkhtml"; + }; }; - nativeBuildInputs = [ autoreconfHook pkg-config intltool ]; - buildInputs = [ gtk3 adwaita-icon-theme - gsettings-desktop-schemas ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + intltool + ]; - propagatedBuildInputs = [ enchant isocodes ]; + buildInputs = [ + gtk3 + adwaita-icon-theme + gsettings-desktop-schemas + ]; + + propagatedBuildInputs = [ + enchant + isocodes + ]; meta = with lib; { platforms = platforms.linux; From e61da57bbfae48898af470ffba5c1e26f9352046 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:28:56 +0200 Subject: [PATCH 91/93] gtkhtml: Move from gnome scope to top-level --- .../gtkhtml/default.nix => by-name/gt/gtkhtml/package.nix} | 5 +---- pkgs/desktops/gnome/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) rename pkgs/{desktops/gnome/misc/gtkhtml/default.nix => by-name/gt/gtkhtml/package.nix} (91%) diff --git a/pkgs/desktops/gnome/misc/gtkhtml/default.nix b/pkgs/by-name/gt/gtkhtml/package.nix similarity index 91% rename from pkgs/desktops/gnome/misc/gtkhtml/default.nix rename to pkgs/by-name/gt/gtkhtml/package.nix index 8a3eaae91057..9fc4c38790e3 100644 --- a/pkgs/desktops/gnome/misc/gtkhtml/default.nix +++ b/pkgs/by-name/gt/gtkhtml/package.nix @@ -35,10 +35,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome.updateScript { - packageName = "gtkhtml"; - attrPath = "gnome.gtkhtml"; - }; + updateScript = gnome.updateScript { packageName = "gtkhtml"; }; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix index 9e371d26f64f..a81a5ea46350 100644 --- a/pkgs/desktops/gnome/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -77,7 +77,6 @@ in gnome-panel-with-modules = callPackage ./misc/gnome-panel/wrapper.nix { }; - gtkhtml = callPackage ./misc/gtkhtml { enchant = pkgs.enchant2; }; }) // lib.optionalAttrs config.allowAliases { #### Legacy aliases. They need to be outside the scope or they will shadow the attributes from parent scope. libgnome-keyring = lib.warn "The ‘gnome.libgnome-keyring’ was moved to top-level. Please use ‘pkgs.libgnome-keyring’ directly." pkgs.libgnome-keyring; # Added on 2024-06-22. @@ -151,6 +150,7 @@ in gnome-user-share = lib.warn "The ‘gnome.gnome-user-share’ was moved to top-level. Please use ‘pkgs.gnome-user-share’ directly." pkgs.gnome-user-share; # Added on 2024-06-13. gnome-weather = lib.warn "The ‘gnome.gnome-weather’ was moved to top-level. Please use ‘pkgs.gnome-weather’ directly." pkgs.gnome-weather; # Added on 2024-08-11. gpaste = lib.warn "The ‘gnome.gpaste’ was moved to top-level. Please use ‘pkgs.gpaste’ directly." pkgs.gpaste; # Added on 2024-06-22. + gtkhtml = lib.warn "The ‘gnome.gtkhtml’ was moved to top-level. Please use ‘pkgs.gtkhtml’ directly." pkgs.gtkhtml; # Added on 2024-08-11. gucharmap = lib.warn "The ‘gnome.gucharmap’ was moved to top-level. Please use ‘pkgs.gucharmap’ directly." pkgs.gucharmap; # Added on 2024-06-22. hitori = lib.warn "The ‘gnome.hitori’ was moved to top-level. Please use ‘pkgs.hitori’ directly." pkgs.hitori; # Added on 2024-08-11. iagno = lib.warn "The ‘gnome.iagno’ was moved to top-level. Please use ‘pkgs.iagno’ directly." pkgs.iagno; # Added on 2024-08-11. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f7fc0bbcb04..43a80051d243 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34847,9 +34847,7 @@ with pkgs; inherit (gnome2) libglade GConf; }; - xiphos = callPackage ../applications/misc/xiphos { - gtkhtml = gnome.gtkhtml; - }; + xiphos = callPackage ../applications/misc/xiphos { }; xournal = callPackage ../applications/graphics/xournal { inherit (gnome2) libgnomecanvas; From 369e2d976d862491dbe525744b1c9c5ad4660d55 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:32:50 +0200 Subject: [PATCH 92/93] gtkhtml: Unmaintain This is dead and probably insecure. --- pkgs/by-name/gt/gtkhtml/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/gt/gtkhtml/package.nix b/pkgs/by-name/gt/gtkhtml/package.nix index 9fc4c38790e3..0820e69d85a9 100644 --- a/pkgs/by-name/gt/gtkhtml/package.nix +++ b/pkgs/by-name/gt/gtkhtml/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation rec { meta = with lib; { platforms = platforms.linux; - maintainers = teams.gnome.members; + maintainers = [ ]; }; } From 54b056a950ff5fa1df8d0b2fc3db76b75e0c3189 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 11 Aug 2024 23:35:51 +0200 Subject: [PATCH 93/93] nixos/metacity: Avoid top-level with --- nixos/modules/services/x11/window-managers/metacity.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 6fd9f00374ad..b3c24a9a5bba 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, ... }: -with lib; - let cfg = config.services.xserver.windowManager.metacity; @@ -10,12 +8,12 @@ in { options = { - services.xserver.windowManager.metacity.enable = mkEnableOption "metacity"; + services.xserver.windowManager.metacity.enable = lib.mkEnableOption "metacity"; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { - services.xserver.windowManager.session = singleton + services.xserver.windowManager.session = lib.singleton { name = "metacity"; start = '' ${metacity}/bin/metacity &