diff --git a/doc/functions/library/attrsets.xml b/doc/functions/library/attrsets.xml index de8414249abf..912d6d477984 100644 --- a/doc/functions/library/attrsets.xml +++ b/doc/functions/library/attrsets.xml @@ -855,7 +855,7 @@ lib.attrsets.mapAttrs' (name: value: lib.attrsets.nameValuePair ("foo_" + name) <function>lib.attrsets.mapAttrsToList</function> mapAttrsToList :: (String -> Any -> Any) -> - AttrSet -> Any + AttrSet -> [Any] diff --git a/doc/languages-frameworks/gnome.section.md b/doc/languages-frameworks/gnome.section.md index 734bf2b63899..732b529cc22f 100644 --- a/doc/languages-frameworks/gnome.section.md +++ b/doc/languages-frameworks/gnome.section.md @@ -88,7 +88,7 @@ For convenience, it also adds `dconf.lib` for a GIO module implementing a GSetti The setup hook [currently](https://github.com/NixOS/nixpkgs/issues/56943) does not work in expressions with `strictDeps` enabled, like Python packages. In those cases, you will need to disable it with `strictDeps = false;`. ::: -- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `gnome3.grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`. +- []{#ssec-gnome-hooks-gst-grl-plugins} Setup hooks of `gst_all_1.gstreamer` and `grilo` will populate the `GST_PLUGIN_SYSTEM_PATH_1_0` and `GRL_PLUGIN_PATH` variables, respectively, which will then be added to the wrapper by `wrapGAppsHook`. You can also pass additional arguments to `makeWrapper` using `gappsWrapperArgs` in `preFixup` hook: @@ -105,7 +105,7 @@ preFixup = '' ## Updating GNOME packages {#ssec-gnome-updating} -Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome3`. Read the package’s `NEWS` file to see what changed. +Most GNOME package offer [`updateScript`](#var-passthru-updateScript), it is therefore possible to update to latest source tarball by running `nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus` or even en masse with `nix-shell maintainers/scripts/update.nix --argstr path gnome`. Read the package’s `NEWS` file to see what changed. ## Frequently encountered issues {#ssec-gnome-common-issues} diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 0ce3aaeca452..5c787940cb0c 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -243,6 +243,10 @@ rec { /* Call a function for each attribute in the given set and return the result in a list. + Type: + mapAttrsToList :: + (String -> a -> b) -> AttrSet -> [b] + Example: mapAttrsToList (name: value: name + value) { x = "a"; y = "b"; } diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index 5317bdb9f42c..7435cf64425c 100755 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -143,7 +143,7 @@ let to run all update scripts for all packages that lists \`garbas\` as a maintainer and have \`updateScript\` defined, or: - % nix-shell maintainers/scripts/update.nix --argstr package gnome3.nautilus + % nix-shell maintainers/scripts/update.nix --argstr package gnome.nautilus to run update script for specific package, or @@ -151,7 +151,7 @@ let to run update script for all packages matching given predicate, or - % nix-shell maintainers/scripts/update.nix --argstr path gnome3 + % nix-shell maintainers/scripts/update.nix --argstr path gnome to run update script for all package under an attribute path. diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5ed98c7be98e..9af8d11c6f95 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -66,7 +66,7 @@ with lib.maintainers; { }; freedesktop = { - members = [ jtojnar worldofpeace ]; + members = [ jtojnar ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; }; @@ -89,7 +89,6 @@ with lib.maintainers; { members = [ hedning jtojnar - worldofpeace dasj19 maxeaubrey ]; diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 757174c52632..e72193897068 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -25,7 +25,7 @@ = true; = true; - = true; + = true; = true; = true; = true; diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml index 4102fe206e19..0dae49c636f6 100644 --- a/nixos/doc/manual/release-notes/rl-1909.xml +++ b/nixos/doc/manual/release-notes/rl-1909.xml @@ -83,10 +83,10 @@ like games. This can be achieved with the following options which the desktop manager default enables, excluding games. - - - - + + + + With these options we hope to give users finer grained control over their systems. Prior to this change you'd either have to manually disable options or use which only excluded the optional applications. diff --git a/nixos/doc/manual/release-notes/rl-2105.xml b/nixos/doc/manual/release-notes/rl-2105.xml index 96bd3010e5a9..53d11e10ca26 100644 --- a/nixos/doc/manual/release-notes/rl-2105.xml +++ b/nixos/doc/manual/release-notes/rl-2105.xml @@ -27,7 +27,7 @@ The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series. - GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. + GNOME desktop environment was upgraded to 40, see the release notes for 40.0 and 3.38. The gnome3 attribute set has been renamed to gnome and so have been the NixOS options. @@ -939,7 +939,7 @@ environment.systemPackages = [ - The GNOME desktop manager once again installs gnome3.epiphany by default. + The GNOME desktop manager once again installs gnome.epiphany by default. diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 803bae4212ef..12ad8a4ae004 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -9,7 +9,7 @@ with lib; isoImage.edition = "gnome"; - services.xserver.desktopManager.gnome3 = { + services.xserver.desktopManager.gnome = { # Add firefox to favorite-apps favoriteAppsOverride = '' [org.gnome.shell] diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index af3e1aecca71..2768e17590b3 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -44,7 +44,7 @@ with lib; # Enable GDM/GNOME by uncommenting above two lines and two lines below. # services.xserver.displayManager.gdm.enable = true; - # services.xserver.desktopManager.gnome3.enable = true; + # services.xserver.desktopManager.gnome.enable = true; # Set your time zone. # time.timeZone = "Europe/Amsterdam"; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 95c35cb898b7..c48e0096f21e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -338,21 +338,21 @@ ./services/desktops/malcontent.nix ./services/desktops/pipewire/pipewire.nix ./services/desktops/pipewire/pipewire-media-session.nix - ./services/desktops/gnome3/at-spi2-core.nix - ./services/desktops/gnome3/chrome-gnome-shell.nix - ./services/desktops/gnome3/evolution-data-server.nix - ./services/desktops/gnome3/glib-networking.nix - ./services/desktops/gnome3/gnome-initial-setup.nix - ./services/desktops/gnome3/gnome-keyring.nix - ./services/desktops/gnome3/gnome-online-accounts.nix - ./services/desktops/gnome3/gnome-online-miners.nix - ./services/desktops/gnome3/gnome-remote-desktop.nix - ./services/desktops/gnome3/gnome-settings-daemon.nix - ./services/desktops/gnome3/gnome-user-share.nix - ./services/desktops/gnome3/rygel.nix - ./services/desktops/gnome3/sushi.nix - ./services/desktops/gnome3/tracker.nix - ./services/desktops/gnome3/tracker-miners.nix + ./services/desktops/gnome/at-spi2-core.nix + ./services/desktops/gnome/chrome-gnome-shell.nix + ./services/desktops/gnome/evolution-data-server.nix + ./services/desktops/gnome/glib-networking.nix + ./services/desktops/gnome/gnome-initial-setup.nix + ./services/desktops/gnome/gnome-keyring.nix + ./services/desktops/gnome/gnome-online-accounts.nix + ./services/desktops/gnome/gnome-online-miners.nix + ./services/desktops/gnome/gnome-remote-desktop.nix + ./services/desktops/gnome/gnome-settings-daemon.nix + ./services/desktops/gnome/gnome-user-share.nix + ./services/desktops/gnome/rygel.nix + ./services/desktops/gnome/sushi.nix + ./services/desktops/gnome/tracker.nix + ./services/desktops/gnome/tracker-miners.nix ./services/desktops/neard.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/system-config-printer.nix diff --git a/nixos/modules/programs/file-roller.nix b/nixos/modules/programs/file-roller.nix index 64f6a94e7641..b939d59909c0 100644 --- a/nixos/modules/programs/file-roller.nix +++ b/nixos/modules/programs/file-roller.nix @@ -30,9 +30,9 @@ with lib; config = mkIf config.programs.file-roller.enable { - environment.systemPackages = [ pkgs.gnome3.file-roller ]; + environment.systemPackages = [ pkgs.gnome.file-roller ]; - services.dbus.packages = [ pkgs.gnome3.file-roller ]; + services.dbus.packages = [ pkgs.gnome.file-roller ]; }; diff --git a/nixos/modules/programs/geary.nix b/nixos/modules/programs/geary.nix index 5e441a75cb60..407680c30dc3 100644 --- a/nixos/modules/programs/geary.nix +++ b/nixos/modules/programs/geary.nix @@ -15,10 +15,10 @@ in { }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome3.geary ]; + environment.systemPackages = [ pkgs.gnome.geary ]; programs.dconf.enable = true; - services.gnome3.gnome-keyring.enable = true; - services.gnome3.gnome-online-accounts.enable = true; + services.gnome.gnome-keyring.enable = true; + services.gnome.gnome-online-accounts.enable = true; }; } diff --git a/nixos/modules/programs/gnome-disks.nix b/nixos/modules/programs/gnome-disks.nix index 80dc2983ea50..4b128b471265 100644 --- a/nixos/modules/programs/gnome-disks.nix +++ b/nixos/modules/programs/gnome-disks.nix @@ -41,9 +41,9 @@ with lib; config = mkIf config.programs.gnome-disks.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-disk-utility ]; + environment.systemPackages = [ pkgs.gnome.gnome-disk-utility ]; - services.dbus.packages = [ pkgs.gnome3.gnome-disk-utility ]; + services.dbus.packages = [ pkgs.gnome.gnome-disk-utility ]; }; diff --git a/nixos/modules/programs/gnome-documents.nix b/nixos/modules/programs/gnome-documents.nix index 9dd53483055c..43ad3163efd8 100644 --- a/nixos/modules/programs/gnome-documents.nix +++ b/nixos/modules/programs/gnome-documents.nix @@ -13,7 +13,7 @@ with lib; # Added 2019-08-09 imports = [ (mkRenamedOptionModule - [ "services" "gnome3" "gnome-documents" "enable" ] + [ "services" "gnome" "gnome-documents" "enable" ] [ "programs" "gnome-documents" "enable" ]) ]; @@ -41,13 +41,13 @@ with lib; config = mkIf config.programs.gnome-documents.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-documents ]; + environment.systemPackages = [ pkgs.gnome.gnome-documents ]; - services.dbus.packages = [ pkgs.gnome3.gnome-documents ]; + services.dbus.packages = [ pkgs.gnome.gnome-documents ]; - services.gnome3.gnome-online-accounts.enable = true; + services.gnome.gnome-online-accounts.enable = true; - services.gnome3.gnome-online-miners.enable = true; + services.gnome.gnome-online-miners.enable = true; }; diff --git a/nixos/modules/programs/gnome-terminal.nix b/nixos/modules/programs/gnome-terminal.nix index f2617e5bc038..71a6b217880c 100644 --- a/nixos/modules/programs/gnome-terminal.nix +++ b/nixos/modules/programs/gnome-terminal.nix @@ -28,9 +28,9 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-terminal ]; - services.dbus.packages = [ pkgs.gnome3.gnome-terminal ]; - systemd.packages = [ pkgs.gnome3.gnome-terminal ]; + environment.systemPackages = [ pkgs.gnome.gnome-terminal ]; + services.dbus.packages = [ pkgs.gnome.gnome-terminal ]; + systemd.packages = [ pkgs.gnome.gnome-terminal ]; programs.bash.vteIntegration = true; programs.zsh.vteIntegration = true; diff --git a/nixos/modules/programs/gpaste.nix b/nixos/modules/programs/gpaste.nix index 8bc52c28d814..cff2fb8d0034 100644 --- a/nixos/modules/programs/gpaste.nix +++ b/nixos/modules/programs/gpaste.nix @@ -27,10 +27,10 @@ with lib; ###### implementation config = mkIf config.programs.gpaste.enable { - environment.systemPackages = [ pkgs.gnome3.gpaste ]; - services.dbus.packages = [ pkgs.gnome3.gpaste ]; - systemd.packages = [ pkgs.gnome3.gpaste ]; + environment.systemPackages = [ pkgs.gnome.gpaste ]; + services.dbus.packages = [ pkgs.gnome.gpaste ]; + systemd.packages = [ pkgs.gnome.gpaste ]; # gnome-control-center crashes in Keyboard Shortcuts pane without the GSettings schemas. - services.xserver.desktopManager.gnome3.sessionPath = [ pkgs.gnome3.gpaste ]; + services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ]; }; } diff --git a/nixos/modules/programs/phosh.nix b/nixos/modules/programs/phosh.nix index f6faf7990dd1..150874be6744 100644 --- a/nixos/modules/programs/phosh.nix +++ b/nixos/modules/programs/phosh.nix @@ -155,8 +155,8 @@ in { ''; }; - services.gnome3.core-shell.enable = true; - services.gnome3.core-os-services.enable = true; + services.gnome.core-shell.enable = true; + services.gnome.core-os-services.enable = true; services.xserver.displayManager.sessionPackages = [ pkgs.phosh ]; environment.etc."phosh/phoc.ini".source = diff --git a/nixos/modules/programs/seahorse.nix b/nixos/modules/programs/seahorse.nix index b229d2a2c0db..c0a356bff57c 100644 --- a/nixos/modules/programs/seahorse.nix +++ b/nixos/modules/programs/seahorse.nix @@ -31,14 +31,14 @@ with lib; config = mkIf config.programs.seahorse.enable { - programs.ssh.askPassword = mkDefault "${pkgs.gnome3.seahorse}/libexec/seahorse/ssh-askpass"; + programs.ssh.askPassword = mkDefault "${pkgs.gnome.seahorse}/libexec/seahorse/ssh-askpass"; environment.systemPackages = [ - pkgs.gnome3.seahorse + pkgs.gnome.seahorse ]; services.dbus.packages = [ - pkgs.gnome3.seahorse + pkgs.gnome.seahorse ]; }; diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 1c49131d7895..b5bd22f6ba7b 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -433,7 +433,7 @@ let ("auth optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} ${optionalString cfg.enableGnomeKeyring - "auth optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so"} + "auth optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so"} ${optionalString cfg.gnupg.enable "auth optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + optionalString cfg.gnupg.storeOnly " store-only" @@ -471,7 +471,7 @@ let ${optionalString config.krb5.enable "password sufficient ${pam_krb5}/lib/security/pam_krb5.so use_first_pass"} ${optionalString cfg.enableGnomeKeyring - "password optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} + "password optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so use_authtok"} # Session management. ${optionalString cfg.setEnvironment '' @@ -512,7 +512,7 @@ let ("session optional ${pkgs.plasma5Packages.kwallet-pam}/lib/security/pam_kwallet5.so" + " kwalletd=${pkgs.plasma5Packages.kwallet.bin}/bin/kwalletd5")} ${optionalString (cfg.enableGnomeKeyring) - "session optional ${pkgs.gnome3.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} + "session optional ${pkgs.gnome.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start"} ${optionalString cfg.gnupg.enable "session optional ${pkgs.pam_gnupg}/lib/security/pam_gnupg.so" + optionalString cfg.gnupg.noAutostart " no-autostart" diff --git a/nixos/modules/services/desktops/bamf.nix b/nixos/modules/services/desktops/bamf.nix index 4b35146d0844..37121c219a37 100644 --- a/nixos/modules/services/desktops/bamf.nix +++ b/nixos/modules/services/desktops/bamf.nix @@ -6,7 +6,7 @@ with lib; { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; ###### interface diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index d0f6b66328a4..20007a421b08 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -20,7 +20,7 @@ in { internal = true; type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.gnome3.gnome-software ]"; + example = literalExample "[ pkgs.gnome.gnome-software ]"; description = '' Packages that provide an interface for flatpak (like gnome-software) that will be automatically available diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 0dc0643afbc9..e9ec787e5ada 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -266,5 +266,5 @@ in } // mapAttrs' appConfigToINICompatible cfg.appConfig); }; - meta.maintainers = with lib.maintainers; [ worldofpeace ]; + meta.maintainers = with lib.maintainers; [ ]; } diff --git a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix b/nixos/modules/services/desktops/gnome/at-spi2-core.nix similarity index 72% rename from nixos/modules/services/desktops/gnome3/at-spi2-core.nix rename to nixos/modules/services/desktops/gnome/at-spi2-core.nix index 492242e3296d..1268a9d49b82 100644 --- a/nixos/modules/services/desktops/gnome3/at-spi2-core.nix +++ b/nixos/modules/services/desktops/gnome/at-spi2-core.nix @@ -12,9 +12,17 @@ with lib; ###### interface + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "at-spi2-core" "enable" ] + [ "services" "gnome" "at-spi2-core" "enable" ] + ) + ]; + options = { - services.gnome3.at-spi2-core = { + services.gnome.at-spi2-core = { enable = mkOption { type = types.bool; @@ -36,13 +44,13 @@ with lib; ###### implementation config = mkMerge [ - (mkIf config.services.gnome3.at-spi2-core.enable { + (mkIf config.services.gnome.at-spi2-core.enable { environment.systemPackages = [ pkgs.at-spi2-core ]; services.dbus.packages = [ pkgs.at-spi2-core ]; systemd.packages = [ pkgs.at-spi2-core ]; }) - (mkIf (!config.services.gnome3.at-spi2-core.enable) { + (mkIf (!config.services.gnome.at-spi2-core.enable) { environment.variables.NO_AT_BRIDGE = "1"; }) ]; diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix similarity index 74% rename from nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix rename to nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix index 3c7f217b18df..15c5bfbd8210 100644 --- a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix +++ b/nixos/modules/services/desktops/gnome/chrome-gnome-shell.nix @@ -8,9 +8,17 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "chrome-gnome-shell" "enable" ] + [ "services" "gnome" "chrome-gnome-shell" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.chrome-gnome-shell.enable = mkEnableOption '' + services.gnome.chrome-gnome-shell.enable = mkEnableOption '' Chrome GNOME Shell native host connector, a DBus service allowing to install GNOME Shell extensions from a web browser. ''; @@ -18,7 +26,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.chrome-gnome-shell.enable { + config = mkIf config.services.gnome.chrome-gnome-shell.enable { environment.etc = { "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; diff --git a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix b/nixos/modules/services/desktops/gnome/evolution-data-server.nix similarity index 67% rename from nixos/modules/services/desktops/gnome3/evolution-data-server.nix rename to nixos/modules/services/desktops/gnome/evolution-data-server.nix index 749f12b86bc8..ef5ad797c278 100644 --- a/nixos/modules/services/desktops/gnome3/evolution-data-server.nix +++ b/nixos/modules/services/desktops/gnome/evolution-data-server.nix @@ -10,11 +10,23 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "evolution-data-server" "enable" ] + [ "services" "gnome" "evolution-data-server" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "evolution-data-server" "plugins" ] + [ "services" "gnome" "evolution-data-server" "plugins" ] + ) + ]; + ###### interface options = { - services.gnome3.evolution-data-server = { + services.gnome.evolution-data-server = { enable = mkEnableOption "Evolution Data Server, a collection of services for storing addressbooks and calendars."; plugins = mkOption { type = types.listOf types.package; @@ -38,10 +50,10 @@ with lib; config = let - bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome3.evolution-data-server) plugins; }; + bundle = pkgs.evolutionWithPlugins.override { inherit (config.services.gnome.evolution-data-server) plugins; }; in mkMerge [ - (mkIf config.services.gnome3.evolution-data-server.enable { + (mkIf config.services.gnome.evolution-data-server.enable { environment.systemPackages = [ bundle ]; services.dbus.packages = [ bundle ]; @@ -49,11 +61,11 @@ with lib; systemd.packages = [ bundle ]; }) (mkIf config.programs.evolution.enable { - services.gnome3.evolution-data-server = { + services.gnome.evolution-data-server = { enable = true; plugins = [ pkgs.evolution ] ++ config.programs.evolution.plugins; }; - services.gnome3.gnome-keyring.enable = true; + services.gnome.gnome-keyring.enable = true; }) ]; } diff --git a/nixos/modules/services/desktops/gnome3/glib-networking.nix b/nixos/modules/services/desktops/gnome/glib-networking.nix similarity index 61% rename from nixos/modules/services/desktops/gnome3/glib-networking.nix rename to nixos/modules/services/desktops/gnome/glib-networking.nix index 7e667b6b1f04..4288b6b5de61 100644 --- a/nixos/modules/services/desktops/gnome3/glib-networking.nix +++ b/nixos/modules/services/desktops/gnome/glib-networking.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "glib-networking" "enable" ] + [ "services" "gnome" "glib-networking" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.glib-networking = { + services.gnome.glib-networking = { enable = mkEnableOption "network extensions for GLib"; @@ -24,7 +32,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.glib-networking.enable { + config = mkIf config.services.gnome.glib-networking.enable { services.dbus.packages = [ pkgs.glib-networking ]; diff --git a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix similarity index 83% rename from nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix rename to nixos/modules/services/desktops/gnome/gnome-initial-setup.nix index c391ad9694c9..9e9771cf5415 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-initial-setup.nix +++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix @@ -48,11 +48,19 @@ in maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-initial-setup" "enable" ] + [ "services" "gnome" "gnome-initial-setup" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-initial-setup = { + services.gnome.gnome-initial-setup = { enable = mkEnableOption "GNOME Initial Setup, a Simple, easy, and safe way to prepare a new system"; @@ -63,16 +71,16 @@ in ###### implementation - config = mkIf config.services.gnome3.gnome-initial-setup.enable { + config = mkIf config.services.gnome.gnome-initial-setup.enable { environment.systemPackages = [ - pkgs.gnome3.gnome-initial-setup + pkgs.gnome.gnome-initial-setup ] ++ optional (versionOlder config.system.stateVersion "20.03") createGisStampFilesAutostart ; systemd.packages = [ - pkgs.gnome3.gnome-initial-setup + pkgs.gnome.gnome-initial-setup ]; systemd.user.targets."gnome-session".wants = [ diff --git a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix b/nixos/modules/services/desktops/gnome/gnome-keyring.nix similarity index 55% rename from nixos/modules/services/desktops/gnome3/gnome-keyring.nix rename to nixos/modules/services/desktops/gnome/gnome-keyring.nix index 2916a3c82b34..cda44bab8bfa 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-keyring.nix +++ b/nixos/modules/services/desktops/gnome/gnome-keyring.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-keyring" "enable" ] + [ "services" "gnome" "gnome-keyring" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-keyring = { + services.gnome.gnome-keyring = { enable = mkOption { type = types.bool; @@ -33,18 +41,18 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-keyring.enable { + config = mkIf config.services.gnome.gnome-keyring.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-keyring ]; + environment.systemPackages = [ pkgs.gnome.gnome-keyring ]; - services.dbus.packages = [ pkgs.gnome3.gnome-keyring pkgs.gcr ]; + services.dbus.packages = [ pkgs.gnome.gnome-keyring pkgs.gcr ]; - xdg.portal.extraPortals = [ pkgs.gnome3.gnome-keyring ]; + xdg.portal.extraPortals = [ pkgs.gnome.gnome-keyring ]; security.pam.services.login.enableGnomeKeyring = true; security.wrappers.gnome-keyring-daemon = { - source = "${pkgs.gnome3.gnome-keyring}/bin/gnome-keyring-daemon"; + source = "${pkgs.gnome.gnome-keyring}/bin/gnome-keyring-daemon"; capabilities = "cap_ipc_lock=ep"; }; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix similarity index 66% rename from nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix rename to nixos/modules/services/desktops/gnome/gnome-online-accounts.nix index 3f9ced5e86b1..01f7e3695cf0 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-accounts.nix +++ b/nixos/modules/services/desktops/gnome/gnome-online-accounts.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-online-accounts" "enable" ] + [ "services" "gnome" "gnome-online-accounts" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-online-accounts = { + services.gnome.gnome-online-accounts = { enable = mkOption { type = types.bool; @@ -32,7 +40,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-online-accounts.enable { + config = mkIf config.services.gnome.gnome-online-accounts.enable { environment.systemPackages = [ pkgs.gnome-online-accounts ]; diff --git a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix b/nixos/modules/services/desktops/gnome/gnome-online-miners.nix similarity index 50% rename from nixos/modules/services/desktops/gnome3/gnome-online-miners.nix rename to nixos/modules/services/desktops/gnome/gnome-online-miners.nix index 39d669e8b30f..5f9039f68c4e 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-online-miners.nix +++ b/nixos/modules/services/desktops/gnome/gnome-online-miners.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-online-miners" "enable" ] + [ "services" "gnome" "gnome-online-miners" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-online-miners = { + services.gnome.gnome-online-miners = { enable = mkOption { type = types.bool; @@ -32,11 +40,11 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-online-miners.enable { + config = mkIf config.services.gnome.gnome-online-miners.enable { - environment.systemPackages = [ pkgs.gnome3.gnome-online-miners ]; + environment.systemPackages = [ pkgs.gnome.gnome-online-miners ]; - services.dbus.packages = [ pkgs.gnome3.gnome-online-miners ]; + services.dbus.packages = [ pkgs.gnome.gnome-online-miners ]; }; diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix new file mode 100644 index 000000000000..b5573d2fc21b --- /dev/null +++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -0,0 +1,32 @@ +# Remote desktop daemon using Pipewire. +{ config, lib, pkgs, ... }: + +with lib; + +{ + meta = { + maintainers = teams.gnome.members; + }; + + # Added 2021-05-07 + imports = [ + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-remote-desktop" "enable" ] + [ "services" "gnome" "gnome-remote-desktop" "enable" ] + ) + ]; + + ###### interface + options = { + services.gnome.gnome-remote-desktop = { + enable = mkEnableOption "Remote Desktop support using Pipewire"; + }; + }; + + ###### implementation + config = mkIf config.services.gnome.gnome-remote-desktop.enable { + services.pipewire.enable = true; + + systemd.packages = [ pkgs.gnome.gnome-remote-desktop ]; + }; +} diff --git a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix similarity index 74% rename from nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix rename to nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix index 1c33ed064a19..05b5c86ddcb3 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix +++ b/nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix @@ -6,7 +6,7 @@ with lib; let - cfg = config.services.gnome3.gnome-settings-daemon; + cfg = config.services.gnome.gnome-settings-daemon; in @@ -20,13 +20,19 @@ in (mkRemovedOptionModule ["services" "gnome3" "gnome-settings-daemon" "package"] "") + + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-settings-daemon" "enable" ] + [ "services" "gnome" "gnome-settings-daemon" "enable" ] + ) ]; ###### interface options = { - services.gnome3.gnome-settings-daemon = { + services.gnome.gnome-settings-daemon = { enable = mkEnableOption "GNOME Settings Daemon"; @@ -40,15 +46,15 @@ in config = mkIf cfg.enable { environment.systemPackages = [ - pkgs.gnome3.gnome-settings-daemon + pkgs.gnome.gnome-settings-daemon ]; services.udev.packages = [ - pkgs.gnome3.gnome-settings-daemon + pkgs.gnome.gnome-settings-daemon ]; systemd.packages = [ - pkgs.gnome3.gnome-settings-daemon + pkgs.gnome.gnome-settings-daemon ]; systemd.user.targets."gnome-session-initialized".wants = [ diff --git a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix b/nixos/modules/services/desktops/gnome/gnome-user-share.nix similarity index 51% rename from nixos/modules/services/desktops/gnome3/gnome-user-share.nix rename to nixos/modules/services/desktops/gnome/gnome-user-share.nix index f2fe8b41a9e2..38256af309cc 100644 --- a/nixos/modules/services/desktops/gnome3/gnome-user-share.nix +++ b/nixos/modules/services/desktops/gnome/gnome-user-share.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "gnome-user-share" "enable" ] + [ "services" "gnome" "gnome-user-share" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.gnome-user-share = { + services.gnome.gnome-user-share = { enable = mkEnableOption "GNOME User Share, a user-level file sharing service for GNOME"; @@ -25,14 +33,14 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.gnome-user-share.enable { + config = mkIf config.services.gnome.gnome-user-share.enable { environment.systemPackages = [ - pkgs.gnome3.gnome-user-share + pkgs.gnome.gnome-user-share ]; systemd.packages = [ - pkgs.gnome3.gnome-user-share + pkgs.gnome.gnome-user-share ]; }; diff --git a/nixos/modules/services/desktops/gnome3/rygel.nix b/nixos/modules/services/desktops/gnome/rygel.nix similarity index 53% rename from nixos/modules/services/desktops/gnome3/rygel.nix rename to nixos/modules/services/desktops/gnome/rygel.nix index 917a1d6541e0..7ea9778fc408 100644 --- a/nixos/modules/services/desktops/gnome3/rygel.nix +++ b/nixos/modules/services/desktops/gnome/rygel.nix @@ -8,9 +8,17 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "rygel" "enable" ] + [ "services" "gnome" "rygel" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.rygel = { + services.gnome.rygel = { enable = mkOption { default = false; description = '' @@ -24,13 +32,13 @@ with lib; }; ###### implementation - config = mkIf config.services.gnome3.rygel.enable { - environment.systemPackages = [ pkgs.gnome3.rygel ]; + config = mkIf config.services.gnome.rygel.enable { + environment.systemPackages = [ pkgs.gnome.rygel ]; - services.dbus.packages = [ pkgs.gnome3.rygel ]; + services.dbus.packages = [ pkgs.gnome.rygel ]; - systemd.packages = [ pkgs.gnome3.rygel ]; + systemd.packages = [ pkgs.gnome.rygel ]; - environment.etc."rygel.conf".source = "${pkgs.gnome3.rygel}/etc/rygel.conf"; + environment.etc."rygel.conf".source = "${pkgs.gnome.rygel}/etc/rygel.conf"; }; } diff --git a/nixos/modules/services/desktops/gnome3/sushi.nix b/nixos/modules/services/desktops/gnome/sushi.nix similarity index 52% rename from nixos/modules/services/desktops/gnome3/sushi.nix rename to nixos/modules/services/desktops/gnome/sushi.nix index 83b17365d5dd..3133a3a0d985 100644 --- a/nixos/modules/services/desktops/gnome3/sushi.nix +++ b/nixos/modules/services/desktops/gnome/sushi.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "sushi" "enable" ] + [ "services" "gnome" "sushi" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.sushi = { + services.gnome.sushi = { enable = mkOption { type = types.bool; @@ -31,11 +39,11 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.sushi.enable { + config = mkIf config.services.gnome.sushi.enable { - environment.systemPackages = [ pkgs.gnome3.sushi ]; + environment.systemPackages = [ pkgs.gnome.sushi ]; - services.dbus.packages = [ pkgs.gnome3.sushi ]; + services.dbus.packages = [ pkgs.gnome.sushi ]; }; diff --git a/nixos/modules/services/desktops/gnome3/tracker-miners.nix b/nixos/modules/services/desktops/gnome/tracker-miners.nix similarity index 68% rename from nixos/modules/services/desktops/gnome3/tracker-miners.nix rename to nixos/modules/services/desktops/gnome/tracker-miners.nix index f2af40249271..c9101f0caa63 100644 --- a/nixos/modules/services/desktops/gnome3/tracker-miners.nix +++ b/nixos/modules/services/desktops/gnome/tracker-miners.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "tracker-miners" "enable" ] + [ "services" "gnome" "tracker-miners" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.tracker-miners = { + services.gnome.tracker-miners = { enable = mkOption { type = types.bool; @@ -31,7 +39,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.tracker-miners.enable { + config = mkIf config.services.gnome.tracker-miners.enable { environment.systemPackages = [ pkgs.tracker-miners ]; diff --git a/nixos/modules/services/desktops/gnome3/tracker.nix b/nixos/modules/services/desktops/gnome/tracker.nix similarity index 69% rename from nixos/modules/services/desktops/gnome3/tracker.nix rename to nixos/modules/services/desktops/gnome/tracker.nix index cd196e385539..29d9662b0b8f 100644 --- a/nixos/modules/services/desktops/gnome3/tracker.nix +++ b/nixos/modules/services/desktops/gnome/tracker.nix @@ -10,11 +10,19 @@ with lib; maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "tracker" "enable" ] + [ "services" "gnome" "tracker" "enable" ] + ) + ]; + ###### interface options = { - services.gnome3.tracker = { + services.gnome.tracker = { enable = mkOption { type = types.bool; @@ -32,7 +40,7 @@ with lib; ###### implementation - config = mkIf config.services.gnome3.tracker.enable { + config = mkIf config.services.gnome.tracker.enable { environment.systemPackages = [ pkgs.tracker ]; diff --git a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix deleted file mode 100644 index 164a0a44f8c8..000000000000 --- a/nixos/modules/services/desktops/gnome3/gnome-remote-desktop.nix +++ /dev/null @@ -1,24 +0,0 @@ -# Remote desktop daemon using Pipewire. -{ config, lib, pkgs, ... }: - -with lib; - -{ - meta = { - maintainers = teams.gnome.members; - }; - - ###### interface - options = { - services.gnome3.gnome-remote-desktop = { - enable = mkEnableOption "Remote Desktop support using Pipewire"; - }; - }; - - ###### implementation - config = mkIf config.services.gnome3.gnome-remote-desktop.enable { - services.pipewire.enable = true; - - systemd.packages = [ pkgs.gnome3.gnome-remote-desktop ]; - }; -} diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 250ea6d4575f..966a4d38662b 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -34,7 +34,7 @@ in # gvfs can be built with multiple configurations package = mkOption { type = types.package; - default = pkgs.gnome3.gvfs; + default = pkgs.gnome.gvfs; description = "Which GVfs package to use."; }; diff --git a/nixos/modules/services/desktops/telepathy.nix b/nixos/modules/services/desktops/telepathy.nix index 8c50d860e5bb..b5f6a5fcbcfd 100644 --- a/nixos/modules/services/desktops/telepathy.nix +++ b/nixos/modules/services/desktops/telepathy.nix @@ -39,7 +39,7 @@ with lib; services.dbus.packages = [ pkgs.telepathy-mission-control ]; # Enable runtime optional telepathy in gnome-shell - services.xserver.desktopManager.gnome3.sessionPath = with pkgs; [ + services.xserver.desktopManager.gnome.sessionPath = with pkgs; [ telepathy-glib telepathy-logger ]; diff --git a/nixos/modules/services/desktops/tumbler.nix b/nixos/modules/services/desktops/tumbler.nix index a09079517f04..8d9248cb9839 100644 --- a/nixos/modules/services/desktops/tumbler.nix +++ b/nixos/modules/services/desktops/tumbler.nix @@ -19,7 +19,7 @@ in ]; meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; ###### interface diff --git a/nixos/modules/services/desktops/zeitgeist.nix b/nixos/modules/services/desktops/zeitgeist.nix index cf7dd5fe3a13..fb0218da3045 100644 --- a/nixos/modules/services/desktops/zeitgeist.nix +++ b/nixos/modules/services/desktops/zeitgeist.nix @@ -7,7 +7,7 @@ with lib; { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; ###### interface diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index a71c635c9f6e..47a7152f6fe6 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -64,7 +64,7 @@ in { type = types.str; default = "root"; example = "wheel"; - description = "Group to grant acces to the Yggdrasil control socket."; + description = "Group to grant access to the Yggdrasil control socket."; }; openMulticastPort = mkOption { @@ -122,12 +122,11 @@ in { system.activationScripts.yggdrasil = mkIf cfg.persistentKeys '' if [ ! -e ${keysPath} ] then - mkdir -p ${builtins.dirOf keysPath} + mkdir --mode=700 -p ${builtins.dirOf keysPath} ${binYggdrasil} -genconf -json \ | ${pkgs.jq}/bin/jq \ 'to_entries|map(select(.key|endswith("Key")))|from_entries' \ > ${keysPath} - chmod 600 ${keysPath} fi ''; diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index 14dcf009a7d1..43220e3c5952 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -26,7 +26,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome3.gpaste ]"; + example = literalExample "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -94,8 +94,8 @@ in xapps ]; services.cinnamon.apps.enable = mkDefault true; - services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-keyring.enable = true; + services.gnome.glib-networking.enable = true; + services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; services.udisks2.enable = true; services.upower.enable = mkDefault config.powerManagement.enable; @@ -110,7 +110,7 @@ in programs.dconf.enable = true; # Enable org.a11y.Bus - services.gnome3.at-spi2-core.enable = true; + services.gnome.at-spi2-core.enable = true; # Fix lockscreen security.pam.services = { @@ -135,19 +135,19 @@ in # session requirements cinnamon-screensaver # cinnamon-killer-daemon: provided by cinnamon-common - gnome3.networkmanagerapplet # session requirement - also nm-applet not needed + gnome.networkmanagerapplet # session requirement - also nm-applet not needed # packages nemo cinnamon-control-center cinnamon-settings-daemon - gnome3.libgnomekbd + gnome.libgnomekbd orca # theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme hicolor-icon-theme - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gtk3.out mint-artwork mint-themes @@ -192,7 +192,7 @@ in programs.evince.enable = mkDefault true; programs.file-roller.enable = mkDefault true; - environment.systemPackages = (with pkgs // pkgs.gnome3 // pkgs.cinnamon; pkgs.gnome3.removePackagesByName [ + environment.systemPackages = (with pkgs // pkgs.gnome // pkgs.cinnamon; pkgs.gnome.removePackagesByName [ # cinnamon team apps blueberry warpinator diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index f5559eb53541..6ee5b0fc54f7 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if Plasma 5 is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./plasma5.nix ./lumina.nix - ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix + ./lxqt.nix ./enlightenment.nix ./gnome.nix ./kodi.nix ./mate.nix ./pantheon.nix ./surf-display.nix ./cde.nix ./cinnamon.nix ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome.nix similarity index 72% rename from nixos/modules/services/x11/desktop-managers/gnome3.nix rename to nixos/modules/services/x11/desktop-managers/gnome.nix index 81203c7622af..d61d6ce50da5 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome.nix @@ -4,8 +4,8 @@ with lib; let - cfg = config.services.xserver.desktopManager.gnome3; - serviceCfg = config.services.gnome3; + cfg = config.services.xserver.desktopManager.gnome; + serviceCfg = config.services.gnome; # Prioritize nautilus by default when opening directories mimeAppsList = pkgs.writeTextFile { @@ -23,7 +23,7 @@ let ''; nixos-gsettings-desktop-schemas = let - defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome3.gnome-shell ]; + defaultPackages = with pkgs; [ gsettings-desktop-schemas gnome.gnome-shell ]; in pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' @@ -33,10 +33,10 @@ let (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") (defaultPackages ++ cfg.extraGSettingsOverridePackages)} - cp -f ${pkgs.gnome3.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -f ${pkgs.gnome.gnome-shell}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${optionalString flashbackEnabled '' - cp -f ${pkgs.gnome3.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -f ${pkgs.gnome.gnome-flashback}/share/gsettings-schemas/*/glib-2.0/schemas/*.gschema.override $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ''} chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides @@ -57,7 +57,7 @@ let flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0; - notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome3.excludePackages)); + notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages)); in @@ -67,9 +67,69 @@ in maintainers = teams.gnome.members; }; + imports = [ + # Added 2021-05-07 + (mkRenamedOptionModule + [ "services" "gnome3" "core-os-services" "enable" ] + [ "services" "gnome" "core-os-services" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "core-shell" "enable" ] + [ "services" "gnome" "core-shell" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "core-utilities" "enable" ] + [ "services" "gnome" "core-utilities" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "core-developer-tools" "enable" ] + [ "services" "gnome" "core-developer-tools" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "games" "enable" ] + [ "services" "gnome" "games" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "gnome3" "experimental-features" "realtime-scheduling" ] + [ "services" "gnome" "experimental-features" "realtime-scheduling" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "enable" ] + [ "services" "xserver" "desktopManager" "gnome" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "sessionPath" ] + [ "services" "xserver" "desktopManager" "gnome" "sessionPath" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "favoriteAppsOverride" ] + [ "services" "xserver" "desktopManager" "gnome" "favoriteAppsOverride" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverrides" ] + [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverrides" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "extraGSettingsOverridePackages" ] + [ "services" "xserver" "desktopManager" "gnome" "extraGSettingsOverridePackages" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "debug" ] + [ "services" "xserver" "desktopManager" "gnome" "debug" ] + ) + (mkRenamedOptionModule + [ "services" "xserver" "desktopManager" "gnome3" "flashback" ] + [ "services" "xserver" "desktopManager" "gnome" "flashback" ] + ) + (mkRenamedOptionModule + [ "environment" "gnome3" "excludePackages" ] + [ "environment" "gnome" "excludePackages" ] + ) + ]; + options = { - services.gnome3 = { + services.gnome = { core-os-services.enable = mkEnableOption "essential services for GNOME3"; core-shell.enable = mkEnableOption "GNOME Shell services"; core-utilities.enable = mkEnableOption "GNOME core utilities"; @@ -109,7 +169,7 @@ in }; }; - services.xserver.desktopManager.gnome3 = { + services.xserver.desktopManager.gnome = { enable = mkOption { type = types.bool; default = false; @@ -119,14 +179,14 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome3.gpaste ]"; + example = literalExample "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GNOME Shell extensions or GSettings-conditional autostart. Note that this should be a last resort; patching the package is preferred (see GPaste). ''; - apply = list: list ++ [ pkgs.gnome3.gnome-shell pkgs.gnome3.gnome-shell-extensions ]; + apply = list: list ++ [ pkgs.gnome.gnome-shell pkgs.gnome.gnome-shell-extensions ]; }; favoriteAppsOverride = mkOption { @@ -185,9 +245,9 @@ in }; }; - environment.gnome3.excludePackages = mkOption { + environment.gnome.excludePackages = mkOption { default = []; - example = literalExample "[ pkgs.gnome3.totem ]"; + example = literalExample "[ pkgs.gnome.totem ]"; type = types.listOf types.package; description = "Which packages gnome should exclude from the default environment"; }; @@ -200,14 +260,14 @@ in system.nixos-generate-config.desktopConfiguration = ['' # Enable the GNOME 3 Desktop Environment. services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome.enable = true; '']; - services.gnome3.core-os-services.enable = true; - services.gnome3.core-shell.enable = true; - services.gnome3.core-utilities.enable = mkDefault true; + services.gnome.core-os-services.enable = true; + services.gnome.core-shell.enable = true; + services.gnome.core-utilities.enable = mkDefault true; - services.xserver.displayManager.sessionPackages = [ pkgs.gnome3.gnome-session.sessions ]; + services.xserver.displayManager.sessionPackages = [ pkgs.gnome.gnome-session.sessions ]; environment.extraInit = '' ${concatMapStrings (p: '' @@ -229,30 +289,30 @@ in # Override GSettings schemas environment.sessionVariables.NIX_GSETTINGS_OVERRIDES_DIR = "${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas"; - # If gnome3 is installed, build vim for gtk3 too. + # If gnome is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; # Install gnome-software if flatpak is enabled services.flatpak.guiPackages = [ - pkgs.gnome3.gnome-software + pkgs.gnome.gnome-software ]; }) (mkIf flashbackEnabled { services.xserver.displayManager.sessionPackages = map - (wm: pkgs.gnome3.gnome-flashback.mkSessionForWm { + (wm: pkgs.gnome.gnome-flashback.mkSessionForWm { inherit (wm) wmName wmLabel wmCommand; }) (optional cfg.flashback.enableMetacity { wmName = "metacity"; wmLabel = "Metacity"; - wmCommand = "${pkgs.gnome3.metacity}/bin/metacity"; + wmCommand = "${pkgs.gnome.metacity}/bin/metacity"; } ++ cfg.flashback.customSessions); security.pam.services.gnome-flashback = { enableGnomeKeyring = true; }; - systemd.packages = with pkgs.gnome3; [ + systemd.packages = with pkgs.gnome; [ gnome-flashback ] ++ (map (wm: gnome-flashback.mkSystemdTargetForWm { @@ -260,9 +320,9 @@ in }) cfg.flashback.customSessions); # gnome-panel needs these for menu applet - environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome3.gnome-flashback}/share" ]; + environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ]; # TODO: switch to sessionVariables (resolve conflict) - environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome3.gnome-flashback}/etc/xdg" ]; + environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ]; }) (mkIf serviceCfg.core-os-services.enable { @@ -274,13 +334,13 @@ in services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.power-profiles-daemon.enable = mkDefault true; - services.gnome3.at-spi2-core.enable = true; - services.gnome3.evolution-data-server.enable = true; - services.gnome3.gnome-keyring.enable = true; - services.gnome3.gnome-online-accounts.enable = mkDefault true; - services.gnome3.gnome-online-miners.enable = true; - services.gnome3.tracker-miners.enable = mkDefault true; - services.gnome3.tracker.enable = mkDefault true; + services.gnome.at-spi2-core.enable = true; + 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; services.packagekit.enable = mkDefault true; services.udisks2.enable = true; @@ -308,23 +368,23 @@ in (mkIf serviceCfg.core-shell.enable { services.colord.enable = mkDefault true; - services.gnome3.chrome-gnome-shell.enable = mkDefault true; - services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-initial-setup.enable = mkDefault true; - services.gnome3.gnome-remote-desktop.enable = mkDefault true; - services.gnome3.gnome-settings-daemon.enable = true; - services.gnome3.gnome-user-share.enable = mkDefault true; - services.gnome3.rygel.enable = mkDefault true; + services.gnome.chrome-gnome-shell.enable = mkDefault true; + services.gnome.glib-networking.enable = true; + services.gnome.gnome-initial-setup.enable = mkDefault true; + services.gnome.gnome-remote-desktop.enable = mkDefault true; + services.gnome.gnome-settings-daemon.enable = true; + services.gnome.gnome-user-share.enable = mkDefault true; + services.gnome.rygel.enable = mkDefault true; services.gvfs.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.telepathy.enable = mkDefault true; - systemd.packages = with pkgs.gnome3; [ + systemd.packages = with pkgs.gnome; [ gnome-session gnome-shell ]; - services.udev.packages = with pkgs.gnome3; [ + services.udev.packages = with pkgs.gnome; [ # Force enable KMS modifiers for devices that require them. # https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1443 mutter @@ -333,7 +393,7 @@ in services.avahi.enable = mkDefault true; xdg.portal.extraPortals = [ - pkgs.gnome3.gnome-shell + pkgs.gnome.gnome-shell ]; services.geoclue2.enable = mkDefault true; @@ -360,7 +420,7 @@ in ]; # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst - environment.systemPackages = with pkgs.gnome3; [ + environment.systemPackages = with pkgs.gnome; [ adwaita-icon-theme gnome-backgrounds gnome-bluetooth @@ -386,12 +446,12 @@ in # Enable soft realtime scheduling, only supported on wayland (mkIf serviceCfg.experimental-features.realtime-scheduling { security.wrappers.".gnome-shell-wrapped" = { - source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped"; + source = "${pkgs.gnome.gnome-shell}/bin/.gnome-shell-wrapped"; capabilities = "cap_sys_nice=ep"; }; systemd.user.services.gnome-shell-wayland = let - gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} '' + gnomeShellRT = with pkgs.gnome; pkgs.runCommand "gnome-shell-rt" {} '' mkdir -p $out/bin/ cp ${gnome-shell}/bin/gnome-shell $out/bin sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell @@ -406,7 +466,7 @@ in # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-utilities.bst (mkIf serviceCfg.core-utilities.enable { - environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ + environment.systemPackages = (with pkgs.gnome; removePackagesByName [ baobab cheese eog @@ -430,19 +490,19 @@ in simple-scan totem yelp - ] config.environment.gnome3.excludePackages); + ] config.environment.gnome.excludePackages); # Enable default program modules # Since some of these have a corresponding package, we only # enable that program module if the package hasn't been excluded - # through `environment.gnome3.excludePackages` - programs.evince.enable = notExcluded pkgs.gnome3.evince; - programs.file-roller.enable = notExcluded pkgs.gnome3.file-roller; - programs.geary.enable = notExcluded pkgs.gnome3.geary; - programs.gnome-disks.enable = notExcluded pkgs.gnome3.gnome-disk-utility; - programs.gnome-terminal.enable = notExcluded pkgs.gnome3.gnome-terminal; - programs.seahorse.enable = notExcluded pkgs.gnome3.seahorse; - services.gnome3.sushi.enable = notExcluded pkgs.gnome3.sushi; + # through `environment.gnome.excludePackages` + programs.evince.enable = notExcluded pkgs.gnome.evince; + programs.file-roller.enable = notExcluded pkgs.gnome.file-roller; + programs.geary.enable = notExcluded pkgs.gnome.geary; + programs.gnome-disks.enable = notExcluded pkgs.gnome.gnome-disk-utility; + programs.gnome-terminal.enable = notExcluded pkgs.gnome.gnome-terminal; + programs.seahorse.enable = notExcluded pkgs.gnome.seahorse; + services.gnome.sushi.enable = notExcluded pkgs.gnome.sushi; # Let nautilus find extensions # TODO: Create nautilus-with-extensions package @@ -457,7 +517,7 @@ in }) (mkIf serviceCfg.games.enable { - environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ + environment.systemPackages = (with pkgs.gnome; removePackagesByName [ aisleriot atomix five-or-more @@ -477,12 +537,12 @@ in quadrapassel swell-foop tali - ] config.environment.gnome3.excludePackages); + ] config.environment.gnome.excludePackages); }) # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/3.38.0/elements/core/meta-gnome-core-developer-tools.bst (mkIf serviceCfg.core-developer-tools.enable { - environment.systemPackages = (with pkgs.gnome3; removePackagesByName [ + environment.systemPackages = (with pkgs.gnome; removePackagesByName [ dconf-editor devhelp pkgs.gnome-builder @@ -491,7 +551,7 @@ in # in default configurations. # https://github.com/NixOS/nixpkgs/issues/60908 /* gnome-boxes */ - ] config.environment.gnome3.excludePackages); + ] config.environment.gnome.excludePackages); services.sysprof.enable = true; }) diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix index bf53082b267d..7cb92030bb19 100644 --- a/nixos/modules/services/x11/desktop-managers/lxqt.nix +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -51,7 +51,7 @@ in environment.systemPackages = pkgs.lxqt.preRequisitePackages ++ pkgs.lxqt.corePackages ++ - (pkgs.gnome3.removePackagesByName + (pkgs.gnome.removePackagesByName pkgs.lxqt.optionalPackages config.environment.lxqt.excludePackages); diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index f236c14fcf3e..19ab9edb7324 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -76,7 +76,7 @@ in environment.systemPackages = pkgs.mate.basePackages ++ - (pkgs.gnome3.removePackagesByName + (pkgs.gnome.removePackagesByName pkgs.mate.extraPackages config.environment.mate.excludePackages) ++ [ @@ -97,8 +97,8 @@ in # Mate uses this for printing programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); - services.gnome3.at-spi2-core.enable = true; - services.gnome3.gnome-keyring.enable = true; + services.gnome.at-spi2-core.enable = true; + services.gnome.gnome-keyring.enable = true; services.udev.packages = [ pkgs.mate.mate-settings-daemon ]; services.gvfs.enable = true; services.upower.enable = config.powerManagement.enable; diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 195da75e7443..e492073b80ff 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -43,7 +43,7 @@ in sessionPath = mkOption { default = []; type = types.listOf types.package; - example = literalExample "[ pkgs.gnome3.gpaste ]"; + example = literalExample "[ pkgs.gnome.gpaste ]"; description = '' Additional list of packages to be added to the session search path. Useful for GSettings-conditional autostart. @@ -142,12 +142,12 @@ in ]; services.pantheon.apps.enable = mkDefault true; services.pantheon.contractor.enable = mkDefault true; - services.gnome3.at-spi2-core.enable = true; - services.gnome3.evolution-data-server.enable = true; - services.gnome3.glib-networking.enable = true; - services.gnome3.gnome-keyring.enable = true; + services.gnome.at-spi2-core.enable = true; + services.gnome.evolution-data-server.enable = true; + services.gnome.glib-networking.enable = true; + services.gnome.gnome-keyring.enable = true; services.gvfs.enable = true; - services.gnome3.rygel.enable = mkDefault true; + services.gnome.rygel.enable = mkDefault true; services.gsignond.enable = mkDefault true; services.gsignond.plugins = with pkgs.gsignondPlugins; [ lastfm mail oauth ]; services.udisks2.enable = true; @@ -177,7 +177,7 @@ in desktop-file-utils glib gnome-menus - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3.out hicolor-icon-theme lightlocker @@ -213,10 +213,10 @@ in elementary-settings-daemon pantheon-agent-geoclue2 pantheon-agent-polkit - ]) ++ (gnome3.removePackagesByName [ - gnome3.geary - gnome3.epiphany - gnome3.gnome-font-viewer + ]) ++ (gnome.removePackagesByName [ + gnome.geary + gnome.epiphany + gnome.gnome-font-viewer ] config.environment.pantheon.excludePackages); programs.evince.enable = mkDefault true; @@ -265,7 +265,7 @@ in }) (mkIf serviceCfg.apps.enable { - environment.systemPackages = (with pkgs.pantheon; pkgs.gnome3.removePackagesByName [ + environment.systemPackages = (with pkgs.pantheon; pkgs.gnome.removePackagesByName [ elementary-calculator elementary-calendar elementary-camera diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 7d2856939c80..bbfdea2225b5 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -9,7 +9,7 @@ in { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; imports = [ @@ -74,8 +74,8 @@ in glib # for gsettings gtk3.out # gtk-update-icon-cache - gnome3.gnome-themes-extra - gnome3.adwaita-icon-theme + gnome.gnome-themes-extra + gnome.adwaita-icon-theme hicolor-icon-theme tango-icon-theme xfce4-icon-theme @@ -149,7 +149,7 @@ in security.polkit.enable = true; services.accounts-daemon.enable = true; services.upower.enable = config.powerManagement.enable; - services.gnome3.glib-networking.enable = true; + services.gnome.glib-networking.enable = true; services.gvfs.enable = true; services.tumbler.enable = true; services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); diff --git a/nixos/modules/services/x11/display-managers/account-service-util.nix b/nixos/modules/services/x11/display-managers/account-service-util.nix index 2b08c62d0ad1..dec5c06cb3ca 100644 --- a/nixos/modules/services/x11/display-managers/account-service-util.nix +++ b/nixos/modules/services/x11/display-managers/account-service-util.nix @@ -39,6 +39,6 @@ python3.pkgs.buildPythonApplication { ''; meta = with lib; { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index a214e91cfd35..e1b9a21eb9f0 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.xserver.displayManager; - gdm = pkgs.gnome3.gdm; + gdm = pkgs.gnome.gdm; xSessionWrapper = if (cfg.setupCommands == "") then null else pkgs.writeScript "gdm-x-session-wrapper" '' @@ -154,14 +154,14 @@ in ] ++ optionals config.hardware.pulseaudio.enable [ "d /run/gdm/.config/pulse 0711 gdm gdm" "L+ /run/gdm/.config/pulse/${pulseConfig.name} - - - - ${pulseConfig}" - ] ++ optionals config.services.gnome3.gnome-initial-setup.enable [ + ] ++ 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" ]; # Otherwise GDM will not be able to start correctly and display Wayland sessions - systemd.packages = with pkgs.gnome3; [ gdm gnome-session gnome-shell ]; - environment.systemPackages = [ pkgs.gnome3.adwaita-icon-theme ]; + systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; + environment.systemPackages = [ pkgs.gnome.adwaita-icon-theme ]; systemd.services.display-manager.wants = [ # Because sd_login_monitor_new requires /run/systemd/machines @@ -208,7 +208,7 @@ in EnvironmentFile = "-/etc/locale.conf"; }; - systemd.services.display-manager.path = [ pkgs.gnome3.gnome-session ]; + systemd.services.display-manager.path = [ pkgs.gnome.gnome-session ]; # Allow choosing an user account services.accounts-daemon.enable = true; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix index 129df139c61a..ecd46a9ee6d2 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix @@ -34,8 +34,8 @@ in { theme = { package = mkOption { type = types.package; - default = pkgs.gnome3.gnome-themes-extra; - defaultText = "pkgs.gnome3.gnome-themes-extra"; + default = pkgs.gnome.gnome-themes-extra; + defaultText = "pkgs.gnome.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 9c1dc1d1c12d..fe5a16bc60f1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -47,8 +47,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.gnome-themes-extra; - defaultText = "pkgs.gnome3.gnome-themes-extra"; + default = pkgs.gnome.gnome-themes-extra; + defaultText = "pkgs.gnome.gnome-themes-extra"; description = '' The package path that contains the theme given in the name option. ''; @@ -68,8 +68,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.adwaita-icon-theme; - defaultText = "pkgs.gnome3.adwaita-icon-theme"; + default = pkgs.gnome.adwaita-icon-theme; + defaultText = "pkgs.gnome.adwaita-icon-theme"; description = '' The package path that contains the icon theme given in the name option. ''; @@ -89,8 +89,8 @@ in package = mkOption { type = types.package; - default = pkgs.gnome3.adwaita-icon-theme; - defaultText = "pkgs.gnome3.adwaita-icon-theme"; + default = pkgs.gnome.adwaita-icon-theme; + defaultText = "pkgs.gnome.adwaita-icon-theme"; description = '' The package path that contains the cursor theme given in the name option. ''; diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix index 9bc9e2bf6162..76f16646cf5e 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/pantheon.nix @@ -11,7 +11,7 @@ let in { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; options = { diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 2dafee9e36e3..3d497c9f25ee 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -70,7 +70,7 @@ let in { meta = { - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; # Note: the order in which lightdm greeter modules are imported diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 5175fd7f3b1f..600afe759b2c 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) gnome3; + inherit (pkgs) gnome; in { @@ -18,12 +18,12 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - ${gnome3.metacity}/bin/metacity & + ${gnome.metacity}/bin/metacity & waitPID=$! ''; }; - environment.systemPackages = [ gnome3.metacity ]; + environment.systemPackages = [ gnome.metacity ]; }; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ea82adf09ad1..9358d223c01f 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -70,8 +70,8 @@ in rec { (onFullSupported "nixos.tests.firefox") (onFullSupported "nixos.tests.firewall") (onFullSupported "nixos.tests.fontconfig-default-fonts") - (onFullSupported "nixos.tests.gnome3") - (onFullSupported "nixos.tests.gnome3-xorg") + (onFullSupported "nixos.tests.gnome") + (onFullSupported "nixos.tests.gnome-xorg") (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") diff --git a/nixos/release.nix b/nixos/release.nix index 746e4c9dc69d..2ca3150e6801 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -323,10 +323,10 @@ in rec { services.xserver.desktopManager.xfce.enable = true; }); - gnome3 = makeClosure ({ ... }: + gnome = makeClosure ({ ... }: { services.xserver.enable = true; services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome.enable = true; }); pantheon = makeClosure ({ ... }: diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7bd9ef9f45ea..750a5ac76ef3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -139,8 +139,8 @@ in gitolite = handleTest ./gitolite.nix {}; gitolite-fcgiwrap = handleTest ./gitolite-fcgiwrap.nix {}; glusterfs = handleTest ./glusterfs.nix {}; - gnome3 = handleTest ./gnome3.nix {}; - gnome3-xorg = handleTest ./gnome3-xorg.nix {}; + gnome = handleTest ./gnome.nix {}; + gnome-xorg = handleTest ./gnome-xorg.nix {}; go-neb = handleTest ./go-neb.nix {}; gobgpd = handleTest ./gobgpd.nix {}; gocd-agent = handleTest ./gocd-agent.nix {}; diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix index 68c6ac9e9c83..58d0f6227cc7 100644 --- a/nixos/tests/fontconfig-default-fonts.nix +++ b/nixos/tests/fontconfig-default-fonts.nix @@ -4,7 +4,6 @@ import ./make-test-python.nix ({ lib, ... }: meta.maintainers = with lib.maintainers; [ jtojnar - worldofpeace ]; machine = { config, pkgs, ... }: { diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome-xorg.nix similarity index 94% rename from nixos/tests/gnome3-xorg.nix rename to nixos/tests/gnome-xorg.nix index 0d05c12384f3..55f9c90c20a0 100644 --- a/nixos/tests/gnome3-xorg.nix +++ b/nixos/tests/gnome-xorg.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { - name = "gnome3-xorg"; + name = "gnome-xorg"; meta = with lib; { maintainers = teams.gnome.members; }; @@ -21,8 +21,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; }; - services.xserver.desktopManager.gnome3.enable = true; - services.xserver.desktopManager.gnome3.debug = true; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.debug = true; services.xserver.displayManager.defaultSession = "gnome-xorg"; virtualisation.memorySize = 1024; diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome.nix similarity index 93% rename from nixos/tests/gnome3.nix rename to nixos/tests/gnome.nix index 7e301be49d10..e8d18a41bd06 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome.nix @@ -1,5 +1,5 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { - name = "gnome3"; + name = "gnome"; meta = with lib; { maintainers = teams.gnome.members; }; @@ -20,13 +20,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { }; }; - services.xserver.desktopManager.gnome3.enable = true; - services.xserver.desktopManager.gnome3.debug = true; + services.xserver.desktopManager.gnome.enable = true; + services.xserver.desktopManager.gnome.debug = true; environment.systemPackages = [ (pkgs.makeAutostartItem { name = "org.gnome.Terminal"; - package = pkgs.gnome3.gnome-terminal; + package = pkgs.gnome.gnome-terminal; }) ]; diff --git a/nixos/tests/installed-tests/gnome-photos.nix b/nixos/tests/installed-tests/gnome-photos.nix index 05e7ccb65ad5..bcb6479ee89c 100644 --- a/nixos/tests/installed-tests/gnome-photos.nix +++ b/nixos/tests/installed-tests/gnome-photos.nix @@ -7,7 +7,7 @@ makeInstalledTest { testConfig = { programs.dconf.enable = true; - services.gnome3.at-spi2-core.enable = true; # needed for dogtail + services.gnome.at-spi2-core.enable = true; # needed for dogtail environment.systemPackages = with pkgs; [ # gsettings tool with access to gsettings-desktop-schemas (stdenv.mkDerivation { diff --git a/nixos/tests/installed-tests/libgdata.nix b/nixos/tests/installed-tests/libgdata.nix index f11a7bc1bc51..b0d39c042be4 100644 --- a/nixos/tests/installed-tests/libgdata.nix +++ b/nixos/tests/installed-tests/libgdata.nix @@ -6,6 +6,6 @@ makeInstalledTest { testConfig = { # # GLib-GIO-DEBUG: _g_io_module_get_default: Found default implementation dummy (GDummyTlsBackend) for ‘gio-tls-backend’ # Bail out! libgdata:ERROR:../gdata/tests/common.c:134:gdata_test_init: assertion failed (child_error == NULL): TLS support is not available (g-tls-error-quark, 0) - services.gnome3.glib-networking.enable = true; + services.gnome.glib-networking.enable = true; }; } diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 9611bdbdafec..e98230ecb179 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "lightdm"; meta = with pkgs.lib.maintainers; { - maintainers = [ aszlig worldofpeace ]; + maintainers = [ aszlig ]; }; machine = { ... }: { diff --git a/nixos/tests/nixos-generate-config.nix b/nixos/tests/nixos-generate-config.nix index 7bf8d4da7b6d..1dadf4992ed0 100644 --- a/nixos/tests/nixos-generate-config.nix +++ b/nixos/tests/nixos-generate-config.nix @@ -14,7 +14,7 @@ import ./make-test-python.nix ({ lib, ... } : { system.nixos-generate-config.desktopConfiguration = ['' # DESKTOP services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome3.enable = true; + services.xserver.desktopManager.gnome.enable = true; '']; }; testScript = '' @@ -35,7 +35,7 @@ import ./make-test-python.nix ({ lib, ... } : { # Test if the Perl variable $desktopConfiguration is spliced correctly machine.succeed( - "grep 'services\\.xserver\\.desktopManager\\.gnome3\\.enable = true;' /etc/nixos/configuration.nix" + "grep 'services\\.xserver\\.desktopManager\\.gnome\\.enable = true;' /etc/nixos/configuration.nix" ) ''; }) diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 39a4234dbf73..ddd6a4c11946 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -9,7 +9,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { { imports = [ ./common/x11.nix ]; programs.plotinus.enable = true; - environment.systemPackages = [ pkgs.gnome3.gnome-calculator pkgs.xdotool ]; + environment.systemPackages = [ pkgs.gnome.gnome-calculator pkgs.xdotool ]; }; testScript = '' diff --git a/pkgs/applications/accessibility/mousetweaks/default.nix b/pkgs/applications/accessibility/mousetweaks/default.nix index 2ff36bb68333..9e18904ff659 100644 --- a/pkgs/applications/accessibility/mousetweaks/default.nix +++ b/pkgs/applications/accessibility/mousetweaks/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config -, glib, gtk3, gnome3, gsettings-desktop-schemas, wrapGAppsHook +, glib, gtk3, gnome, gsettings-desktop-schemas, wrapGAppsHook , libX11, libXtst, libXfixes, libXcursor }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/accessibility/squeekboard/default.nix b/pkgs/applications/accessibility/squeekboard/default.nix index 08042a7701b9..ec99666b6f42 100644 --- a/pkgs/applications/accessibility/squeekboard/default.nix +++ b/pkgs/applications/accessibility/squeekboard/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , wayland @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop wayland wayland-protocols libxml2 diff --git a/pkgs/applications/audio/cadence/default.nix b/pkgs/applications/audio/cadence/default.nix index 2d3ac0c314ea..62bf32eb71d0 100644 --- a/pkgs/applications/audio/cadence/default.nix +++ b/pkgs/applications/audio/cadence/default.nix @@ -98,7 +98,7 @@ mkDerivation rec { homepage = "https://github.com/falkTX/Cadence/"; description = "Collection of tools useful for audio production"; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ worldofpeace ]; + maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/cozy-audiobooks/default.nix b/pkgs/applications/audio/cozy-audiobooks/default.nix index bcad36e2da98..5eb71cbe04f3 100644 --- a/pkgs/applications/audio/cozy-audiobooks/default.nix +++ b/pkgs/applications/audio/cozy-audiobooks/default.nix @@ -12,7 +12,7 @@ , file , cairo , gettext -, gnome3 +, gnome }: python3Packages.buildPythonApplication rec { @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { gtk3 cairo gettext - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-good diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index 65c871640ef5..d55fd7ff0cb6 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, opusfile, flac, itstool, libxml2, gsettings-desktop-schemas -, gnome3, wrapGAppsHook +, gnome, wrapGAppsHook }: let @@ -19,13 +19,13 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ gtk3 glib libid3tag id3lib taglib libvorbis libogg opusfile flac - gsettings-desktop-schemas gnome3.adwaita-icon-theme + gsettings-desktop-schemas gnome.adwaita-icon-theme ]; doCheck = false; # fails 1 out of 9 tests passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 229050654cd5..681c6ffe2810 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages, intltool -, glibcLocales, gnome3, gtk3, wrapGAppsHook +, glibcLocales, gnome, gtk3, wrapGAppsHook , gobject-introspection }: @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; checkInputs = with python3Packages; [ diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix index f39558c1571d..61484bc2fbb1 100644 --- a/pkgs/applications/audio/gtkpod/default.nix +++ b/pkgs/applications/audio/gtkpod/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, intltool, libgpod, curl, flac, - gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl, + gnome, gtk3, gettext, perlPackages, flex, libid3tag, gdl, libvorbis, gdk-pixbuf }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl gettext flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf - gdl gnome3.adwaita-icon-theme gnome3.anjuta + gdl gnome.adwaita-icon-theme gnome.anjuta ] ++ (with perlPackages; [ perl XMLParser ]); patchPhase = '' diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 7f41fa6c5f95..ec8ba7a1d180 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -10,7 +10,7 @@ , glib , glib-networking , glibmm -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , gtkmm3 @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { glib glib-networking.out glibmm - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gtkmm3 diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index bb92682b141f..4bcda6c4d327 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub -, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome3 +, alsaLib, freetype, xorg, curl, libGL, libjack2, gnome , pkg-config, makeWrapper }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib freetype xorg.libX11 xorg.libXext xorg.libXinerama xorg.libXrandr - xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome3.zenity + xorg.libXcursor xorg.libXcomposite curl libGL libjack2 gnome.zenity ]; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin install -Dm755 build/Helio $out/bin - wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome3.zenity}/bin + wrapProgram $out/bin/Helio --prefix PATH ":" ${gnome.zenity}/bin mkdir -p $out/share cp -r ../Deployment/Linux/Debian/x64/usr/share/* $out/share diff --git a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix index 4409437ebf20..6e5cc0d51916 100644 --- a/pkgs/applications/audio/kapitonov-plugins-pack/default.nix +++ b/pkgs/applications/audio/kapitonov-plugins-pack/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, faust, meson, ninja, pkg-config -, boost, cairo, fftw, gnome3, ladspa-sdk, libxcb, lv2, xcbutilwm +, boost, cairo, fftw, gnome, ladspa-sdk, libxcb, lv2, xcbutilwm , zita-convolver, zita-resampler }: diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index 9ae05fb571b0..860a621847da 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -106,7 +106,7 @@ python3.pkgs.buildPythonApplication rec { description = "A modern music player for GNOME"; homepage = "https://wiki.gnome.org/Apps/Lollypop"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace lovesegfault ]; + maintainers = with maintainers; [ lovesegfault ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/applications/audio/miniaudicle/default.nix new file mode 100644 index 000000000000..9c49f26bb4ac --- /dev/null +++ b/pkgs/applications/audio/miniaudicle/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchurl +, bison +, flex +, which +, alsaLib +, libsndfile +, qt4 +, qscintilla +, libpulseaudio +, libjack2 +, audioBackend ? "pulse" # "pulse", "alsa", or "jack" +}: + +stdenv.mkDerivation rec { + pname = "miniaudicle"; + version = "1.3.5.2"; + + src = fetchurl { + url = "https://audicle.cs.princeton.edu/mini/release/files/miniAudicle-${version}.tgz"; + hash = "sha256-dakDz69uHbKZFj8z67CubmRXEQ5X6GuYqlCXXvLzqSI="; + }; + + sourceRoot = "miniAudicle-${version}/src"; + + postPatch = '' + substituteInPlace miniAudicle.pro \ + --replace "/usr/local" $out + ''; + + nativeBuildInputs = [ + bison + flex + which + ]; + + buildInputs = [ + alsaLib + libsndfile + qt4 + qscintilla + ] ++ lib.optional (audioBackend == "pulse") libpulseaudio + ++ lib.optional (audioBackend == "jack") libjack2; + + buildFlags = [ "linux-${audioBackend}" ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with lib; { + description = "A light-weight integrated development environment for the ChucK digital audio programming language"; + homepage = "https://audicle.cs.princeton.edu/mini/"; + downloadPage = "https://audicle.cs.princeton.edu/mini/linux/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.all; + broken = stdenv.isDarwin; # not attempted + }; +} diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 31d9292675e5..c7f12a8df6cc 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, lib, stdenv, pkg-config, intltool, libpulseaudio, -gtkmm3 , libcanberra-gtk3, gnome3, wrapGAppsHook }: +gtkmm3 , libcanberra-gtk3, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "pavucontrol"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { })]; buildInputs = [ libpulseaudio gtkmm3 libcanberra-gtk3 - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook ]; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 939b53c44fb1..01c969c3d8e0 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, meson, ninja, pkg-config, appstream-glib -, wrapGAppsHook, pythonPackages, gtk3, gnome3, gobject-introspection +, wrapGAppsHook, pythonPackages, gtk3, gnome, gobject-introspection , libnotify, libsecret, gst_all_1 }: pythonPackages.buildPythonApplication rec { @@ -23,7 +23,7 @@ pythonPackages.buildPythonApplication rec { nativeBuildInputs = [ meson ninja pkg-config appstream-glib wrapGAppsHook ]; propagatedBuildInputs = - [ gtk3 gobject-introspection libnotify libsecret gnome3.adwaita-icon-theme ] ++ + [ gtk3 gobject-introspection libnotify libsecret gnome.adwaita-icon-theme ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ (with pythonPackages; [ pygobject3 pylast ]); diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index 738bf161cd59..2a170b3ccfd8 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf, librsvg, +{ lib, stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome, gtk3, gdk-pixbuf, librsvg, tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection, hicolor-icon-theme, gst_all_1, withGstPlugins ? true, xineBackend ? false, xine-lib, @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { checkInputs = [ gdk-pixbuf hicolor-icon-theme ] ++ (with python3.pkgs; [ pytest pytest_xdist polib xvfb_run dbus.daemon glibcLocales ]); - buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] + buildInputs = [ gnome.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ] ++ (if xineBackend then [ xine-lib ] else with gst_all_1; [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]); diff --git a/pkgs/applications/audio/rhythmbox/default.nix b/pkgs/applications/audio/rhythmbox/default.nix index 173741484fd4..65499f58630e 100644 --- a/pkgs/applications/audio/rhythmbox/default.nix +++ b/pkgs/applications/audio/rhythmbox/default.nix @@ -6,7 +6,7 @@ , intltool , libpeas , libsoup -, gnome3 +, gnome , totem-pl-parser , tdb , json-glib @@ -42,7 +42,7 @@ in stdenv.mkDerivation rec { gtk3 libpeas totem-pl-parser - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index 153e52c82e17..702f5c3982a2 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , libjack2, libsndfile, xorg, freetype, libxkbcommon -, cairo, glib, gnome3, flac, libogg, libvorbis, libopus +, cairo, glib, gnome, flac, libogg, libvorbis, libopus , cmake, pkg-config }: @@ -35,14 +35,14 @@ stdenv.mkDerivation rec { libxkbcommon cairo glib - gnome3.zenity + gnome.zenity freetype ]; nativeBuildInputs = [ cmake pkg-config ]; postPatch = '' substituteInPlace editor/external/vstgui4/vstgui/lib/platform/linux/x11fileselector.cpp \ - --replace '"/usr/bin/zenity' '"${gnome3.zenity}/bin/zenity' + --replace '"/usr/bin/zenity' '"${gnome.zenity}/bin/zenity' ''; cmakeFlags = [ diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 83af7985dbe2..9eae394488e2 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, wrapGAppsHook, gettext -, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: +, python3Packages, gnome, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -24,7 +24,7 @@ in buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gtk3 gdk-pixbuf diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index ba51fc1af564..c03b48c436bf 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -10,7 +10,7 @@ , libxml2 , brasero , libcanberra-gtk3 -, gnome3 +, gnome , gst_all_1 , libmusicbrainz5 , libdiscid @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { gtk3 brasero libcanberra-gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas libmusicbrainz5 libdiscid @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 4014468eafe8..8656deb2f6aa 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,6 +1,6 @@ { fetchurl, lib, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype , glib, pango, cairo, atk, gdk-pixbuf, gtk3, cups, nspr, nss, libpng, libnotify -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome3 +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg, curl, zlib, gnome , at-spi2-atk, at-spi2-core, libpulseaudio, libdrm, mesa, libxkbcommon }: @@ -139,7 +139,7 @@ stdenv.mkDerivation { librarypath="${lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome3.zenity}/bin" + --prefix PATH : "${gnome.zenity}/bin" # fix Icon line in the desktop file (#48062) sed -i "s:^Icon=.*:Icon=spotify-client:" "$out/share/spotify/spotify.desktop" diff --git a/pkgs/applications/audio/vocal/default.nix b/pkgs/applications/audio/vocal/default.nix index 8c4493166749..b91a8e6d50c5 100644 --- a/pkgs/applications/audio/vocal/default.nix +++ b/pkgs/applications/audio/vocal/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/needle-and-thread/vocal"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index be9ba0f75616..7ca4da69d077 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -20,7 +20,7 @@ , polkit , accountsservice , gtk-doc -, gnome3 +, gnome , gobject-introspection , vala , fetchpatch @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { autoconf automake yelp-tools - gnome3.yelp-xsl + gnome.yelp-xsl gobject-introspection gtk-doc intltool @@ -142,6 +142,6 @@ stdenv.mkDerivation rec { description = "A cross-desktop display manager"; platforms = platforms.linux; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 9dafc055bcb0..851c3ea1c2f0 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, cmake , wrapGAppsHook, pkg-config, desktop-file-utils , appstream-glib, pythonPackages, glib, gobject-introspection -, gtk3, webkitgtk, glib-networking, gnome3, gspell, texlive +, gtk3, webkitgtk, glib-networking, gnome, gspell, texlive , shared-mime-info, libhandy }: @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { appstream-glib wrapGAppsHook ]; buildInputs = [ glib pythonEnv gobject-introspection gtk3 - gnome3.adwaita-icon-theme webkitgtk gspell texlive + gnome.adwaita-icon-theme webkitgtk gspell texlive glib-networking libhandy ]; postPatch = '' diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 59d1f11312dc..3a5436d4f32d 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, wrapGAppsHook, pkg-config , gtk, libxml2 -, enchant, gucharmap, python3, gnome3 +, enchant, gucharmap, python3, gnome }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ intltool pkg-config wrapGAppsHook ]; - buildInputs = [ gnome3.adwaita-icon-theme gtk libxml2 + buildInputs = [ gnome.adwaita-icon-theme gtk libxml2 enchant gucharmap python3 ]; meta = with lib; { diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 50f299010426..0279dfc5b372 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -6,7 +6,7 @@ , docbook_xml_dtd_43 , fetchurl , flatpak -, gnome3 +, gnome , libgit2-glib , gobject-introspection , glade @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { buildInputs = [ ctags flatpak - gnome3.devhelp + gnome.devhelp glade libgit2-glib libpeas @@ -134,7 +134,7 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/editors/gnome-latex/default.nix b/pkgs/applications/editors/gnome-latex/default.nix index 277863244a59..8fc6feecd57c 100644 --- a/pkgs/applications/editors/gnome-latex/default.nix +++ b/pkgs/applications/editors/gnome-latex/default.nix @@ -13,7 +13,7 @@ , libgee , tepl , amtk -, gnome3 +, gnome , glib , pkg-config , intltool @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { buildInputs = [ amtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme glib gsettings-desktop-schemas gspell @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index 27047f8e95a8..35e96c89dad5 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,6 +1,6 @@ { avahiSupport ? false # build support for Avahi in libinfinity , lib, stdenv, fetchFromGitHub, autoconf, automake, pkg-config, wrapGAppsHook, yelp-tools -, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome3 }: +, gtkmm3, gsasl, gtksourceview3, libxmlxx, libinfinity, intltool, itstool, gnome }: let libinf = libinfinity.override { gtkWidgets = true; inherit avahiSupport; }; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 0e4f182ea50f..02e5c7c0345a 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, makeDesktopItem, fetchurl, unzip -, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3 +, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome , xorg, mozjpeg, makeWrapper, wrapGAppsHook, libuuid, at-spi2-core, libdrm, mesa }: @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [makeWrapper wrapGAppsHook unzip]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; # src is producing multiple folder on unzip so we must # override unpackCmd to extract it into newly created folder diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 2ff712851b94..469437c6c952 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -2,7 +2,7 @@ , cairo, cmake, ninja, curl, perl, llvm, desktop-file-utils, exiv2, glib , ilmbase, gtk3, intltool, lcms2, lensfun, libX11, libexif, libgphoto2, libjpeg , libpng, librsvg, libtiff, openexr, osm-gps-map, pkg-config, sqlite, libxslt -, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome3 +, openjpeg, lua, pugixml, colord, colord-gtk, libwebp, libsecret, gnome , ocl-icd, pcre, gtk-mac-integration, isocodes, llvmPackages }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cairo curl exiv2 glib gtk3 ilmbase lcms2 lensfun libexif libgphoto2 libjpeg libpng librsvg libtiff openexr sqlite libxslt libsoup graphicsmagick json-glib openjpeg lua pugixml - libwebp libsecret gnome3.adwaita-icon-theme osm-gps-map pcre isocodes + libwebp libsecret gnome.adwaita-icon-theme osm-gps-map pcre isocodes ] ++ lib.optionals stdenv.isLinux [ colord colord-gtk libX11 ocl-icd ] ++ lib.optional stdenv.isDarwin gtk-mac-integration diff --git a/pkgs/applications/graphics/fondo/default.nix b/pkgs/applications/graphics/fondo/default.nix index 04ac87c55da9..34dd4926a49f 100644 --- a/pkgs/applications/graphics/fondo/default.nix +++ b/pkgs/applications/graphics/fondo/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Find the most beautiful wallpapers for your desktop"; homepage = "https://github.com/calo001/fondo"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix index bb81a374fea2..679e9136c44a 100644 --- a/pkgs/applications/graphics/gimp/wrapper.nix +++ b/pkgs/applications/graphics/gimp/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome3, plugins ? null}: +{ lib, symlinkJoin, gimp, makeWrapper, gimpPlugins, gnome, plugins ? null}: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); @@ -18,7 +18,7 @@ in symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \ --set GIMP2_DATADIR "$out/share/gimp/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done set +x diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index 33337739364e..c2ce2840379c 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, barcode, gnome3, autoreconfHook +{ lib, stdenv, fetchurl, barcode, gnome, autoreconfHook , gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkg-config, yelp-tools }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc yelp-tools - gnome3.gnome-common gsettings-desktop-schemas + gnome.gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix index daa540d31e50..361b2ba38b6e 100644 --- a/pkgs/applications/graphics/glimpse/wrapper.nix +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }: +{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome, plugins ? null }: let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); @@ -19,7 +19,7 @@ symlinkJoin { wrapProgram $out/bin/$each \ --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ - --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --prefix GTK_PATH : "${gnome.gnome-themes-extra}/lib/gtk-2.0" \ ${toString extraArgs} done diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 358847086a12..f0911395404e 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -13,7 +13,7 @@ , gfbgraph , glib , gnome-online-accounts -, gnome3 +, gnome , gobject-introspection , grilo , grilo-plugins @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { gfbgraph glib gnome-online-accounts - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme grilo grilo-plugins gsettings-desktop-schemas @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 14993f6f533a..cd3a6f368e9c 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , pkg-config , meson , ninja @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { clutter-gtk exiv2 glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 294b6c4ca701..4b9b93505ad8 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { meta = with lib; { description = "A Graphviz dot graph viewer for KDE"; license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/megapixels/default.nix b/pkgs/applications/graphics/megapixels/default.nix index 3d8a4c2bcebd..9439a17f6ded 100644 --- a/pkgs/applications/graphics/megapixels/default.nix +++ b/pkgs/applications/graphics/megapixels/default.nix @@ -6,7 +6,7 @@ , pkg-config , wrapGAppsHook , gtk3 -, gnome3 +, gnome , zbar , tiffSupport ? true , libraw @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ] + buildInputs = [ gtk3 gnome.adwaita-icon-theme zbar ] ++ optional tiffSupport libraw ++ optional jpgSupport graphicsmagick; diff --git a/pkgs/applications/graphics/ocrfeeder/default.nix b/pkgs/applications/graphics/ocrfeeder/default.nix index ff5d4bdf41de..da5f1c5dcc49 100644 --- a/pkgs/applications/graphics/ocrfeeder/default.nix +++ b/pkgs/applications/graphics/ocrfeeder/default.nix @@ -8,7 +8,7 @@ , intltool , itstool , libxml2 -, gnome3 +, gnome , python3 , gobject-introspection , wrapGAppsHook diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 204d87a59c4e..78b30ad44e03 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -12,7 +12,7 @@ , sqlite , webkitgtk , pkg-config -, gnome3 +, gnome , gst_all_1 , libgudev , libraw @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { librsvg librest gcr - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libgdata libchamplain libsecret @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 3f29d25fbe04..2b9fee974b37 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, boost, cairo, gettext, glibmm, gtk3, gtkmm3 , libjack2, libsigcxx, libxmlxx, makeWrapper, mlt-qt5, pango, pkg-config -, imagemagick, intltool, autoreconfHook, which, gnome3 +, imagemagick, intltool, autoreconfHook, which, gnome }: let @@ -107,7 +107,7 @@ stdenv.mkDerivation { buildInputs = [ ETL boost cairo glibmm gtk3 gtkmm3 imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 - synfig which gnome3.adwaita-icon-theme + synfig which gnome.adwaita-icon-theme ]; postInstall = '' diff --git a/pkgs/applications/graphics/tev/default.nix b/pkgs/applications/graphics/tev/default.nix index 3c48bbab0b85..6c9cee851486 100644 --- a/pkgs/applications/graphics/tev/default.nix +++ b/pkgs/applications/graphics/tev/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , cmake, wrapGAppsHook -, libX11, libzip, glfw, libpng, xorg, gnome3 +, libX11, libzip, glfw, libpng, xorg, gnome }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/tev \ "''${gappsWrapperArgs[@]}" \ - --prefix PATH ":" "${gnome3.zenity}/bin" + --prefix PATH ":" "${gnome.zenity}/bin" ''; meta = with lib; { diff --git a/pkgs/applications/graphics/vimiv/default.nix b/pkgs/applications/graphics/vimiv/default.nix index b5e9d0b8cf2d..6f6245a1c80d 100644 --- a/pkgs/applications/graphics/vimiv/default.nix +++ b/pkgs/applications/graphics/vimiv/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, imagemagick, librsvg, gtk3, jhead -, gnome3 +, gnome # Test requirements , dbus, xvfb_run, xdotool @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ''; checkInputs = [ python3Packages.nose dbus.daemon xvfb_run xdotool ]; - buildInputs = [ gnome3.adwaita-icon-theme librsvg ]; + buildInputs = [ gnome.adwaita-icon-theme librsvg ]; propagatedBuildInputs = with python3Packages; [ pillow pygobject3 gtk3 ]; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index eb5dc8950f90..a4ef9b34318c 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -8,7 +8,7 @@ , gcr , gettext , glib -, gnome3 +, gnome , gpgme , gtk3 , gtksourceview3 @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # it is quite odd }; diff --git a/pkgs/applications/misc/dwmblocks/default.nix b/pkgs/applications/misc/dwmblocks/default.nix index 45757787c7c3..c31a1a4b0630 100644 --- a/pkgs/applications/misc/dwmblocks/default.nix +++ b/pkgs/applications/misc/dwmblocks/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation { homepage = "https://github.com/torrinfail/dwmblocks"; license = licenses.isc; maintainers = with maintainers; [ sophrosyne ]; - platforms = platforms.all; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix index 0c5afe6cb4ef..29399ab2f5b5 100644 --- a/pkgs/applications/misc/font-manager/default.nix +++ b/pkgs/applications/misc/font-manager/default.nix @@ -15,7 +15,7 @@ , vala , gsettings-desktop-schemas , gtk3 -, gnome3 +, gnome , desktop-file-utils , wrapGAppsHook , gobject-introspection @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { sqlite gsettings-desktop-schemas # for font settings gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libsoup glib-networking # for SSL so that Google Fonts can load webkitgtk diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index 9d8ce3cc4804..c1a4ea2b6789 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome3, libgksu, +{ lib, stdenv, fetchurl, pkg-config, gtk2, gnome2, gnome, libgksu, intltool, libstartup_notification, gtk-doc, wrapGAppsHook }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 gnome2.GConf libstartup_notification gnome3.libgnome-keyring + gtk2 gnome2.GConf libstartup_notification gnome.libgnome-keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index c97a492e1bdf..31d81a332790 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -4,7 +4,7 @@ , desktop-file-utils , gettext , glib -, gnome3 +, gnome , gtk3 , gusb , libcanberra-gtk3 @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 168d5b9fb5cc..b35319c38630 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , desktop-file-utils , gettext , itstool @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index bbd272754cdb..a1b92572679c 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -12,7 +12,7 @@ , gtk3 , libgtop , libdazzle -, gnome3 +, gnome , tracker , libhandy }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libdazzle libgtop @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/applications/misc/gpx-viewer/default.nix b/pkgs/applications/misc/gpx-viewer/default.nix index 89a4198a749f..1619f7f43342 100644 --- a/pkgs/applications/misc/gpx-viewer/default.nix +++ b/pkgs/applications/misc/gpx-viewer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome3, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchurl, intltool, libxml2, pkg-config, gnome, libchamplain, gdl, shared-mime-info, desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "gpx-viewer"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { intltool pkg-config wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system ]; - buildInputs = [ gdl libchamplain gnome3.adwaita-icon-theme libxml2 ]; + buildInputs = [ gdl libchamplain gnome.adwaita-icon-theme libxml2 ]; meta = with lib; { homepage = "https://blog.sarine.nl/tag/gpxviewer/"; diff --git a/pkgs/applications/misc/gummi/default.nix b/pkgs/applications/misc/gummi/default.nix index f0416e232dcd..c36f50b1cbdb 100644 --- a/pkgs/applications/misc/gummi/default.nix +++ b/pkgs/applications/misc/gummi/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, pkgs -, glib, gnome3, gtk3, gtksourceview3, gtkspell3, poppler, texlive +, glib, gnome, gtk3, gtksourceview3, gtkspell3, poppler, texlive , pkg-config, intltool, autoreconfHook, wrapGAppsHook }: diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index b580fabf58e9..c7238fb01551 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -5,7 +5,7 @@ let qt5Deps = pkgs: with pkgs.qt5; [ qtbase qtmultimedia ]; - gnome3Deps = pkgs: with pkgs; [ gnome3.zenity gtksourceview gnome3.gnome-desktop gnome3.libgnome-keyring webkitgtk ]; + gnomeDeps = pkgs: with pkgs; [ gnome.zenity gtksourceview gnome.gnome-desktop gnome.libgnome-keyring webkitgtk ]; xorgDeps = pkgs: with pkgs.xorg; [ libX11 libXrender libXrandr libxcb libXmu libpthreadstubs libXext libXdmcp libXxf86vm libXinerama libSM libXv libXaw libXi libXcursor libXcomposite @@ -86,7 +86,7 @@ in buildFHSUserEnv { # ZDOOM soundfont-fluid bzip2 game-music-emu ] ++ qt5Deps pkgs - ++ gnome3Deps pkgs + ++ gnomeDeps pkgs ++ lib.optional steamSupport pkgs.steam; multiPkgs = pkgs: with pkgs; [ diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix index 0b781f61369a..724d9285ec2b 100644 --- a/pkgs/applications/misc/notejot/default.nix +++ b/pkgs/applications/misc/notejot/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Stupidly-simple sticky notes applet"; homepage = "https://github.com/lainsce/notejot"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index e62b3a334876..b00ee18d5f33 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -2,7 +2,7 @@ , dbus-glib , fetchurl , glib -, gnome3 +, gnome , libnotify , libtool , libwnck3 @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gsettings-desktop-schemas gnome3.gnome-common + gsettings-desktop-schemas gnome.gnome-common libtool ]; diff --git a/pkgs/applications/misc/olifant/default.nix b/pkgs/applications/misc/olifant/default.nix index fbaf140a9f78..bde2ae07c922 100644 --- a/pkgs/applications/misc/olifant/default.nix +++ b/pkgs/applications/misc/olifant/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib @@ -64,6 +64,6 @@ stdenv.mkDerivation rec { description = "A simple Mastodon client designed for elementary OS, originally developed by @bleakgrey"; homepage = "https://github.com/cleac/olifant"; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 71bc4daad771..f8facbe01fa0 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -12,7 +12,7 @@ , python , pygobject3 , gtk3 -, gnome3 +, gnome , substituteAll , at-spi2-atk , at-spi2-core @@ -92,7 +92,7 @@ buildPythonApplication rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; @@ -108,7 +108,7 @@ buildPythonApplication rec { GTK toolkit, the Java platform's Swing toolkit, LibreOffice, Gecko, and WebKitGtk. AT-SPI support for the KDE Qt toolkit is being pursued. - Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. + Needs `services.gnome.at-spi2-core.enable = true;` in `configuration.nix`. ''; maintainers = with maintainers; [ berce ] ++ teams.gnome.members; license = licenses.lgpl21; diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index 474fddb25201..a8b407dd7b5d 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, glib, intltool, libfm, libX11, pango, pkg-config -, wrapGAppsHook, gnome3, withGtk3 ? true, gtk2, gtk3 }: +, wrapGAppsHook, gnome, withGtk3 ? true, gtk2, gtk3 }: let libfm' = libfm.override { inherit withGtk3; }; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-FMt7JHSTxMzmX7tZAmEeOtAKeocPvB5QrcUEKMUUDPc="; }; - buildInputs = [ glib gtk libfm' libX11 pango gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk libfm' libX11 pango gnome.adwaita-icon-theme ]; nativeBuildInputs = [ pkg-config wrapGAppsHook intltool ]; configureFlags = optional withGtk3 "--with-gtk=3"; diff --git a/pkgs/applications/misc/phoc/default.nix b/pkgs/applications/misc/phoc/default.nix index 6ef88fb07c65..2e3f32305125 100644 --- a/pkgs/applications/misc/phoc/default.nix +++ b/pkgs/applications/misc/phoc/default.nix @@ -8,7 +8,7 @@ , python3 , wrapGAppsHook , libinput -, gnome3 +, gnome , glib , gtk3 , wayland @@ -60,9 +60,9 @@ in stdenv.mkDerivation rec { libinput glib gtk3 - gnome3.gnome-desktop + gnome.gnome-desktop # For keybindings settings schemas - gnome3.mutter + gnome.mutter wayland phocWlroots ]; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index b462e5f134b1..30d9533d4530 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -5,7 +5,7 @@ , cairo , dconf , glib -, gnome3 +, gnome , gtk3 , libwnck3 , libX11 @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext - gnome3.gnome-common + gnome.gnome-common libxml2 # xmllint pkg-config vala diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 44b2cd700ecf..00be8103683e 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -2,7 +2,7 @@ , python3 , fetchFromGitHub , gdk-pixbuf -, gnome3 +, gnome , gpsbabel , glib-networking , glibcLocales @@ -55,7 +55,7 @@ in python.pkgs.buildPythonApplication rec { gtk3 webkitgtk glib-networking - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gdk-pixbuf ]; diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index d866b643ef25..179ebd33d856 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -1,4 +1,4 @@ -{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg +{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg }: let inherit (python3Packages) python buildPythonApplication fetchPypi croniter; @@ -16,8 +16,8 @@ in buildPythonApplication rec { buildInputs = [ gtk3 gobject-introspection - gnome3.adwaita-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/applications/misc/snapper-gui/default.nix b/pkgs/applications/misc/snapper-gui/default.nix index 5beacfad2f95..2c6343159336 100644 --- a/pkgs/applications/misc/snapper-gui/default.nix +++ b/pkgs/applications/misc/snapper-gui/default.nix @@ -1,5 +1,5 @@ { lib, fetchFromGitHub, python3, python3Packages -, gnome3, gtk3, wrapGAppsHook, gtksourceview3, snapper +, gnome, gtk3, wrapGAppsHook, gtksourceview3, snapper , gobject-introspection }: @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ python3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; doCheck = false; # it doesn't have any tests diff --git a/pkgs/applications/misc/tootle/default.nix b/pkgs/applications/misc/tootle/default.nix index 0f6747d69f83..63ac88ecac9d 100644 --- a/pkgs/applications/misc/tootle/default.nix +++ b/pkgs/applications/misc/tootle/default.nix @@ -9,7 +9,7 @@ , python3 , libgee , gsettings-desktop-schemas -, gnome3 +, gnome , pantheon , wrapGAppsHook , gtk3 @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib glib-networking - gnome3.libsoup + gnome.libsoup gsettings-desktop-schemas gtk3 json-glib diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 989649ec4146..d95ce9cda48b 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -4,7 +4,7 @@ , python3Packages , gdk-pixbuf , glib -, gnome3 +, gnome , gobject-introspection , gtk3 , wrapGAppsHook @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gobject-introspection gtk3 keybinder3 @@ -115,6 +115,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://ulauncher.io/"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ aaronjanse worldofpeace ]; + maintainers = with maintainers; [ aaronjanse ]; }; } diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index f72e90a09fb2..cb65c753bccc 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , gnome2 -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , libpulseaudio @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg wrapGAppsHook ]; - buildInputs = [ glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index db0ddc47cc54..a2bc293eaaf5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -26,7 +26,7 @@ , libgcrypt ? null # gnomeSupport || cupsSupport # package customization -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true , cupsSupport ? true @@ -158,7 +158,7 @@ let libdrm wayland mesa.drivers libxkbcommon curl ] ++ optional gnomeKeyringSupport libgnome-keyring3 - ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optionals gnomeSupport [ gnome2.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index e921169cf067..14ee3290c71c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,6 +1,6 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_11, llvmPackages_12, ed, gnugrep, coreutils, xdg-utils -, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit +, glib, gtk3, gnome, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire , gcc, nspr, nss, runCommand @@ -9,7 +9,7 @@ # package customization # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" -, gnomeSupport ? false, gnome ? null +, gnomeSupport ? false, gnome2 ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enableWideVine ? false @@ -31,7 +31,7 @@ let upstream-info = (lib.importJSON ./upstream-info.json).${channel}; mkChromiumDerivation = callPackage ./common.nix ({ - inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs + inherit channel gnome2 gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport ungoogled; gnChromium = gn.overrideAttrs (oldAttrs: { inherit (upstream-info.deps.gn) version; @@ -156,7 +156,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; outputs = ["out" "sandbox"]; diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index 874a73dae8e8..f6dc79a2a0f3 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -1,7 +1,7 @@ { lib, fetchgit, meson, ninja, pkg-config, nix-update-script , python3, gtk3, libsecret, gst_all_1, webkitgtk, glib , glib-networking, gtkspell3, hunspell, desktop-file-utils -, gobject-introspection, wrapGAppsHook, gnome3 }: +, gobject-introspection, wrapGAppsHook, gnome }: python3.pkgs.buildPythonApplication rec { pname = "eolie"; @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { gst-plugins-base gst-plugins-ugly gstreamer - gnome3.gnome-settings-daemon + gnome.gnome-settings-daemon gtk3 gtkspell3 hunspell @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { description = "A new GNOME web browser"; homepage = "https://wiki.gnome.org/Apps/Eolie"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ samdroid-apps worldofpeace ]; + maintainers = with maintainers; [ samdroid-apps ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index ffba1096d1d4..fc7029933383 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -28,7 +28,7 @@ , libXt , libcanberra , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -139,7 +139,7 @@ stdenv.mkDerivation { inherit gtk3; - buildInputs = [ wrapGAppsHook gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ wrapGAppsHook gtk3 gnome.adwaita-icon-theme ]; # "strip" after "patchelf" may break binaries. # See: https://github.com/NixOS/patchelf/issues/10 diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 62bb722652a7..793e8688a5fa 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -3,7 +3,7 @@ ## various stuff that can be plugged in , ffmpeg, xorg, alsaLib, libpulseaudio, libcanberra-gtk2, libglvnd, libnotify -, gnome3/*.gnome-shell*/ +, gnome/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma5Packages, bukubrow, pipewire , tridactyl-native , fx_cast_bridge @@ -269,7 +269,7 @@ let --set MOZ_ENABLE_WAYLAND "1" \ ''}${lib.optionalString (browser ? gtk3) ''--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : '${gnome3.adwaita-icon-theme}/share' + --suffix XDG_DATA_DIRS : '${gnome.adwaita-icon-theme}/share' '' } ############################# diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 36d97b5a87c4..a7b9ddd07d0d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -38,7 +38,7 @@ , chromium , gsettings-desktop-schemas -, gnome3 +, gnome # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder) , libvaSupport ? true, libva @@ -88,7 +88,7 @@ in stdenv.mkDerivation { gsettings-desktop-schemas glib gtk3 # needed for XDG_ICON_DIRS - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; unpackPhase = '' diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index acd10e0ea388..72b17400df30 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -36,7 +36,7 @@ # Wrapper runtime , coreutils , glibcLocales -, gnome3 +, gnome , runtimeShell , shared-mime-info , gsettings-desktop-schemas @@ -246,7 +246,7 @@ stdenv.mkDerivation rec { "${graphene-hardened-malloc}/lib/libhardened_malloc.so"} WRAPPER_XDG_DATA_DIRS=${concatMapStringsSep ":" (x: "${x}/share") [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme shared-mime-info ]} WRAPPER_XDG_DATA_DIRS+=":"${concatMapStringsSep ":" (x: "${x}/share/gsettings-schemas/${x.name}") [ diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 57b39383e97d..f602bab27e8a 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -5,7 +5,7 @@ , python3 , dropbox , gtk3 -, gnome3 +, gnome , gdk-pixbuf , gobject-introspection }: @@ -49,7 +49,7 @@ stdenv.mkDerivation { buildInputs = [ python3 gtk3 - gnome3.nautilus + gnome.nautilus ]; configureFlags = [ diff --git a/pkgs/applications/networking/feedreaders/feedreader/default.nix b/pkgs/applications/networking/feedreaders/feedreader/default.nix index c9339601a4b3..4eb8da760bff 100644 --- a/pkgs/applications/networking/feedreaders/feedreader/default.nix +++ b/pkgs/applications/networking/feedreaders/feedreader/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, gettext, python3 , appstream-glib, desktop-file-utils, wrapGAppsHook, gnome-online-accounts , gtk3, libgee, libpeas, librest, webkitgtk, gsettings-desktop-schemas -, curl, glib, gnome3, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 +, curl, glib, gnome, gst_all_1, json-glib, libnotify, libsecret, sqlite, gumbo, libxml2 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl glib json-glib libnotify libsecret sqlite gumbo gtk3 - libgee libpeas gnome3.libsoup librest webkitgtk gsettings-desktop-schemas + libgee libpeas gnome.libsoup librest webkitgtk gsettings-desktop-schemas gnome-online-accounts ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A modern desktop application designed to complement existing web-based RSS accounts"; homepage = "https://jangernert.github.io/FeedReader/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo worldofpeace ]; + maintainers = with maintainers; [ edwtjo ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/ftp/taxi/default.nix b/pkgs/applications/networking/ftp/taxi/default.nix index a359bf3a7c0c..9e6ee864137b 100644 --- a/pkgs/applications/networking/ftp/taxi/default.nix +++ b/pkgs/applications/networking/ftp/taxi/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "The FTP Client that drives you anywhere"; homepage = "https://github.com/Alecaddd/taxi"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix index 31896f20184f..abcdf617352b 100644 --- a/pkgs/applications/networking/instant-messengers/coyim/default.nix +++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix @@ -1,5 +1,5 @@ { lib, buildGoPackage, fetchFromGitHub, pkg-config, - cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }: + cairo, gdk-pixbuf, glib, gnome, wrapGAppsHook, gtk3 }: buildGoPackage rec { pname = "coyim"; @@ -16,7 +16,7 @@ buildGoPackage rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; - buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ glib cairo gdk-pixbuf gtk3 gnome.adwaita-icon-theme ]; meta = with lib; { description = "a safe and secure chat client"; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 29a69b401920..d07b7d2912a3 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , vala, cmake, ninja, wrapGAppsHook, pkg-config, gettext -, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking +, gobject-introspection, gnome, glib, gdk-pixbuf, gtk3, glib-networking , xorg, libXdmcp, libxkbcommon , libnotify, libsoup, libgee , librsvg, libsignal-protocol-c @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { glib-networking glib libgee - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme sqlite gdk-pixbuf gtk3 diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index 23a4aebb0265..d957daced26d 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -88,6 +88,6 @@ stdenv.mkDerivation rec { description = "Matrix group messaging app"; homepage = "https://gitlab.gnome.org/GNOME/fractal"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]); }; } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index c78141f6eb22..ee9c902543ca 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook # Native dependencies -, python3, gtk3, gobject-introspection, gnome3 +, python3, gtk3, gobject-introspection, gnome , glib-networking # Test dependencies @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { }; buildInputs = [ - gobject-introspection gtk3 gnome3.adwaita-icon-theme + gobject-introspection gtk3 gnome.adwaita-icon-theme glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] ++ lib.optional enableSecrets libsecret diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 764a5ac3db51..8caafdd57624 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3 +, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon }: @@ -31,7 +31,7 @@ let gtk3 libappindicator-gtk3 - gnome3.gnome-keyring + gnome.gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index 99465cc7971e..38ee5579b5a2 100644 --- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Link-local XMPP connection manager for Telepathy"; platforms = platforms.gnu ++ platforms.linux; # Random choice - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix index 7c0f80d22383..46215db3eb56 100644 --- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, lib, stdenv, gnome3, cmake, pkg-config, +{ fetchFromGitHub, lib, stdenv, gnome, cmake, pkg-config, libappindicator-gtk3, gst_all_1, pcre }: stdenv.mkDerivation rec { @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gtkmm - gnome3.webkitgtk + gnome.gtkmm + gnome.webkitgtk libappindicator-gtk3 gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 4dc29dd22835..4d94801df959 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -51,7 +51,6 @@ let arianvp kiwi toonn - worldofpeace ]; platforms = [ "x86_64-darwin" diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix index 570b2d13be14..4401a0a7df80 100644 --- a/pkgs/applications/networking/mailreaders/astroid/default.nix +++ b/pkgs/applications/networking/mailreaders/astroid/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome3, gmime3, webkitgtk, ronn +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, gnome, gmime3, webkitgtk, ronn , libsass, notmuch, boost, wrapGAppsHook, glib-networking, protobuf, vim_configurable , gtkmm3, libpeas, gsettings-desktop-schemas, gobject-introspection, python3 @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtkmm3 gmime3 webkitgtk libsass libpeas python3 - notmuch boost gsettings-desktop-schemas gnome3.adwaita-icon-theme + notmuch boost gsettings-desktop-schemas gnome.adwaita-icon-theme glib-networking protobuf vim ]; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix index 3bf5b5075c66..ad43ed97e09c 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution-ews/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution +{ lib, stdenv, fetchurl, gnome, cmake, gettext, intltool, pkg-config, evolution-data-server, evolution , sqlite, gtk3, webkitgtk, libgdata, libmspack }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution-ews"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index e703f5d7401b..53fe3d6f9496 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -24,7 +24,7 @@ , db , gcr , sqlite -, gnome3 +, gnome , librsvg , gdk-pixbuf , libsecret @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme bogofilter db evolution-data-server @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { gdk-pixbuf glib glib-networking - gnome3.gnome-desktop + gnome.gnome-desktop gsettings-desktop-schemas gst_all_1.gst-plugins-base gst_all_1.gstreamer @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix index cfbaa988c712..7837393926f6 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/wrapper.nix @@ -1,8 +1,8 @@ -{ lib, makeWrapper, symlinkJoin, gnome3, plugins }: +{ lib, makeWrapper, symlinkJoin, gnome, plugins }: symlinkJoin { name = "evolution-with-plugins"; - paths = [ gnome3.evolution-data-server ] ++ plugins; + paths = [ gnome.evolution-data-server ] ++ plugins; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix index dda6abac8e56..83e8984db7bd 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68.nix @@ -30,7 +30,7 @@ , libXt , libxcb , libcanberra -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -116,7 +116,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index d16cbfc1bca0..b81128545d59 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , glib , glibc -, gnome3 +, gnome , gnugrep , gnupg , gnused @@ -115,7 +115,7 @@ stdenv.mkDerivation { stdenv.cc.cc ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix index a39b4aab8371..f0fb5a1239a1 100644 --- a/pkgs/applications/networking/p2p/retroshare/default.nix +++ b/pkgs/applications/networking/p2p/retroshare/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome3, glib, libssh, pkg-config, protobuf, bzip2 +{ lib, stdenv, fetchFromGitHub, libupnp, gpgme, gnome, glib, libssh, pkg-config, protobuf, bzip2 , libXScrnSaver, speex, curl, libxml2, libxslt, sqlcipher, libmicrohttpd, opencv, qmake, ffmpeg_3 , qtmultimedia, qtx11extras, qttools }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config qmake ]; buildInputs = [ - speex libupnp gpgme gnome3.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools + speex libupnp gpgme gnome.libgnome-keyring glib libssh qtmultimedia qtx11extras qttools protobuf bzip2 libXScrnSaver curl libxml2 libxslt sqlcipher libmicrohttpd opencv ffmpeg_3 ]; diff --git a/pkgs/applications/networking/pcloud/default.nix b/pkgs/applications/networking/pcloud/default.nix index 6cff01c1cc29..4b1eca32750e 100644 --- a/pkgs/applications/networking/pcloud/default.nix +++ b/pkgs/applications/networking/pcloud/default.nix @@ -21,7 +21,7 @@ # Runtime dependencies; # A few additional ones (e.g. Node) are already shipped together with the # AppImage, so we don't have to duplicate them here. - alsaLib, dbus-glib, fuse, gnome3, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss + alsaLib, dbus-glib, fuse, gnome, gtk3, libdbusmenu-gtk2, libXdamage, udev, nss }: let @@ -94,7 +94,7 @@ in stdenv.mkDerivation { # This is required for the file picker dialog - otherwise pcloud just # crashes - export XDG_DATA_DIRS="${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome3.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" + export XDG_DATA_DIRS="${gnome.gsettings-desktop-schemas}/share/gsettings-schemas/${gnome.gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" exec "$out/app/pcloud" EOF diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 8b1ef3c5863f..8a96cf84755b 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -1,5 +1,5 @@ { lib, stdenv, requireFile, makeWrapper, autoPatchelfHook, wrapGAppsHook, which, more -, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome3, gtk2-x11, gtk3 +, file, atk, alsaLib, cairo, fontconfig, gdk-pixbuf, glib, gnome, gtk2-x11, gtk3 , heimdal, krb5, libsoup, libvorbis, speex, openssl, zlib, xorg, pango, gtk2 , gnome2, mesa, nss, nspr, gtk_engines, freetype, dconf, libpng12, libxml2 , libjpeg, libredirect, tzdata, cacert, systemd, libcxxabi, libcxx, e2fsprogs, symlinkJoin @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { freetype gdk-pixbuf gnome2.gtkglext - gnome3.webkitgtk + gnome.webkitgtk gtk2 gtk2-x11 gtk3 diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 5d0195b62f88..e2f1cf2c8a2e 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -6,7 +6,7 @@ , libsecret, libsoup, spice-protocol, spice-gtk, epoxy, at-spi2-core , openssl, gsettings-desktop-schemas, json-glib, libsodium, webkitgtk, harfbuzz # The themes here are soft dependencies; only icons are missing without them. -, gnome3 +, gnome }: with lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pcre2 libdbusmenu-gtk3 libappindicator-gtk3 libvncserver libpthreadstubs libXdmcp libxkbcommon libsecret libsoup spice-protocol spice-gtk epoxy at-spi2-core - openssl gnome3.adwaita-icon-theme json-glib libsodium webkitgtk + openssl gnome.adwaita-icon-theme json-glib libsodium webkitgtk harfbuzz ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 015033d6ca56..158999f86fee 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook -, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 +, gnome, buildPythonApplication, dateutil, pyinotify, pygobject3 , bcrypt, gobject-introspection, gsettings-desktop-schemas , pango, gdk-pixbuf, atk }: @@ -24,7 +24,7 @@ buildPythonApplication rec { buildInputs = [ gtk3 librsvg libappindicator-gtk3 - libnotify gnome3.adwaita-icon-theme + libnotify gnome.adwaita-icon-theme # Schemas with proxy configuration gsettings-desktop-schemas ]; diff --git a/pkgs/applications/networking/weather/meteo/default.nix b/pkgs/applications/networking/weather/meteo/default.nix index 3de0d450de5e..a5edbac135f9 100644 --- a/pkgs/applications/networking/weather/meteo/default.nix +++ b/pkgs/applications/networking/weather/meteo/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { description = "Know the forecast of the next hours & days"; homepage = "https://gitlab.com/bitseater/meteo"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index 4e83f36ea527..e32502749dc3 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, fribidi , libpng, popt, libgsf, enchant, wv, librsvg, bzip2, libjpeg, perl -, boost, libxslt, goffice, wrapGAppsHook, gnome3 +, boost, libxslt, goffice, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 librsvg bzip2 fribidi libpng popt - libgsf enchant wv libjpeg perl boost libxslt goffice gnome3.adwaita-icon-theme + libgsf enchant wv libjpeg perl boost libxslt goffice gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index f65781352b3f..aacc2a2a579c 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, intltool, perlPackages -, goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages +, goffice, gnome, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -20,14 +20,14 @@ in stdenv.mkDerivation rec { # ToDo: optional libgda, introspection? buildInputs = [ - goffice gtk3 gnome3.adwaita-icon-theme + goffice gtk3 gnome.adwaita-icon-theme python pygobject3 ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 9d085b6c8830..1d2d6f0d851d 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -7,7 +7,7 @@ , intltool , wrapGAppsHook , libsoup -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { libofx intltool libsoup - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index a586cea47ab3..b7da8c777a95 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, gtk, pkg-config, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +, libsoup, gnome }: stdenv.mkDerivation rec { name = "homebank-5.5.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config wrapGAppsHook ]; buildInputs = [ gtk libofx intltool libsoup - gnome3.adwaita-icon-theme ]; + gnome.adwaita-icon-theme ]; meta = with lib; { description = "Free, easy, personal accounting for everyone"; diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 90e5995669e8..74fcf1af8f9f 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -2,16 +2,24 @@ python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "1.0.2"; + version = "unstable-2021-04-01"; -# no tests included in PyPI tarball + # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; - rev = "v${version}"; - sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk"; + rev = "0b674c57c833f75b1a36d8caf78e1567c8e2180c"; + sha256 = "0q404gr85caib5hg83cnmgx4684l72w9slxyxrwsiwhlf7gm443q"; }; + patches = [ + # ledger-autosync specifies an URL for its ofxparse + # dependency. This patch removes the URL to only use the + # `ofxparse` name. This works because nixpkgs' version of ofxparse + # is more recent than the latest release. + ./fix-ofxparse-dependency.patch + ]; + propagatedBuildInputs = with python3Packages; [ asn1crypto beautifulsoup4 diff --git a/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch b/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch new file mode 100644 index 000000000000..cb12ba9f3351 --- /dev/null +++ b/pkgs/applications/office/ledger-autosync/fix-ofxparse-dependency.patch @@ -0,0 +1,13 @@ +diff --git a/setup.py b/setup.py +index eda6db5..ed6b90b 100644 +--- a/setup.py ++++ b/setup.py +@@ -38,7 +38,7 @@ setup( + install_requires=[ + 'setuptools>=26', + 'ofxclient', +- "ofxparse @ https://github.com/jseutter/ofxparse/tarball/3236cfd96434feb6bc79a8b66f3400f18e2ad3c4" ++ 'ofxparse' + ], + + extras_require={ \ No newline at end of file diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c9b1099f8b96..1c5327ebc6ce 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -12,7 +12,7 @@ , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook -, gnome3, glib, ncurses, epoxy, gpgme +, gnome, glib, ncurses, epoxy, gpgme , langs ? [ "ca" "cs" "da" "de" "en-GB" "en-US" "eo" "es" "fr" "hu" "it" "ja" "nl" "pl" "pt" "pt-BR" "ro" "ru" "sl" "zh-CN" ] , withHelp ? true , kdeIntegration ? false, mkDerivation ? null, qtbase ? null, qtx11extras ? null @@ -399,7 +399,7 @@ in (mkDrv rec { mdds bluez5 libcmis libwps libabw libzmf libxshmfence libatomic_ops graphite2 harfbuzz gpgme util-linux librevenge libe-book libmwaw glm ncurses epoxy - libodfgen CoinMP librdf_rasqal gnome3.adwaita-icon-theme gettext + libodfgen CoinMP librdf_rasqal gnome.adwaita-icon-theme gettext ] ++ (with gst_all_1; [ gstreamer diff --git a/pkgs/applications/office/notes-up/default.nix b/pkgs/applications/office/notes-up/default.nix index 7ab5bc838ec0..8271b2974ce4 100644 --- a/pkgs/applications/office/notes-up/default.nix +++ b/pkgs/applications/office/notes-up/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { + lib.optionalString withPantheon " - built with Contractor support"; homepage = "https://github.com/Philip-Scott/Notes-up"; license = licenses.gpl2; - maintainers = with maintainers; [ davidak worldofpeace ]; + maintainers = with maintainers; [ davidak ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/paperwork/paperwork-gtk.nix b/pkgs/applications/office/paperwork/paperwork-gtk.nix index 847287c8c856..d37db7cddb27 100644 --- a/pkgs/applications/office/paperwork/paperwork-gtk.nix +++ b/pkgs/applications/office/paperwork/paperwork-gtk.nix @@ -2,7 +2,7 @@ , python3Packages , gtk3 , cairo -, gnome3 +, gnome , librsvg , xvfb_run , dbus @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libnotify librsvg gtk3 diff --git a/pkgs/applications/office/tryton/default.nix b/pkgs/applications/office/tryton/default.nix index 65eb48f3b2d9..b3a5ae44c936 100644 --- a/pkgs/applications/office/tryton/default.nix +++ b/pkgs/applications/office/tryton/default.nix @@ -6,7 +6,7 @@ , atk , gtk3 , gtkspell3 -, gnome3 +, gnome , glib , goocanvas2 , gdk-pixbuf @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication rec { atk gdk-pixbuf glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme goocanvas2 fontconfig freetype diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index f34a3e806af7..4cf3c3d78cec 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, python3Packages, gtk3, gobject-introspection, wrapGAppsHook, gnome }: # # TODO: Declare configuration options for the following optional dependencies: @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { sha256 = "13vhwsgv6mscgixypc0ixkgj0y7cpcm7z7wn1vmdrwp7kn8m3xgx"; }; - buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gobject-introspection wrapGAppsHook gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3Packages; [ pyxdg pygobject3 ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 1584972cbebd..99fd54c5cc7f 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -26,7 +26,7 @@ , libXrender , libXt , libnotify -, gnome3 +, gnome , libGLU, libGL , nspr , nss @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome3.adwaita-icon-theme dconf ]; + buildInputs= [ gsettings-desktop-schemas glib gtk3 gnome.adwaita-icon-theme dconf ]; dontConfigure = true; dontBuild = true; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 76048733a6a3..86bda3092bc4 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchFromGitLab -, gnome3 +, gnome , dconf , wxGTK30 , wxGTK31 @@ -187,7 +187,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" - "--prefix XDG_DATA_DIRS : ${gnome3.adwaita-icon-theme}/share" + "--prefix XDG_DATA_DIRS : ${gnome.adwaita-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${wxGTK.gtk}/share/gsettings-schemas/${wxGTK.gtk.name}" "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" # wrapGAppsHook did these two as well, no idea if it matters... diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 20a17b11221a..9d6212fef112 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -9,7 +9,7 @@ , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ncurses , buildIde ? true -, glib, gnome3, wrapGAppsHook +, glib, gnome, wrapGAppsHook , csdp ? null , version, coq-version ? null, }@args: @@ -128,7 +128,7 @@ self = stdenv.mkDerivation { buildInputs = [ ncurses ] ++ ocamlBuildInputs ++ optionals buildIde (if versionAtLeast "8.10" - then [ ocamlPackages.lablgtk3-sourceview3 glib gnome3.adwaita-icon-theme wrapGAppsHook ] + then [ ocamlPackages.lablgtk3-sourceview3 glib gnome.adwaita-icon-theme wrapGAppsHook ] else [ ocamlPackages.lablgtk ]); postPatch = '' diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 25215d7abb56..94e675d7dd44 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , wrapGAppsHook, cmake, gettext -, maxima, wxGTK, gnome3 }: +, maxima, wxGTK, gnome }: stdenv.mkDerivation rec { pname = "wxmaxima"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5nvaaKsvSEs7QxOszjDK1Xkana2er1BCMZ83b1JZSqc="; }; - buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; + buildInputs = [ wxGTK maxima gnome.adwaita-icon-theme ]; nativeBuildInputs = [ wrapGAppsHook cmake gettext ]; diff --git a/pkgs/applications/terminal-emulators/kgx/default.nix b/pkgs/applications/terminal-emulators/kgx/default.nix index 4e8cf06c1fdb..dc5c651d50a5 100644 --- a/pkgs/applications/terminal-emulators/kgx/default.nix +++ b/pkgs/applications/terminal-emulators/kgx/default.nix @@ -3,7 +3,7 @@ , genericBranding ? false , fetchFromGitLab , gettext -, gnome3 +, gnome , libgtop , gtk3 , libhandy @@ -35,7 +35,7 @@ stdenv.mkDerivation { buildInputs = [ gettext libgtop - gnome3.nautilus + gnome.nautilus gtk3 libhandy pcre2 diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index 94629314341d..b9f7d4ef677b 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { "--enable-ind" #indic scripts "--enable-fribidi" #bidi scripts "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" - #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core + #mlterm-menu and mlconfig depend on enabling gnome.at-spi2-core #and configuring ~/.mlterm/key correctly. ] ++ lib.optionals (!stdenv.isDarwin) [ "--with-x=yes" diff --git a/pkgs/applications/terminal-emulators/tilix/default.nix b/pkgs/applications/terminal-emulators/tilix/default.nix index c0f4ea32576e..a5c4b4574df3 100644 --- a/pkgs/applications/terminal-emulators/tilix/default.nix +++ b/pkgs/applications/terminal-emulators/tilix/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { description = "Tiling terminal emulator following the Gnome Human Interface Guidelines"; homepage = "https://gnunn1.github.io/tilix-web"; license = licenses.mpl20; - maintainers = with maintainers; [ midchildan worldofpeace ]; + maintainers = with maintainers; [ midchildan ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index 7e4b7a84075e..c8b95fa238f7 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib -, libXfixes, atk, gtk3, libXrender, pango, gnome3, cairo, freetype, fontconfig +, libXfixes, atk, gtk3, libXrender, pango, gnome, cairo, freetype, fontconfig , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst , nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus , makeDesktopItem, openssl, wrapGAppsHook, at-spi2-atk, at-spi2-core, libuuid @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix index 95a9f2d72424..9859163031c3 100644 --- a/pkgs/applications/version-management/meld/default.nix +++ b/pkgs/applications/version-management/meld/default.nix @@ -12,7 +12,7 @@ , gobject-introspection , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 gtksourceview4 gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; propagatedBuildInputs = with python3.pkgs; [ @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 324c61ab194b..14e1173d406f 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -4,7 +4,7 @@ , jre , gtk3 , glib -, gnome3 +, gnome , wrapGAppsHook , libXtst , which @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ jre gnome3.adwaita-icon-theme gtk3 ]; + buildInputs = [ jre gnome.adwaita-icon-theme gtk3 ]; preFixup = with lib; '' gappsWrapperArgs+=( \ diff --git a/pkgs/applications/video/byzanz/default.nix b/pkgs/applications/video/byzanz/default.nix index 80e1c1260bd4..a9eee05d238f 100644 --- a/pkgs/applications/video/byzanz/default.nix +++ b/pkgs/applications/video/byzanz/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome3, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: +{ lib, stdenv, fetchgit, wrapGAppsHook, which, gnome, glib, intltool, pkg-config, libtool, cairo, gtk3, gst_all_1, xorg }: stdenv.mkDerivation { version = "0.2.3.alpha"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ which gnome3.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] + buildInputs = [ which gnome.gnome-common glib intltool libtool cairo gtk3 xorg.xwininfo xorg.libXdamage ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly gst-libav wrapGAppsHook ]); meta = with lib; { diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 57eaf91f2aea..838d306c6854 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/celluloid-player/celluloid"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/kodi-packages/osmc-skin/default.nix b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix index c83fd66a4333..7bbb62029bba 100644 --- a/pkgs/applications/video/kodi-packages/osmc-skin/default.nix +++ b/pkgs/applications/video/kodi-packages/osmc-skin/default.nix @@ -15,7 +15,7 @@ buildKodiAddon rec { homepage = "https://github.com/osmc/skin.osmc"; description = "The default skin for OSMC"; platforms = platforms.all; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; license = licenses.cc-by-nc-sa-30; }; } diff --git a/pkgs/applications/video/peek/default.nix b/pkgs/applications/video/peek/default.nix index 2a1418cb3731..d4e8f9d21b29 100644 --- a/pkgs/applications/video/peek/default.nix +++ b/pkgs/applications/video/peek/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/phw/peek"; description = "Simple animated GIF screen recorder with an easy to use interface"; license = licenses.gpl3; - maintainers = with maintainers; [ puffnfresh worldofpeace ]; + maintainers = with maintainers; [ puffnfresh ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index b9707e7c2493..b1be6035f9e8 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -11,7 +11,7 @@ , gobject-introspection , libpeas , librsvg -, gnome3 +, gnome , libnotify , gsound , meson @@ -52,9 +52,9 @@ python3Packages.buildPythonApplication rec { gtk3 libpeas librsvg - gnome3.gnome-desktop + gnome.gnome-desktop gsound - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas libnotify ] ++ (with gst_all_1; [ @@ -89,7 +89,7 @@ python3Packages.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "pitivi"; versionPolicy = "none"; # we are using dev version, since the stable one is too old }; diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 922d6fa9ff1d..f15a2e914966 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, python3Packages, intltool, file , wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobject-introspection, libvirt-glib, system-libvirt -, gsettings-desktop-schemas, libosinfo, gnome3 +, gsettings-desktop-schemas, libosinfo, gnome , gtksourceview4, docutils , spiceSupport ? true, spice-gtk ? null , cpio, e2fsprogs, findutils, gzip @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { buildInputs = [ wrapGAppsHook - libvirt-glib vte dconf gtk-vnc gnome3.adwaita-icon-theme avahi + libvirt-glib vte dconf gtk-vnc gnome.adwaita-icon-theme avahi gsettings-desktop-schemas libosinfo gtksourceview4 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/applications/window-managers/phosh/default.nix b/pkgs/applications/window-managers/phosh/default.nix index 95faee74dbc7..8be84abbdfb9 100644 --- a/pkgs/applications/window-managers/phosh/default.nix +++ b/pkgs/applications/window-managers/phosh/default.nix @@ -11,7 +11,7 @@ , pulseaudio , glib , gtk3 -, gnome3 +, gnome , gcr , pam , systemd @@ -52,7 +52,7 @@ let [ -n "$WLR_BACKENDS" ] || WLR_BACKENDS=drm,libinput export WLR_BACKENDS exec "${phoc}/bin/phoc" -C "$PHOC_INI" \ - -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome3.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" + -E "bash -lc 'XDG_DATA_DIRS=$XDG_DATA_DIRS:\$XDG_DATA_DIRS ${gnome.gnome-session}/bin/gnome-session $GNOME_SESSION_ARGS'" ''; in stdenv.mkDerivation rec { @@ -85,9 +85,9 @@ in stdenv.mkDerivation rec { gcr networkmanager polkit - gnome3.gnome-control-center - gnome3.gnome-desktop - gnome3.gnome-session + gnome.gnome-control-center + gnome.gnome-desktop + gnome.gnome-session gtk3 pam systemd @@ -131,7 +131,7 @@ in stdenv.mkDerivation rec { # Depends on GSettings schemas in gnome-shell preFixup = '' gappsWrapperArgs+=( - --prefix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share/gsettings-schemas/${gnome3.gnome-shell.name}" + --prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" ) ''; diff --git a/pkgs/applications/window-managers/xmonad/log-applet/default.nix b/pkgs/applications/window-managers/xmonad/log-applet/default.nix index 830242667db6..2e41cc2c97c6 100644 --- a/pkgs/applications/window-managers/xmonad/log-applet/default.nix +++ b/pkgs/applications/window-managers/xmonad/log-applet/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, glib, dbus-glib , desktopSupport ? "gnomeflashback", xorg , gtk2 -, gtk3, gnome3, mate +, gtk3, gnome, mate , libxfce4util, xfce4-panel }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib dbus-glib xorg.xcbutilwm ] - ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome3.gnome-panel ] + ++ lib.optionals (desktopSupport == "gnomeflashback") [ gtk3 gnome.gnome-panel ] ++ lib.optionals (desktopSupport == "mate") [ gtk3 mate.mate-panel ] ++ lib.optionals (desktopSupport == "xfce4") [ gtk2 libxfce4util xfce4-panel ] ; diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index 7659c9f42a10..3a820853b1fb 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -61,7 +61,7 @@ rec { targetPkgs = pkgs: with pkgs; [ gtk3 bashInteractive - gnome3.zenity + gnome.zenity python2 xorg.xrandr which diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 39fe4235f135..e76fee1a6eb8 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , gettext -, gnome3 +, gnome , itstool , libxml2 , yelp-tools @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index dc0b8cc23eb6..011e88dc1d2e 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome }: stdenv.mkDerivation rec { pname = "cantarell-fonts"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { outputHash = "1sczskw2kv3qy39i9mzw2lkl94a90bjgv5ln9acy5kh4gb2zmy7z"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/fonts/open-sans/default.nix b/pkgs/data/fonts/open-sans/default.nix index ecca50537f1d..0c9cf7b6a35e 100644 --- a/pkgs/data/fonts/open-sans/default.nix +++ b/pkgs/data/fonts/open-sans/default.nix @@ -26,6 +26,6 @@ in fetchFromGitLab { homepage = "https://www.opensans.com"; license = licenses.asl20; platforms = platforms.all; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index 6b7de57a4ff1..88184b585ecf 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "arc-icon-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ moka-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index dfcd2f596797..384086204c1b 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, pkg-config, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ pantheon.elementary-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/humanity-icon-theme/default.nix b/pkgs/data/icons/humanity-icon-theme/default.nix index 13ee96d04998..12e2d0a06d62 100644 --- a/pkgs/data/icons/humanity-icon-theme/default.nix +++ b/pkgs/data/icons/humanity-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk3, gnome3, hicolor-icon-theme }: +{ lib, stdenv, fetchurl, gtk3, gnome, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "humanity-icon-theme"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index c84369a8a4a9..a8eb1a8736d6 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix index cb7db20d67ca..1bcfab57b4a9 100644 --- a/pkgs/data/icons/pop-icon-theme/default.nix +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -4,7 +4,7 @@ , ninja , gtk3 , breeze-icons -, gnome3 +, gnome , pantheon , hicolor-icon-theme }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ breeze-icons - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme pantheon.elementary-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/misc/mobile-broadband-provider-info/default.nix b/pkgs/data/misc/mobile-broadband-provider-info/default.nix index fba9580107ae..49755dbd8ad6 100644 --- a/pkgs/data/misc/mobile-broadband-provider-info/default.nix +++ b/pkgs/data/misc/mobile-broadband-provider-info/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, libxslt }: +{ lib, stdenv, fetchurl, gnome, libxslt }: stdenv.mkDerivation rec { pname = "mobile-broadband-provider-info"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/data/themes/adapta/default.nix b/pkgs/data/themes/adapta/default.nix index f67d689a4bfc..fc6e5b8c3553 100644 --- a/pkgs/data/themes/adapta/default.nix +++ b/pkgs/data/themes/adapta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }: stdenv.mkDerivation rec { pname = "adapta-gtk-theme"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { inkscape libxml2 glib.dev - gnome3.gnome-shell + gnome.gnome-shell ]; buildInputs = [ diff --git a/pkgs/data/themes/adwaita-qt/default.nix b/pkgs/data/themes/adwaita-qt/default.nix index ace93fa44950..9c71c7871121 100644 --- a/pkgs/data/themes/adwaita-qt/default.nix +++ b/pkgs/data/themes/adwaita-qt/default.nix @@ -36,7 +36,7 @@ mkDerivation rec { description = "A style to bend Qt applications to look like they belong into GNOME Shell"; homepage = "https://github.com/FedoraQt/adwaita-qt"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.linux; }; } diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 8a283a041852..fff5e4bf41a5 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , pkg-config , gtk3 -, gnome3 +, gnome , gtk-engine-murrine , optipng , inkscape @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; propagatedUserEnvPkgs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gtk-engine-murrine ]; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-cinnamon=${cinnamon.cinnamon-common.version}" - "--with-gnome-shell=${gnome3.gnome-shell.version}" + "--with-gnome-shell=${gnome.gnome-shell.version}" "--disable-unity" ]; diff --git a/pkgs/data/themes/canta/default.nix b/pkgs/data/themes/canta/default.nix index cf1223152088..431522fa85e8 100644 --- a/pkgs/data/themes/canta/default.nix +++ b/pkgs/data/themes/canta/default.nix @@ -4,7 +4,7 @@ , librsvg , gtk-engine-murrine , gtk3 -, gnome3 +, gnome , gnome-icon-theme , numix-icon-theme-circle , hicolor-icon-theme @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme numix-icon-theme-circle hicolor-icon-theme diff --git a/pkgs/data/themes/equilux-theme/default.nix b/pkgs/data/themes/equilux-theme/default.nix index 162b87885089..067c2b88a099 100644 --- a/pkgs/data/themes/equilux-theme/default.nix +++ b/pkgs/data/themes/equilux-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: +{ lib, stdenv, fetchFromGitHub, gnome, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: stdenv.mkDerivation rec { pname = "equilux-theme"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ glib libxml2 bc ]; - buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ]; + buildInputs = [ gnome.gnome-themes-extra gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { patchShebangs install.sh sed -i install.sh \ -e "s|if .*which gnome-shell.*;|if true;|" \ - -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome3.gnome-shell.version}|" + -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|" mkdir -p $out/share/themes ./install.sh --dest $out/share/themes rm $out/share/themes/*/COPYING diff --git a/pkgs/data/themes/lounge/default.nix b/pkgs/data/themes/lounge/default.nix index 0c51b78333dc..ab945f510538 100644 --- a/pkgs/data/themes/lounge/default.nix +++ b/pkgs/data/themes/lounge/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome3, gdk-pixbuf, librsvg, gtk-engine-murrine }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { pname = "lounge-gtk-theme"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; mesonFlags = [ - "-D gnome_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postFixup = '' diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix index d34ece5c94f7..f9e3463f2fdc 100644 --- a/pkgs/data/themes/materia-theme/default.nix +++ b/pkgs/data/themes/materia-theme/default.nix @@ -3,7 +3,7 @@ , meson , ninja , sassc -, gnome3 +, gnome , gtk-engine-murrine , gdk-pixbuf , librsvg @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gnome-themes-extra + gnome.gnome-themes-extra gdk-pixbuf librsvg ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { dontBuild = true; mesonFlags = [ - "-Dgnome_shell_version=${lib.versions.majorMinor gnome3.gnome-shell.version}" + "-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}" ]; postInstall = '' diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index 732c9a74573b..fb23141a64eb 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , gnome-icon-theme -, gnome3 +, gnome , gtk-engine-murrine , gtk3 , hicolor-icon-theme @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gnome-icon-theme - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme humanity-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index f0d2493473a4..c2f449e9f208 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: + python3, gtk3, gnome, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "yaru"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; - buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + buildInputs = [ gtk3 gnome.gnome-themes-extra ]; propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; diff --git a/pkgs/desktops/cinnamon/cinnamon-common/default.nix b/pkgs/desktops/cinnamon/cinnamon-common/default.nix index 65eede258326..a5800b01a303 100644 --- a/pkgs/desktops/cinnamon/cinnamon-common/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-common/default.nix @@ -28,7 +28,7 @@ , wrapGAppsHook , libxml2 , gtk-doc -, gnome3 +, gnome , python3 , keybinder3 , cairo @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { # bindings cairo - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix index c2e50c65557e..4208b92ae2d5 100644 --- a/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-control-center/default.nix @@ -18,7 +18,7 @@ , libxklavier , networkmanager , libwacom -, gnome3 +, gnome , wrapGAppsHook , tzdata , glibc diff --git a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix index 39dee473cc5a..b70673253edf 100644 --- a/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-screensaver/default.nix @@ -12,7 +12,7 @@ , libxslt , gtk3 , libgnomekbd -, gnome3 +, gnome , libtool , wrapGAppsHook , gobject-introspection @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { cinnamon-desktop cinnamon-common libgnomekbd - gnome3.caribou + gnome.caribou # things iso-flags-png-320x420 diff --git a/pkgs/desktops/cinnamon/cjs/default.nix b/pkgs/desktops/cinnamon/cjs/default.nix index 3c01d0039372..1a1e8132bd63 100644 --- a/pkgs/desktops/cinnamon/cjs/default.nix +++ b/pkgs/desktops/cinnamon/cjs/default.nix @@ -7,7 +7,7 @@ , wrapGAppsHook , python3 , cairo -, gnome3 +, gnome , xapps , keybinder3 , upower @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { glib # bindings - gnome3.caribou + gnome.caribou keybinder3 upower xapps diff --git a/pkgs/desktops/cinnamon/mint-x-icons/default.nix b/pkgs/desktops/cinnamon/mint-x-icons/default.nix index f52b0556d564..f4a04cf33a84 100644 --- a/pkgs/desktops/cinnamon/mint-x-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-x-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme humanity-icon-theme diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index 8d55e81c58c2..e04a1baa6696 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub , lib, stdenv -, gnome3 +, gnome , gnome-icon-theme , hicolor-icon-theme , gtk3 @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; propagatedBuildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/desktops/cinnamon/muffin/default.nix b/pkgs/desktops/cinnamon/muffin/default.nix index 2df5f875b41c..5470933d619b 100644 --- a/pkgs/desktops/cinnamon/muffin/default.nix +++ b/pkgs/desktops/cinnamon/muffin/default.nix @@ -2,7 +2,7 @@ , cinnamon-desktop , glib , file -, gnome3 +, gnome , gnome-doc-utils , fetchpatch , gobject-introspection @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { xorg.xkeyboardconfig libxkbcommon - gnome3.zenity + gnome.zenity libinput libstartup_notification libXtst diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome/apps/accerciser/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/apps/accerciser/default.nix rename to pkgs/desktops/gnome/apps/accerciser/default.nix index e634037b8719..d81b84661941 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome/apps/accerciser/default.nix @@ -1,7 +1,7 @@ { lib , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , gobject-introspection @@ -57,9 +57,9 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "accerciser"; - attrPath = "gnome3.accerciser"; + attrPath = "gnome.accerciser"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome/apps/cheese/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/apps/cheese/default.nix rename to pkgs/desktops/gnome/apps/cheese/default.nix index 75c3060f51df..d0a9d6aaabb1 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome/apps/cheese/default.nix @@ -23,7 +23,7 @@ , librsvg , totem , gdk-pixbuf -, gnome3 +, gnome , gnome-desktop , libxml2 , meson @@ -105,9 +105,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "cheese"; - attrPath = "gnome3.cheese"; + attrPath = "gnome.cheese"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix similarity index 85% rename from pkgs/desktops/gnome-3/apps/file-roller/default.nix rename to pkgs/desktops/gnome/apps/file-roller/default.nix index c6a2a3a64009..6af1994fb060 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome3, gettext, itstool, libxml2, libarchive +{ lib, stdenv, fetchurl, glib, gtk3, meson, ninja, pkg-config, gnome, gettext, itstool, libxml2, libarchive , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales , unzip, cpio }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gettext itstool pkg-config libxml2 python3 wrapGAppsHook glibcLocales desktop-file-utils ]; - buildInputs = [ glib gtk3 json-glib libarchive file gnome3.adwaita-icon-theme libnotify nautilus cpio ]; + buildInputs = [ glib gtk3 json-glib libarchive file gnome.adwaita-icon-theme libnotify nautilus cpio ]; PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; @@ -32,9 +32,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "file-roller"; - attrPath = "gnome3.file-roller"; + attrPath = "gnome.file-roller"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome/apps/gedit/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/apps/gedit/default.nix rename to pkgs/desktops/gnome/apps/gedit/default.nix index 1458d509e61d..a8479e9cdcad 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome/apps/gedit/default.nix @@ -13,7 +13,7 @@ , ninja , libsoup , tepl -, gnome3 +, gnome , gspell , perl , itstool @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gedit"; - attrPath = "gnome3.gedit"; + attrPath = "gnome.gedit"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome/apps/ghex/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/apps/ghex/default.nix rename to pkgs/desktops/gnome/apps/ghex/default.nix index fb8cf0a1a1c7..500e60feb75c 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome/apps/ghex/default.nix @@ -5,7 +5,7 @@ , meson , ninja , python3 -, gnome3 +, gnome , desktop-file-utils , appstream-glib , gettext @@ -68,9 +68,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "ghex"; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome/apps/gnome-books/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/apps/gnome-books/default.nix rename to pkgs/desktops/gnome/apps/gnome-books/default.nix index 2b0aedc9e3e7..0e8b322cf5ed 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-books/default.nix @@ -14,7 +14,7 @@ , webkitgtk , gnome-desktop , libgepub -, gnome3 +, gnome , gdk-pixbuf , gsettings-desktop-schemas , adwaita-icon-theme @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-books"; - attrPath = "gnome3.gnome-books"; + attrPath = "gnome.gnome-books"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix rename to pkgs/desktops/gnome/apps/gnome-boxes/default.nix index 779bfe6886d8..605275be7ded 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-boxes/default.nix @@ -31,7 +31,7 @@ , gmp , gdbm , cyrus_sasl -, gnome3 +, gnome , librsvg , desktop-file-utils , mtools @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { glib glib-networking gmp - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk-vnc gtk3 gtksourceview4 @@ -129,9 +129,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix rename to pkgs/desktops/gnome/apps/gnome-calendar/default.nix index fae4149a1310..3e80575a33db 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-calendar/default.nix @@ -11,7 +11,7 @@ , python3 , gettext , libxml2 -, gnome3 +, gnome , gtk3 , evolution-data-server , libsoup @@ -38,9 +38,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch b/pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch similarity index 100% rename from pkgs/desktops/gnome-3/apps/gnome-calendar/gtk_image_reset_crash.patch rename to pkgs/desktops/gnome/apps/gnome-calendar/gtk_image_reset_crash.patch diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome/apps/gnome-characters/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/apps/gnome-characters/default.nix rename to pkgs/desktops/gnome/apps/gnome-characters/default.nix index b5abee283809..5cbd58d602a9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-characters/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , gettext -, gnome3 +, gnome , glib , gtk3 , pango @@ -72,9 +72,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix rename to pkgs/desktops/gnome/apps/gnome-clocks/default.nix index cd91cef66871..d9a749a24b09 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-clocks/default.nix @@ -18,7 +18,7 @@ , adwaita-icon-theme , gnome-desktop , geocode-glib -, gnome3 +, gnome , gdk-pixbuf , geoclue2 , libgweather @@ -71,9 +71,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; + attrPath = "gnome.gnome-clocks"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix b/pkgs/desktops/gnome/apps/gnome-connections/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/apps/gnome-connections/default.nix rename to pkgs/desktops/gnome/apps/gnome-connections/default.nix index 17f11d0efdc3..abdf751baeb1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-connections/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-connections/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , meson , ninja , vala @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "connections"; attrPath = "gnome-connections"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome/apps/gnome-documents/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/apps/gnome-documents/default.nix rename to pkgs/desktops/gnome/apps/gnome-documents/default.nix index 3172ae271233..3f7ac34696bf 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-documents/default.nix @@ -18,7 +18,7 @@ , gnome-desktop , libzapojit , libgepub -, gnome3 +, gnome , gdk-pixbuf , libsoup , docbook_xsl @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme evince libsoup webkitgtk @@ -110,9 +110,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome/apps/gnome-logs/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/apps/gnome-logs/default.nix rename to pkgs/desktops/gnome/apps/gnome-logs/default.nix index 20b27b2ddd05..da06eb4404c1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-logs/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , wrapGAppsHook @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { gtk3 systemd gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; mesonFlags = [ @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-logs"; - attrPath = "gnome3.gnome-logs"; + attrPath = "gnome.gnome-logs"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome/apps/gnome-maps/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/apps/gnome-maps/default.nix rename to pkgs/desktops/gnome/apps/gnome-maps/default.nix index 673013c8e600..2818215a4ff9 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-maps/default.nix @@ -5,7 +5,7 @@ , gettext , python3 , pkg-config -, gnome3 +, gnome , gtk3 , gobject-introspection , gdk-pixbuf @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { gfbgraph gjs gnome-online-accounts - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gobject-introspection gsettings-desktop-schemas gtk3 @@ -88,9 +88,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome/apps/gnome-music/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/apps/gnome-music/default.nix rename to pkgs/desktops/gnome/apps/gnome-music/default.nix index b50ce59980f5..51e3d5a9cdf3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-music/default.nix @@ -21,7 +21,7 @@ , desktop-file-utils , appstream-glib , itstool -, gnome3 +, gnome , gst_all_1 , libdazzle , libsoup @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { gnome-online-accounts gobject-introspection gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme python3 grilo grilo-plugins @@ -97,9 +97,9 @@ python3.pkgs.buildPythonApplication rec { strictDeps = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix similarity index 82% rename from pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix rename to pkgs/desktops/gnome/apps/gnome-nettool/default.nix index 6fca1c0eea5e..ca75b7aae07f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-nettool/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , libgtop, intltool, itstool, libxml2, nmap, inetutils }: stdenv.mkDerivation rec { @@ -13,15 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ gtk3 wrapGAppsHook libgtop intltool itstool libxml2 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; propagatedUserEnvPkgs = [ nmap inetutils ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "none"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome/apps/gnome-notes/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/apps/gnome-notes/default.nix rename to pkgs/desktops/gnome/apps/gnome-notes/default.nix index afeddd1bb991..6af206069e29 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-notes/default.nix @@ -17,7 +17,7 @@ , curl , libhandy , webkitgtk -, gnome3 +, gnome , libxml2 , gsettings-desktop-schemas , tracker @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { gnome-online-accounts gsettings-desktop-schemas evolution-data-server - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; mesonFlags = [ @@ -71,9 +71,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "bijiben"; - attrPath = "gnome3.gnome-notes"; + attrPath = "gnome.gnome-notes"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix similarity index 89% rename from pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix rename to pkgs/desktops/gnome/apps/gnome-power-manager/default.nix index cb79a772b795..0337f70a20e5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-power-manager/default.nix @@ -10,7 +10,7 @@ , python3 , desktop-file-utils , wrapGAppsHook -, gnome3 }: +, gnome }: let pname = "gnome-power-manager"; @@ -24,9 +24,9 @@ in stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { gtk3 glib upower - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; meta = with lib; { diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix rename to pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix index 3b34fae714cc..29f7aa6e9ee4 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-sound-recorder/default.nix @@ -9,7 +9,7 @@ , gtk3 , gdk-pixbuf , gst_all_1 -, gnome3 +, gnome , meson , ninja , python3 @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome/apps/gnome-todo/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/apps/gnome-todo/default.nix rename to pkgs/desktops/gnome/apps/gnome-todo/default.nix index 34aed52fa851..885f21cf3ec8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-todo/default.nix @@ -7,7 +7,7 @@ , python3 , wrapGAppsHook , gettext -, gnome3 +, gnome , glib , gtk3 , libpeas @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { libpeas gnome-online-accounts gsettings-desktop-schemas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme # Plug-ins evolution-data-server libxml2 @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { preBuild = "ninja src/gtd-vcs-identifier.h"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome/apps/gnome-weather/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/apps/gnome-weather/default.nix rename to pkgs/desktops/gnome/apps/gnome-weather/default.nix index 6cbfea0f5cf3..39c10e82a1c2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome/apps/gnome-weather/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , libhandy , wrapGAppsHook @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { gobject-introspection gnome-desktop libgweather - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme geoclue2 gsettings-desktop-schemas ]; @@ -60,9 +60,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-weather"; - attrPath = "gnome3.gnome-weather"; + attrPath = "gnome.gnome-weather"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome/apps/polari/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/apps/polari/default.nix rename to pkgs/desktops/gnome/apps/polari/default.nix index 727a82e5ff39..0675ccb2f82d 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome/apps/polari/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkg-config, gtk3, glib, libsecret, libsoup, webkitgtk, gobject-introspection, appstream-glib -, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: +, gnome, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let pname = "polari"; @@ -38,9 +38,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch b/pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch similarity index 100% rename from pkgs/desktops/gnome-3/apps/polari/make-thumbnailer-wrappable.patch rename to pkgs/desktops/gnome/apps/polari/make-thumbnailer-wrappable.patch diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome/apps/seahorse/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/apps/seahorse/default.nix rename to pkgs/desktops/gnome/apps/seahorse/default.nix index e44f094be1bf..d46aed7bbe94 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome/apps/seahorse/default.nix @@ -11,7 +11,7 @@ , itstool , gnupg , libsoup -, gnome3 +, gnome , gpgme , python3 , openldap @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { gcr gsettings-desktop-schemas gnupg - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gpgme libsecret avahi @@ -68,9 +68,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome/apps/vinagre/default.nix similarity index 76% rename from pkgs/desktops/gnome-3/apps/vinagre/default.nix rename to pkgs/desktops/gnome/apps/vinagre/default.nix index 49abb2f1a706..31e198783e04 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { @@ -12,15 +12,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool itstool wrapGAppsHook ]; buildInputs = [ - gtk3 vte libxml2 gtk-vnc libsecret gnome3.adwaita-icon-theme librsvg + gtk3 vte libxml2 gtk-vnc libsecret gnome.adwaita-icon-theme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "vinagre"; - attrPath = "gnome3.vinagre"; + attrPath = "gnome.vinagre"; }; }; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix similarity index 86% rename from pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix rename to pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix index ceffe2f012b4..04f8a7a3c37b 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome/core/adwaita-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gnome3 +{ lib, stdenv, fetchurl, pkg-config, intltool, gnome , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { postInstall = '' rm -rf "$out/locale" ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "adwaita-icon-theme"; - attrPath = "gnome3.adwaita-icon-theme"; + attrPath = "gnome.adwaita-icon-theme"; }; }; diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome/core/baobab/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/core/baobab/default.nix rename to pkgs/desktops/gnome/core/baobab/default.nix index 386502a854b8..8d0f9459c3b0 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome/core/baobab/default.nix @@ -14,7 +14,7 @@ , libxml2 , wrapGAppsHook , itstool -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { gtk3 libhandy glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome/core/caribou/default.nix similarity index 90% rename from pkgs/desktops/gnome-3/core/caribou/default.nix rename to pkgs/desktops/gnome/core/caribou/default.nix index 88260f05acf1..5985ff822667 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome/core/caribou/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 +{ fetchurl, lib, stdenv, pkg-config, gnome, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook, libgee }: @@ -38,9 +38,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome/core/dconf-editor/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/core/dconf-editor/default.nix rename to pkgs/desktops/gnome/core/dconf-editor/default.nix index aab9a0db42b6..165980d7e9c1 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome/core/dconf-editor/default.nix @@ -8,7 +8,7 @@ , pkg-config , glib , gtk3 -, gnome3 +, gnome , python3 , dconf , libxml2 @@ -53,9 +53,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome/core/empathy/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/core/empathy/default.nix rename to pkgs/desktops/gnome/core/empathy/default.nix index 8ebb5c3f64f1..fbfee37cd13e 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome/core/empathy/default.nix @@ -7,7 +7,7 @@ , glib , file , librsvg -, gnome3 +, gnome , gdk-pixbuf , python3 , telepathy-glib @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { libcanberra-gtk3 telepathy-farstream farstream - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas librsvg @@ -131,7 +131,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "empathy"; versionPolicy = "none"; }; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/core/eog/default.nix rename to pkgs/desktops/gnome/core/eog/default.nix index 671a66456748..426a87833528 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -9,7 +9,7 @@ , libjpeg , libpeas , libportal -, gnome3 +, gnome , gtk3 , glib , gsettings-desktop-schemas @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/core/epiphany/default.nix rename to pkgs/desktops/gnome/core/epiphany/default.nix index 349a1c024e48..f286d384c4e8 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -8,7 +8,7 @@ , glib , icu , wrapGAppsHook -, gnome3 +, gnome , libportal , libxml2 , libxslt @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { glib glib-networking gnome-desktop - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix similarity index 98% rename from pkgs/desktops/gnome-3/core/evince/default.nix rename to pkgs/desktops/gnome/core/evince/default.nix index 59eb31e19180..3d7f3e0b8356 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -13,7 +13,7 @@ , gdk-pixbuf , shared-mime-info , itstool -, gnome3 +, gnome , poppler , ghostscriptX , djvulibre @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome/core/evolution-data-server/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/core/evolution-data-server/default.nix rename to pkgs/desktops/gnome/core/evolution-data-server/default.nix index dc3f4b493b0c..0ed3565d7f03 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome/core/evolution-data-server/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome3, python3, gobject-introspection +{ fetchurl, lib, stdenv, substituteAll, pkg-config, gnome, python3, gobject-introspection , intltool, libsoup, libxml2, libsecret, icu, sqlite, tzdata, libcanberra-gtk3, gcr, p11-kit , db, nspr, nss, libical, gperf, wrapGAppsHook, glib-networking, pcre, vala, cmake, ninja , libkrb5, openldap, webkitgtk, libaccounts-glib, json-glib, glib, gtk3, libphonenumber @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "evolution-data-server"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch b/pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/evolution-data-server/fix-paths.patch rename to pkgs/desktops/gnome/core/evolution-data-server/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch b/pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/evolution-data-server/hardcode-gsettings.patch rename to pkgs/desktops/gnome/core/evolution-data-server/hardcode-gsettings.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix similarity index 98% rename from pkgs/desktops/gnome-3/core/gdm/default.nix rename to pkgs/desktops/gnome/core/gdm/default.nix index 6c1db6cebd9e..f30449773495 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -13,7 +13,7 @@ , xorg , accountsservice , libX11 -, gnome3 +, gnome , systemd , dconf , gtk3 @@ -160,9 +160,9 @@ stdenv.mkDerivation rec { DESTDIR = "${placeholder "out"}/dest"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gdm"; - attrPath = "gnome3.gdm"; + attrPath = "gnome.gdm"; }; # Used in GDM NixOS module diff --git a/pkgs/desktops/gnome-3/core/gdm/fix-paths.patch b/pkgs/desktops/gnome/core/gdm/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gdm/fix-paths.patch rename to pkgs/desktops/gnome/core/gdm/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch b/pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gdm/gdm-session-worker_forward-vars.patch rename to pkgs/desktops/gnome/core/gdm/gdm-session-worker_forward-vars.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gdm/gdm-x-session_extra_args.patch rename to pkgs/desktops/gnome/core/gdm/gdm-x-session_extra_args.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch b/pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gdm/gdm-x-session_session-wrapper.patch rename to pkgs/desktops/gnome/core/gdm/gdm-x-session_session-wrapper.patch diff --git a/pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override b/pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override similarity index 100% rename from pkgs/desktops/gnome-3/core/gdm/org.gnome.login-screen.gschema.override rename to pkgs/desktops/gnome/core/gdm/org.gnome.login-screen.gschema.override diff --git a/pkgs/desktops/gnome-3/core/gdm/reset-environment.patch b/pkgs/desktops/gnome/core/gdm/reset-environment.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gdm/reset-environment.patch rename to pkgs/desktops/gnome/core/gdm/reset-environment.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix similarity index 70% rename from pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix rename to pkgs/desktops/gnome/core/gnome-backgrounds/default.nix index 2ce529115955..370cd14e4677 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome/core/gnome-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gettext }: stdenv.mkDerivation rec { pname = "gnome-backgrounds"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome3.gnome-backgrounds"; }; + updateScript = gnome.updateScript { packageName = "gnome-backgrounds"; attrPath = "gnome.gnome-backgrounds"; }; }; nativeBuildInputs = [ meson ninja pkg-config gettext ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix rename to pkgs/desktops/gnome/core/gnome-bluetooth/default.nix index e057cc61da81..07b77c04994d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome/core/gnome-bluetooth/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchurl -, gnome3 +, gnome , meson , ninja , pkg-config @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { udev libnotify libcanberra-gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas ]; @@ -70,9 +70,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome/core/gnome-calculator/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/core/gnome-calculator/default.nix rename to pkgs/desktops/gnome/core/gnome-calculator/default.nix index 4bf317a4a260..7e19e9523ce8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome/core/gnome-calculator/default.nix @@ -14,7 +14,7 @@ , wrapGAppsHook , gobject-introspection , python3 -, gnome3 +, gnome , mpfr , gmp , libsoup @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { gtksourceview4 mpfr gmp - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libgee gsettings-desktop-schemas libsoup @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-calculator"; - attrPath = "gnome3.gnome-calculator"; + attrPath = "gnome.gnome-calculator"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix rename to pkgs/desktops/gnome/core/gnome-color-manager/default.nix index 73db99f3d379..dae367f1d5ba 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome/core/gnome-color-manager/default.nix @@ -6,7 +6,7 @@ , gettext , itstool , desktop-file-utils -, gnome3 +, gnome , glib , gtk3 , libexif @@ -51,9 +51,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome/core/gnome-common/default.nix similarity index 80% rename from pkgs/desktops/gnome-3/core/gnome-common/default.nix rename to pkgs/desktops/gnome/core/gnome-common/default.nix index 53e3ed47ebe7..cb50396a4040 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome/core/gnome-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, which, gnome3, autoconf, automake }: +{ lib, stdenv, fetchurl, which, gnome, autoconf, automake }: stdenv.mkDerivation rec { pname = "gnome-common"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-common"; attrPath = "gnome3.gnome-common"; }; + updateScript = gnome.updateScript { packageName = "gnome-common"; attrPath = "gnome.gnome-common"; }; }; patches = [(fetchurl { diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome/core/gnome-contacts/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/core/gnome-contacts/default.nix rename to pkgs/desktops/gnome/core/gnome-contacts/default.nix index 3146ca717d35..62a43d20d580 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome/core/gnome-contacts/default.nix @@ -19,7 +19,7 @@ , folks , libgdata , libxml2 -, gnome3 +, gnome , vala , meson , ninja @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { libxml2 gnome-online-accounts cheese - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libchamplain clutter-gtk geocode-glib @@ -79,9 +79,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-contacts"; - attrPath = "gnome3.gnome-contacts"; + attrPath = "gnome.gnome-contacts"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix similarity index 97% rename from pkgs/desktops/gnome-3/core/gnome-control-center/default.nix rename to pkgs/desktops/gnome/core/gnome-control-center/default.nix index 371f2d794a00..6170f53c716b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -23,7 +23,7 @@ , gnome-desktop , gnome-online-accounts , gnome-settings-daemon -, gnome3 +, gnome , grilo , grilo-plugins , gsettings-desktop-schemas @@ -175,9 +175,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch b/pkgs/desktops/gnome/core/gnome-control-center/paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-control-center/paths.patch rename to pkgs/desktops/gnome/core/gnome-control-center/paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch b/pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-desktop/bubblewrap-paths.patch rename to pkgs/desktops/gnome/core/gnome-desktop/bubblewrap-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-desktop/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/core/gnome-desktop/default.nix rename to pkgs/desktops/gnome/core/gnome-desktop/default.nix index 4294e2db2406..56bd074c2cb9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome/core/gnome-desktop/default.nix @@ -5,7 +5,7 @@ , pkg-config , libxslt , ninja -, gnome3 +, gnome , gtk3 , glib , gettext @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-desktop"; - attrPath = "gnome3.gnome-desktop"; + attrPath = "gnome.gnome-desktop"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix similarity index 81% rename from pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix rename to pkgs/desktops/gnome/core/gnome-dictionary/default.nix index 8ff4145a271a..a399c4e85377 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome/core/gnome-dictionary/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk3, glib, gsettings-desktop-schemas }: +, gnome, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gnome-dictionary"; @@ -17,12 +17,12 @@ stdenv.mkDerivation rec { meson ninja pkg-config wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-dictionary"; - attrPath = "gnome3.gnome-dictionary"; + attrPath = "gnome.gnome-dictionary"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix similarity index 89% rename from pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix rename to pkgs/desktops/gnome/core/gnome-disk-utility/default.nix index 87b89c3a05ba..c11a1df883a0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome/core/gnome-disk-utility/default.nix @@ -15,7 +15,7 @@ , python3 , libnotify , itstool -, gnome3 +, gnome , libxml2 , gsettings-desktop-schemas , libcanberra-gtk3 @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { libdvdread libcanberra-gtk3 udisks2 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme systemd - gnome3.gnome-settings-daemon + gnome.gnome-settings-daemon gsettings-desktop-schemas ]; @@ -69,9 +69,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-disk-utility"; - attrPath = "gnome3.gnome-disk-utility"; + attrPath = "gnome.gnome-disk-utility"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix similarity index 88% rename from pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix rename to pkgs/desktops/gnome/core/gnome-font-viewer/default.nix index 6e9b6d22f57c..622a7de1bffa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome/core/gnome-font-viewer/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, meson, ninja, gettext, fetchurl , pkg-config, gtk3, glib, libxml2, gnome-desktop, adwaita-icon-theme, libhandy -, wrapGAppsHook, gnome3, harfbuzz }: +, wrapGAppsHook, gnome, harfbuzz }: stdenv.mkDerivation rec { pname = "gnome-font-viewer"; @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { preConfigure = "sed -i '2,$ d' meson-postinstall.sh"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; - attrPath = "gnome3.gnome-font-viewer"; + attrPath = "gnome.gnome-font-viewer"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch b/pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-initial-setup/0001-fix-paths.patch rename to pkgs/desktops/gnome/core/gnome-initial-setup/0001-fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix rename to pkgs/desktops/gnome/core/gnome-initial-setup/default.nix index 6cf549dc5cab..6d57e29a596d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome/core/gnome-initial-setup/default.nix @@ -6,7 +6,7 @@ , ninja , pkg-config , wrapGAppsHook -, gnome3 +, gnome , accountsservice , fontconfig , gdm @@ -90,9 +90,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf b/pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-initial-setup/vendor.conf rename to pkgs/desktops/gnome/core/gnome-initial-setup/vendor.conf diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome/core/gnome-keyring/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/core/gnome-keyring/default.nix rename to pkgs/desktops/gnome/core/gnome-keyring/default.nix index 833f58f74a45..8c9815509e2d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/gnome-keyring/default.nix @@ -17,7 +17,7 @@ , wrapGAppsHook , docbook-xsl-nons , docbook_xml_dtd_43 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -86,9 +86,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-keyring"; - attrPath = "gnome3.gnome-keyring"; + attrPath = "gnome.gnome-keyring"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix rename to pkgs/desktops/gnome/core/gnome-online-miners/default.nix index 3cc85053bcef..95fdf35b8831 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome/core/gnome-online-miners/default.nix @@ -5,7 +5,7 @@ , autoreconfHook , pkg-config , glib -, gnome3 +, gnome , libxml2 , libgdata , grilo @@ -100,9 +100,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-online-miners"; - attrPath = "gnome3.gnome-online-miners"; + attrPath = "gnome.gnome-online-miners"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix rename to pkgs/desktops/gnome/core/gnome-remote-desktop/default.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix similarity index 86% rename from pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix rename to pkgs/desktops/gnome/core/gnome-screenshot/default.nix index 35e7b1a0b023..5b02fda3e32f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome/core/gnome-screenshot/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, gettext, libxml2, libhandy, fetchurl, pkg-config, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils -, gnome3, gsettings-desktop-schemas }: +, gnome, gsettings-desktop-schemas }: let pname = "gnome-screenshot"; @@ -22,14 +22,14 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ - gtk3 glib libcanberra-gtk3 libhandy gnome3.adwaita-icon-theme + gtk3 glib libcanberra-gtk3 libhandy gnome.adwaita-icon-theme gsettings-desktop-schemas ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/ctl.nix b/pkgs/desktops/gnome/core/gnome-session/ctl.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-session/ctl.nix rename to pkgs/desktops/gnome/core/gnome-session/ctl.nix diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome/core/gnome-session/default.nix similarity index 86% rename from pkgs/desktops/gnome-3/core/gnome-session/default.nix rename to pkgs/desktops/gnome/core/gnome-session/default.nix index 49363568eab0..c1ebc4362071 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome/core/gnome-session/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome3, glib, gtk3, gsettings-desktop-schemas +{ fetchurl, lib, stdenv, substituteAll, meson, ninja, pkg-config, gnome, glib, gtk3, gsettings-desktop-schemas , gnome-desktop, dbus, json-glib, libICE, xmlto, docbook_xsl, docbook_xml_dtd_412, python3 , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash, gnome-session-ctl }: @@ -32,8 +32,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome3.adwaita-icon-theme - gnome3.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy + glib gtk3 libICE gnome-desktop json-glib xorg.xtrans gnome.adwaita-icon-theme + gnome.gnome-settings-daemon gsettings-desktop-schemas systemd epoxy ]; postPatch = '' @@ -56,8 +56,8 @@ stdenv.mkDerivation rec { wrapProgram "$out/libexec/gnome-session-binary" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ - --suffix XDG_DATA_DIRS : "${gnome3.gnome-shell}/share"\ - --suffix XDG_CONFIG_DIRS : "${gnome3.gnome-settings-daemon}/etc/xdg" + --suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share"\ + --suffix XDG_CONFIG_DIRS : "${gnome.gnome-settings-daemon}/etc/xdg" ''; # We move the GNOME sessions to another output since gnome-session is a dependency of @@ -73,9 +73,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-session"; - attrPath = "gnome3.gnome-session"; + attrPath = "gnome.gnome-session"; }; providedSessions = [ "gnome" "gnome-xorg" ]; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-session/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-session/fix-paths.patch rename to pkgs/desktops/gnome/core/gnome-session/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix rename to pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix index d7e549e28939..e091cf2365af 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/default.nix @@ -5,7 +5,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , perl , gettext , gtk3 @@ -119,9 +119,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-settings-daemon/fix-paths.patch rename to pkgs/desktops/gnome/core/gnome-settings-daemon/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch b/pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-settings-daemon/global-backlight-helper.patch rename to pkgs/desktops/gnome/core/gnome-settings-daemon/global-backlight-helper.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix rename to pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix index 035633d676ad..6c38b7909590 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell-extensions/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, pkg-config, spidermonkey_68, glib -, gnome3, gnome-menus, substituteAll }: +, gnome, gnome-menus, substituteAll }: stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; @@ -11,9 +11,9 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch b/pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-shell-extensions/fix_gmenu.patch rename to pkgs/desktops/gnome/core/gnome-shell-extensions/fix_gmenu.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix similarity index 98% rename from pkgs/desktops/gnome-3/core/gnome-shell/default.nix rename to pkgs/desktops/gnome/core/gnome-shell/default.nix index 078582f439f8..66eaafb2cc79 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , json-glib , gettext , libsecret @@ -208,9 +208,9 @@ stdenv.mkDerivation rec { passthru = { mozillaPlugin = "/lib/mozilla/plugins"; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-shell"; - attrPath = "gnome3.gnome-shell"; + attrPath = "gnome.gnome-shell"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-shell/fix-paths.patch rename to pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch b/pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-shell/shew-gir-path.patch rename to pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch b/pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-shell/wrap-services.patch rename to pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome/core/gnome-software/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/core/gnome-software/default.nix rename to pkgs/desktops/gnome/core/gnome-software/default.nix index d26dc801d693..64cd214e8090 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome/core/gnome-software/default.nix @@ -6,7 +6,7 @@ , meson , ninja , gettext -, gnome3 +, gnome , wrapGAppsHook , packagekit , ostree @@ -104,9 +104,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.gnome-software"; + attrPath = "gnome.gnome-software"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch b/pkgs/desktops/gnome/core/gnome-software/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/gnome-software/fix-paths.patch rename to pkgs/desktops/gnome/core/gnome-software/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix rename to pkgs/desktops/gnome/core/gnome-system-monitor/default.nix index 44e24e7cdf64..77579be6272d 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome/core/gnome-system-monitor/default.nix @@ -15,7 +15,7 @@ , python3 , gsettings-desktop-schemas , itstool -, gnome3 +, gnome , librsvg , gdk-pixbuf , libgtop @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { gtkmm3 libgtop gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme librsvg gsettings-desktop-schemas systemd @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-system-monitor"; - attrPath = "gnome3.gnome-system-monitor"; + attrPath = "gnome.gnome-system-monitor"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome/core/gnome-terminal/default.nix similarity index 79% rename from pkgs/desktops/gnome-3/core/gnome-terminal/default.nix rename to pkgs/desktops/gnome/core/gnome-terminal/default.nix index de5cb767d543..ab3e3aecc035 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome/core/gnome-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome3, dconf, nautilus +{ lib, stdenv, fetchurl, pkg-config, libxml2, gnome, dconf, nautilus , gtk3, gsettings-desktop-schemas, vte, gettext, which, libuuid, vala , desktop-file-utils, itstool, wrapGAppsHook, pcre2 , libxslt, docbook-xsl-nons }: @@ -26,16 +26,16 @@ stdenv.mkDerivation rec { # Silly ./configure, it looks for dbus file from gnome-shell in the # installation tree of the package it is configuring. postPatch = '' - substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" - substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome3.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace configure --replace '$(eval echo $(eval echo $(eval echo ''${dbusinterfacedir})))/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" + substituteInPlace src/Makefile.in --replace '$(dbusinterfacedir)/org.gnome.ShellSearchProvider2.xml' "${gnome.gnome-shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" ''; configureFlags = [ "--disable-migration" ]; # TODO: remove this with 3.30 passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-terminal"; - attrPath = "gnome3.gnome-terminal"; + attrPath = "gnome.gnome-terminal"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix similarity index 78% rename from pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix rename to pkgs/desktops/gnome/core/gnome-themes-extra/default.nix index 7b42d724593a..53f775833a8f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome/core/gnome-themes-extra/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkg-config, pango, atk, gtk2 +{ lib, stdenv, fetchurl, intltool, gtk3, gnome, librsvg, pkg-config, pango, atk, gtk2 , gdk-pixbuf, hicolor-icon-theme }: let @@ -13,14 +13,14 @@ in stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; nativeBuildInputs = [ pkg-config intltool ]; buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; - propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome.adwaita-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome/core/gnome-tour/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/core/gnome-tour/default.nix rename to pkgs/desktops/gnome/core/gnome-tour/default.nix index 4e6c58a14e8f..7440749e0a9b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome/core/gnome-tour/default.nix @@ -13,7 +13,7 @@ , appstream-glib , wrapGAppsHook , python3 -, gnome3 +, gnome , libhandy , librsvg , rustc @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome/core/gnome-user-share/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/core/gnome-user-share/default.nix rename to pkgs/desktops/gnome/core/gnome-user-share/default.nix index 54fcf531c658..211326cfcdbd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome/core/gnome-user-share/default.nix @@ -15,7 +15,7 @@ , itstool , libnotify , mod_dnssd -, gnome3 +, gnome , libcanberra-gtk3 , python3 }: @@ -80,9 +80,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome/core/gucharmap/default.nix similarity index 97% rename from pkgs/desktops/gnome-3/core/gucharmap/default.nix rename to pkgs/desktops/gnome/core/gucharmap/default.nix index aac5a43e4339..336a4d260c4e 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome/core/gucharmap/default.nix @@ -11,7 +11,7 @@ , desktop-file-utils , gtk-doc , wrapGAppsHook -, gnome3 +, gnome , itstool , libxml2 , yelp-tools @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix rename to pkgs/desktops/gnome/core/libgnome-keyring/default.nix index f4b76996ac4b..aa3c7ed39811 100644 --- a/pkgs/desktops/gnome-3/core/libgnome-keyring/default.nix +++ b/pkgs/desktops/gnome/core/libgnome-keyring/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, glib, dbus, libgcrypt, pkg-config, intltool, gobject-introspection, gnome }: let pname = "libgnome-keyring"; diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch rename to pkgs/desktops/gnome/core/mutter/3.34/0001-EGL-Include-EGL-eglmesaext.h.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/3.34/0002-drop-inheritable.patch rename to pkgs/desktops/gnome/core/mutter/3.34/0002-drop-inheritable.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch b/pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/3.34/0003-Fix-glitches-in-gala.patch rename to pkgs/desktops/gnome/core/mutter/3.34/0003-Fix-glitches-in-gala.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch b/pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch rename to pkgs/desktops/gnome/core/mutter/3.34/0004-profiler-track-changes-in-GLib-and-Sysprof.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch b/pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch rename to pkgs/desktops/gnome/core/mutter/3.34/0005-meta-Add-missing-display.h-to-meta-workspace-manager.h.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch b/pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch rename to pkgs/desktops/gnome/core/mutter/3.34/0006-build-bump-ABI-to-sysprof-capture-4.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch b/pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/3.34/0007-fix-paths.patch rename to pkgs/desktops/gnome/core/mutter/3.34/0007-fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome/core/mutter/3.34/default.nix similarity index 99% rename from pkgs/desktops/gnome-3/core/mutter/3.34/default.nix rename to pkgs/desktops/gnome/core/mutter/3.34/default.nix index 1f4ca5d3213d..42f07d45e62f 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.34/default.nix @@ -3,7 +3,7 @@ , substituteAll , lib, stdenv , pkg-config -, gnome3 +, gnome , pantheon , gettext , gobject-introspection diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome/core/mutter/default.nix similarity index 97% rename from pkgs/desktops/gnome-3/core/mutter/default.nix rename to pkgs/desktops/gnome/core/mutter/default.nix index 2dda38bb4e7d..9f6a64ef1829 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome/core/mutter/default.nix @@ -4,7 +4,7 @@ , runCommand , lib, stdenv , pkg-config -, gnome3 +, gnome , gettext , gobject-introspection , cairo @@ -153,9 +153,9 @@ let self = stdenv.mkDerivation rec { ''; }; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome/core/mutter/drop-inheritable.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch rename to pkgs/desktops/gnome/core/mutter/drop-inheritable.patch diff --git a/pkgs/desktops/gnome-3/core/mutter/fix-paths.patch b/pkgs/desktops/gnome/core/mutter/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/mutter/fix-paths.patch rename to pkgs/desktops/gnome/core/mutter/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome/core/nautilus/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/core/nautilus/default.nix rename to pkgs/desktops/gnome/core/nautilus/default.nix index 29c44ecd6e90..f3ccdbce98cb 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome/core/nautilus/default.nix @@ -11,7 +11,7 @@ , gtk3 , libhandy , libportal -, gnome3 +, gnome , gnome-autoar , glib-networking , shared-mime-info @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { gexiv2 glib-networking gnome-desktop - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas gst_all_1.gst-plugins-base gtk3 @@ -102,9 +102,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome/core/nautilus/extension_dir.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/nautilus/extension_dir.patch rename to pkgs/desktops/gnome/core/nautilus/extension_dir.patch diff --git a/pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch b/pkgs/desktops/gnome/core/nautilus/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/nautilus/fix-paths.patch rename to pkgs/desktops/gnome/core/nautilus/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch b/pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch similarity index 100% rename from pkgs/desktops/gnome-3/core/rygel/add-option-for-installation-sysconfdir.patch rename to pkgs/desktops/gnome/core/rygel/add-option-for-installation-sysconfdir.patch diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome/core/rygel/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/core/rygel/default.nix rename to pkgs/desktops/gnome/core/rygel/default.nix index da82d30214ee..f43df23f44a1 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome/core/rygel/default.nix @@ -23,7 +23,7 @@ , systemd , tracker , shared-mime-info -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -93,9 +93,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome/core/simple-scan/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/core/simple-scan/default.nix rename to pkgs/desktops/gnome/core/simple-scan/default.nix index 59d61febc06a..91ac4f14b22a 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome/core/simple-scan/default.nix @@ -19,7 +19,7 @@ , libxml2 , sane-backends , vala -, gnome3 +, gnome , gobject-introspection }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gdk-pixbuf colord glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gusb gtk3 libhandy @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "simple-scan"; }; }; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome/core/sushi/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/core/sushi/default.nix rename to pkgs/desktops/gnome/core/sushi/default.nix index 73097f99e516..c42b6964bf65 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome/core/sushi/default.nix @@ -5,7 +5,7 @@ , gettext , gobject-introspection , glib -, gnome3 +, gnome , gtksourceview4 , gjs , webkitgtk @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gtk3 - gnome3.evince + gnome.evince icu harfbuzz gjs @@ -67,9 +67,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "sushi"; - attrPath = "gnome3.sushi"; + attrPath = "gnome.sushi"; }; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome/core/totem/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/core/totem/default.nix rename to pkgs/desktops/gnome/core/totem/default.nix index a98265ff508b..f7541fe12edf 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome/core/totem/default.nix @@ -17,7 +17,7 @@ , itstool , libxml2 , vala -, gnome3 +, gnome , grilo , grilo-plugins , libpeas @@ -107,9 +107,9 @@ stdenv.mkDerivation rec { wrapPrefixVariables = [ "PYTHONPATH" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "totem"; - attrPath = "gnome3.totem"; + attrPath = "gnome.totem"; }; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome/core/yelp-xsl/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/core/yelp-xsl/default.nix rename to pkgs/desktops/gnome/core/yelp-xsl/default.nix index c5e859954fff..7c9b4eb839c0 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome/core/yelp-xsl/default.nix @@ -5,7 +5,7 @@ , itstool , libxml2 , libxslt -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -28,9 +28,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome/core/yelp/default.nix similarity index 87% rename from pkgs/desktops/gnome-3/core/yelp/default.nix rename to pkgs/desktops/gnome/core/yelp/default.nix index 1e1d679f852e..f4df80f5611f 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome/core/yelp/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, gettext, fetchurl, webkitgtk, pkg-config, gtk3, glib -, gnome3, sqlite +, gnome, sqlite , itstool, libxml2, libxslt, gst_all_1 , wrapGAppsHook }: @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config gettext itstool wrapGAppsHook ]; buildInputs = [ gtk3 glib webkitgtk sqlite - libxml2 libxslt gnome3.yelp-xsl - gnome3.adwaita-icon-theme + libxml2 libxslt gnome.yelp-xsl + gnome.adwaita-icon-theme gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "yelp"; }; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome/core/zenity/default.nix similarity index 90% rename from pkgs/desktops/gnome-3/core/zenity/default.nix rename to pkgs/desktops/gnome/core/zenity/default.nix index d02cb581cb8c..51ad81a77a46 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome/core/zenity/default.nix @@ -2,7 +2,7 @@ , fetchurl , pkg-config , libxml2 -, gnome3 +, gnome , gtk3 , yelp-tools , gettext @@ -35,9 +35,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "zenity"; - attrPath = "gnome3.zenity"; + attrPath = "gnome.zenity"; }; }; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/default.nix rename to pkgs/desktops/gnome/default.nix index 7d72e16c326d..b529a65026d7 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome/default.nix @@ -20,7 +20,6 @@ lib.makeScope pkgs.newScope (self: with self; { libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; - gnome3 = self // { recurseForDerivations = false; }; # ISO installer # installerIso = callPackage ./installer.nix {}; @@ -330,9 +329,9 @@ lib.makeScope pkgs.newScope (self: with self; { pidgin-im-gnome-shell-extension = pkgs.gnomeExtensions.pidgin-im-integration; # added 2019-08-01 # added 2019-08-25 - corePackages = throw "gnome3.corePackages is removed since 2019-08-25: please use `services.gnome3.core-shell.enable`"; - optionalPackages = throw "gnome3.optionalPackages is removed since 2019-08-25: please use `services.gnome3.core-utilities.enable`"; - gamesPackages = throw "gnome3.gamesPackages is removed since 2019-08-25: please use `services.gnome3.games.enable`"; + corePackages = throw "gnome.corePackages is removed since 2019-08-25: please use `services.gnome.core-shell.enable`"; + optionalPackages = throw "gnome.optionalPackages is removed since 2019-08-25: please use `services.gnome.core-utilities.enable`"; + gamesPackages = throw "gnome.gamesPackages is removed since 2019-08-25: please use `services.gnome.games.enable`"; nautilus-sendto = throw "nautilus-sendto is removed since 2019-09-17: abandoned upstream"; @@ -361,4 +360,7 @@ lib.makeScope pkgs.newScope (self: with self; { mutter328 = throw "Removed as Pantheon is upgraded to mutter334."; gnome-getting-started-docs = throw "Removed in favour of gnome-tour."; + + # Added 2021-05-07 + gnome3 = self // { recurseForDerivations = false; }; }) diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome/devtools/anjuta/default.nix similarity index 84% rename from pkgs/desktops/gnome-3/devtools/anjuta/default.nix rename to pkgs/desktops/gnome/devtools/anjuta/default.nix index 4802287cb122..5b841557b6b2 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome/devtools/anjuta/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, gjs, flex, bison, libxml2, intltool, +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, gjs, flex, bison, libxml2, intltool, gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "anjuta"; attrPath = "gnome3.anjuta"; }; + updateScript = gnome.updateScript { packageName = "anjuta"; attrPath = "gnome.anjuta"; }; }; enableParallelBuilding = true; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome/devtools/devhelp/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/devtools/devhelp/default.nix rename to pkgs/desktops/gnome/devtools/devhelp/default.nix index 9a68f151b4ad..46491cffc5f6 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome/devtools/devhelp/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , glib @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { gtk3 webkitgtk amtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gsettings-desktop-schemas ]; @@ -64,9 +64,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "devhelp"; - attrPath = "gnome3.devhelp"; + attrPath = "gnome.devhelp"; }; }; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix similarity index 76% rename from pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix rename to pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix index 6349a318456c..501aaa91c978 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome/devtools/gnome-devel-docs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: +{ lib, stdenv, fetchurl, gnome, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { pname = "gnome-devel-docs"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome3.gnome-devel-docs"; }; + updateScript = gnome.updateScript { packageName = "gnome-devel-docs"; attrPath = "gnome.gnome-devel-docs"; }; }; buildInputs = [ intltool itstool libxml2 ]; diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix similarity index 89% rename from pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix rename to pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix index fa1d89173fdd..57d78bf756ab 100644 --- a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/default.nix +++ b/pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome3, gettext }: +{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-EasyScreenCast"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-gi-path.patch; - gnomeShell = gnome3.gnome-shell; + gnomeShell = gnome.gnome-shell; }) ]; diff --git a/pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch b/pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/EasyScreenCast/fix-gi-path.patch rename to pkgs/desktops/gnome/extensions/EasyScreenCast/fix-gi-path.patch diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome/extensions/appindicator/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/extensions/appindicator/default.nix rename to pkgs/desktops/gnome/extensions/appindicator/default.nix index aaf8c92c672d..0906d7629563 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome/extensions/appindicator/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-appindicator"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "AppIndicator/KStatusNotifierItem support for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/Ubuntu/gnome-shell-extension-appindicator"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/default.nix b/pkgs/desktops/gnome/extensions/arcmenu/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/arcmenu/default.nix rename to pkgs/desktops/gnome/extensions/arcmenu/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch b/pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/arcmenu/fix_gmenu.patch rename to pkgs/desktops/gnome/extensions/arcmenu/fix_gmenu.patch diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome/extensions/caffeine/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/extensions/caffeine/default.nix rename to pkgs/desktops/gnome/extensions/caffeine/default.nix index 41155391f89c..3085a4461e71 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome/extensions/caffeine/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gettext, bash, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-caffeine"; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix rename to pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix index f6adf85de4d0..779d7506abf5 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/chrome-gnome-shell/default.nix @@ -4,7 +4,7 @@ , ninja , jq , python3 -, gnome3 +, gnome , wrapGAppsHook , gobject-introspection }: @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gnome3.gnome-shell + gnome.gnome-shell python pygobject3 requests @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "chrome-gnome-shell"; }; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "GNOME Shell integration for Chrome"; homepage = "https://wiki.gnome.org/Projects/GnomeShellIntegrationForChrome"; longDescription = '' - To use the integration, install the browser extension, and then set to true. + To use the integration, install the browser extension, and then set to true. ''; license = licenses.gpl3; maintainers = teams.gnome.members; diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix rename to pkgs/desktops/gnome/extensions/clipboard-indicator/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix b/pkgs/desktops/gnome/extensions/clock-override/default.nix similarity index 90% rename from pkgs/desktops/gnome-3/extensions/clock-override/default.nix rename to pkgs/desktops/gnome/extensions/clock-override/default.nix index 6d3a752c886f..3e02d33857a6 100644 --- a/pkgs/desktops/gnome-3/extensions/clock-override/default.nix +++ b/pkgs/desktops/gnome/extensions/clock-override/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, gnome3, gettext, glib }: +{ lib, stdenv, fetchzip, gnome, gettext, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-clock-override"; @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; + broken = versionOlder gnome.gnome-shell.version "3.18"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome/extensions/dash-to-dock/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix rename to pkgs/desktops/gnome/extensions/dash-to-dock/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome/extensions/dash-to-panel/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix rename to pkgs/desktops/gnome/extensions/dash-to-panel/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix b/pkgs/desktops/gnome/extensions/disable-unredirect/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/disable-unredirect/default.nix rename to pkgs/desktops/gnome/extensions/disable-unredirect/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix similarity index 88% rename from pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix rename to pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix index 0e0dab64be16..90e8bffeec97 100644 --- a/pkgs/desktops/gnome-3/extensions/draw-on-your-screen/default.nix +++ b/pkgs/desktops/gnome/extensions/draw-on-your-screen/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, gettext, gnome3 }: +{ lib, stdenv, fetchgit, gettext, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-draw-on-your-screen"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A drawing extension for GNOME Shell"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ericdallo ahuzik ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://framagit.org/abakkk/DrawOnYourScreen"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix rename to pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix index 8cd567a590db..a994e427fb0e 100644 --- a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/default.nix +++ b/pkgs/desktops/gnome/extensions/drop-down-terminal/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome3 }: +{ lib, stdenv, fetchFromGitHub, substituteAll, gjs, vte, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-drop-down-terminal"; diff --git a/pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch b/pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/drop-down-terminal/fix_vte_and_gjs.patch rename to pkgs/desktops/gnome/extensions/drop-down-terminal/fix_vte_and_gjs.patch diff --git a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix similarity index 90% rename from pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix rename to pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix index bf637ecab183..f31e170b975d 100644 --- a/pkgs/desktops/gnome-3/extensions/dynamic-panel-transparency/default.nix +++ b/pkgs/desktops/gnome/extensions/dynamic-panel-transparency/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3, glib }: +{ lib, stdenv, fetchFromGitHub, gnome, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-dynamic-panel-transparency"; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/ewlsh/dynamic-panel-transparency"; - broken = versionOlder gnome3.gnome-shell.version "3.36"; + broken = versionOlder gnome.gnome-shell.version "3.36"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix b/pkgs/desktops/gnome/extensions/emoji-selector/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/emoji-selector/default.nix rename to pkgs/desktops/gnome/extensions/emoji-selector/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/freon/default.nix b/pkgs/desktops/gnome/extensions/freon/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/freon/default.nix rename to pkgs/desktops/gnome/extensions/freon/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix similarity index 87% rename from pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix rename to pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix index f8a8803435ba..302b21f2aefc 100755 --- a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/default.nix +++ b/pkgs/desktops/gnome/extensions/fuzzy-app-search/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, gnome3, glib }: +{ lib, stdenv, fetchFromGitLab, gnome, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-fuzzy-app-search"; @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://gitlab.com/Czarlie/gnome-fuzzy-app-search"; - broken = versionOlder gnome3.gnome-shell.version "3.18"; + broken = versionOlder gnome.gnome-shell.version "3.18"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch b/pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/fuzzy-app-search/fix-desktop-file-paths.patch rename to pkgs/desktops/gnome/extensions/fuzzy-app-search/fix-desktop-file-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/extensions/gsconnect/default.nix rename to pkgs/desktops/gnome/extensions/gsconnect/default.nix index d432043d380b..c924b4e3eca0 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -12,7 +12,7 @@ , glib-networking , gtk3 , openssh -, gnome3 +, gnome , gjs , nixosTests }: @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { gtk3 gsound gjs # for running daemon - gnome3.evolution-data-server # for libebook-contacts typelib + gnome.evolution-data-server # for libebook-contacts typelib ]; mesonFlags = [ - "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" + "-Dgnome_shell_libdir=${gnome.gnome-shell}/lib" "-Dgsettings_schemadir=${glib.makeSchemaPath (placeholder "out") "${pname}-${version}"}" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch b/pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/gsconnect/fix-paths.patch rename to pkgs/desktops/gnome/extensions/gsconnect/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch b/pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/gsconnect/installed-tests-path.patch rename to pkgs/desktops/gnome/extensions/gsconnect/installed-tests-path.patch diff --git a/pkgs/desktops/gnome-3/extensions/hot-edge/default.nix b/pkgs/desktops/gnome/extensions/hot-edge/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/hot-edge/default.nix rename to pkgs/desktops/gnome/extensions/hot-edge/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome/extensions/icon-hider/default.nix similarity index 81% rename from pkgs/desktops/gnome-3/extensions/icon-hider/default.nix rename to pkgs/desktops/gnome/extensions/icon-hider/default.nix index 00c67421e54a..820d96988c9a 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome/extensions/icon-hider/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-icon-hider"; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { description = "Icon Hider is a GNOME Shell extension for managing status area items"; license = licenses.bsd3; maintainers = with maintainers; [ jonafato ]; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/impatience/default.nix b/pkgs/desktops/gnome/extensions/impatience/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/impatience/default.nix rename to pkgs/desktops/gnome/extensions/impatience/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/pkgs/desktops/gnome/extensions/material-shell/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/extensions/material-shell/default.nix rename to pkgs/desktops/gnome/extensions/material-shell/default.nix index 87b9a3c1507c..9b683c1af6b5 100644 --- a/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/pkgs/desktops/gnome/extensions/material-shell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, gnome3 }: +{ stdenv, lib, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ benley ]; homepage = "https://github.com/material-shell/material-shell"; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; }; } diff --git a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix similarity index 84% rename from pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix rename to pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix index 9ab2168d2dca..8d9faaa89add 100644 --- a/pkgs/desktops/gnome-3/extensions/mpris-indicator-button/default.nix +++ b/pkgs/desktops/gnome/extensions/mpris-indicator-button/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -34,9 +34,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple MPRIS indicator button for GNOME Shell"; license = licenses.gpl3; - maintainers = with maintainers; [ worldofpeace ]; - platforms = gnome3.gnome-shell.meta.platforms; + maintainers = with maintainers; [ ]; + platforms = gnome.gnome-shell.meta.platforms; homepage = "https://github.com/JasonLG1979/gnome-shell-extension-mpris-indicator-button"; - broken = versionOlder gnome3.gnome-shell.version "3.34"; + broken = versionOlder gnome.gnome-shell.version "3.34"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix similarity index 89% rename from pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix rename to pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix index f663aa8977b1..fd0d2dbb5784 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome/extensions/night-theme-switcher/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, glib, gnome3, unzip }: +{ lib, stdenv, fetchFromGitLab, glib, gnome, unzip }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ unzip ]; - buildInputs = [ glib gnome3.gnome-shell ]; + buildInputs = [ glib gnome.gnome-shell ]; uuid = "nightthemeswitcher@romainvigier.fr"; diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome/extensions/no-title-bar/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix rename to pkgs/desktops/gnome/extensions/no-title-bar/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch b/pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/no-title-bar/fix-paths.patch rename to pkgs/desktops/gnome/extensions/no-title-bar/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/noannoyance/default.nix b/pkgs/desktops/gnome/extensions/noannoyance/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/noannoyance/default.nix rename to pkgs/desktops/gnome/extensions/noannoyance/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/paperwm/default.nix b/pkgs/desktops/gnome/extensions/paperwm/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/paperwm/default.nix rename to pkgs/desktops/gnome/extensions/paperwm/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix similarity index 87% rename from pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix rename to pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix index d16477403474..93ffcda830a1 100644 --- a/pkgs/desktops/gnome-3/extensions/pidgin-im-integration/default.nix +++ b/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, glib, gnome3 }: +{ lib, stdenv, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-pidgin-im-integration"; @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ ]; - broken = versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix rename to pkgs/desktops/gnome/extensions/remove-dropdown-arrows/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/default.nix rename to pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/sound-output-device-chooser/fix-paths.patch rename to pkgs/desktops/gnome/extensions/sound-output-device-chooser/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome/extensions/system-monitor/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/extensions/system-monitor/default.nix rename to pkgs/desktops/gnome/extensions/system-monitor/default.nix index 3935150c57e5..e7b5e8a1a9c1 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome/extensions/system-monitor/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome3 }: +{ lib, stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-system-monitor"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./paths_and_nonexisting_dirs.patch; - clutter_path = gnome3.mutter.libdir; # this should not be used in settings but 🤷‍♀️ + clutter_path = gnome.mutter.libdir; # this should not be used in settings but 🤷‍♀️ gtop_path = "${libgtop}/lib/girepository-1.0"; glib_net_path = "${glib-networking}/lib/girepository-1.0"; }) diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch b/pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/system-monitor/paths_and_nonexisting_dirs.patch rename to pkgs/desktops/gnome/extensions/system-monitor/paths_and_nonexisting_dirs.patch diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome/extensions/taskwhisperer/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix rename to pkgs/desktops/gnome/extensions/taskwhisperer/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch b/pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/extensions/taskwhisperer/fix-paths.patch rename to pkgs/desktops/gnome/extensions/taskwhisperer/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix b/pkgs/desktops/gnome/extensions/tilingnome/default.nix similarity index 90% rename from pkgs/desktops/gnome-3/extensions/tilingnome/default.nix rename to pkgs/desktops/gnome/extensions/tilingnome/default.nix index dcea4c69ff82..c1ca77d9d73f 100644 --- a/pkgs/desktops/gnome-3/extensions/tilingnome/default.nix +++ b/pkgs/desktops/gnome/extensions/tilingnome/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, glib, gnome3 }: +{ stdenv, lib, fetchFromGitHub, glib, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-tilingnome-unstable"; @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ benley ]; homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; - platforms = gnome3.gnome-shell.meta.platforms; + platforms = gnome.gnome-shell.meta.platforms; }; } diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome/extensions/timepp/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/extensions/timepp/default.nix rename to pkgs/desktops/gnome/extensions/timepp/default.nix index 94b8540c1bf3..cb4234a2513c 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome/extensions/timepp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-timepp"; diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome/extensions/topicons-plus/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix rename to pkgs/desktops/gnome/extensions/topicons-plus/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome/extensions/unite/default.nix similarity index 89% rename from pkgs/desktops/gnome-3/extensions/unite/default.nix rename to pkgs/desktops/gnome/extensions/unite/default.nix index 79d7a335239b..1fbd31ec10a5 100644 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/pkgs/desktops/gnome/extensions/unite/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: +{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Only; maintainers = with maintainers; [ rhoriguchi ]; homepage = "https://github.com/hardpixel/unite-shell"; - broken = versionOlder gnome3.gnome-shell.version "3.32"; + broken = versionOlder gnome.gnome-shell.version "3.32"; }; } diff --git a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix similarity index 86% rename from pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix rename to pkgs/desktops/gnome/extensions/window-corner-preview/default.nix index 42f226e96777..0e71345bb8a7 100644 --- a/pkgs/desktops/gnome-3/extensions/window-corner-preview/default.nix +++ b/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gnome3 }: +{ lib, stdenv, fetchFromGitHub, gnome }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-window-corner-preview"; @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ jtojnar ]; homepage = "https://github.com/medenagan/window-corner-preview"; - broken = lib.versionAtLeast gnome3.gnome-shell.version "3.32"; # Doesn't support 3.34 + broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 }; } diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix rename to pkgs/desktops/gnome/extensions/window-is-ready-remover/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix b/pkgs/desktops/gnome/extensions/workspace-matrix/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/extensions/workspace-matrix/default.nix rename to pkgs/desktops/gnome/extensions/workspace-matrix/default.nix diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome/find-latest-version.py similarity index 100% rename from pkgs/desktops/gnome-3/find-latest-version.py rename to pkgs/desktops/gnome/find-latest-version.py diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome/games/aisleriot/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/games/aisleriot/default.nix rename to pkgs/desktops/gnome/games/aisleriot/default.nix index bb513df4c7a9..8893846698e8 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome/games/aisleriot/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchFromGitLab , pkg-config -, gnome3 +, gnome , itstool , gtk3 , wrapGAppsHook @@ -61,9 +61,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome/games/atomix/default.nix similarity index 84% rename from pkgs/desktops/gnome-3/games/atomix/default.nix rename to pkgs/desktops/gnome/games/atomix/default.nix index 802d92bf19a0..43d9aaa7680c 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome/games/atomix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, wrapGAppsHook, python3 -, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }: +, gettext, gnome, glib, gtk3, libgnome-games-support, gdk-pixbuf }: let pname = "atomix"; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ meson ninja pkg-config gettext wrapGAppsHook python3 ]; - buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py @@ -21,9 +21,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome/games/five-or-more/default.nix similarity index 80% rename from pkgs/desktops/gnome-3/games/five-or-more/default.nix rename to pkgs/desktops/gnome/games/five-or-more/default.nix index 9f6ea6aac04c..f01d137979ec 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome/games/five-or-more/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vala ]; buildInputs = [ - gtk3 librsvg libgnome-games-support gnome3.adwaita-icon-theme + gtk3 librsvg libgnome-games-support gnome.adwaita-icon-theme ]; postPatch = '' @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "five-or-more"; - attrPath = "gnome3.five-or-more"; + attrPath = "gnome.five-or-more"; }; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome/games/four-in-a-row/default.nix similarity index 81% rename from pkgs/desktops/gnome-3/games/four-in-a-row/default.nix rename to pkgs/desktops/gnome/games/four-in-a-row/default.nix index 17dc8fe7c2c7..2c6899ee1aa9 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome/games/four-in-a-row/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , gettext, meson, gsound, librsvg, itstool, vala , python3, ninja, desktop-file-utils }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pkg-config wrapGAppsHook gettext meson itstool vala ninja python3 desktop-file-utils ]; - buildInputs = [ gtk3 gsound librsvg gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 gsound librsvg gnome.adwaita-icon-theme ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "four-in-a-row"; - attrPath = "gnome3.four-in-a-row"; + attrPath = "gnome.four-in-a-row"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome/games/gnome-chess/default.nix similarity index 90% rename from pkgs/desktops/gnome-3/games/gnome-chess/default.nix rename to pkgs/desktops/gnome/games/gnome-chess/default.nix index c8bea5a98d2d..c632bce407bc 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome/games/gnome-chess/default.nix @@ -11,7 +11,7 @@ , itstool , libxml2 , python3 -, gnome3 +, gnome , glib , gtk4 , librsvg @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { glib gtk4 librsvg - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; postPatch = '' @@ -52,9 +52,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-chess"; - attrPath = "gnome3.gnome-chess"; + attrPath = "gnome.gnome-chess"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome/games/gnome-klotski/default.nix similarity index 82% rename from pkgs/desktops/gnome-3/games/gnome-klotski/default.nix rename to pkgs/desktops/gnome/games/gnome-klotski/default.nix index 4bafc3b4a8d6..bb4cdae8fa35 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome/games/gnome-klotski/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gnome3, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils +{ lib, stdenv, fetchurl, pkg-config, vala, gnome, gtk3, wrapGAppsHook, appstream-glib, desktop-file-utils , glib, librsvg, libxml2, gettext, itstool, libgee, libgnome-games-support , meson, ninja, python3 }: @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config vala meson ninja python3 wrapGAppsHook gettext itstool libxml2 appstream-glib desktop-file-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; buildInputs = [ glib gtk3 librsvg libgee libgnome-games-support ]; @@ -27,9 +27,9 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix similarity index 82% rename from pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix rename to pkgs/desktops/gnome/games/gnome-mahjongg/default.nix index d5d2de53e47c..7ef68e470e1d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mahjongg/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, gettext, itstool, libxml2 , meson, ninja, glib, vala, desktop-file-utils }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook glib # for glib-compile-schemas ]; @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome/games/gnome-mines/default.nix similarity index 83% rename from pkgs/desktops/gnome-3/games/gnome-mines/default.nix rename to pkgs/desktops/gnome/games/gnome-mines/default.nix index f074fb08daa9..6a7168badbfe 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome/games/gnome-mines/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, gobject-introspection, pkg-config, gnome, gtk3, wrapGAppsHook , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meson ninja vala gobject-introspection pkg-config gettext itstool python3 libxml2 wrapGAppsHook desktop-file-utils ]; - buildInputs = [ gtk3 librsvg gnome3.adwaita-icon-theme libgnome-games-support libgee ]; + buildInputs = [ gtk3 librsvg gnome.adwaita-icon-theme libgnome-games-support libgee ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-mines"; - attrPath = "gnome3.gnome-mines"; + attrPath = "gnome.gnome-mines"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix rename to pkgs/desktops/gnome/games/gnome-nibbles/default.nix index c3d9fb19725a..34b50f2244fa 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome/games/gnome-nibbles/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , librsvg @@ -62,15 +62,15 @@ stdenv.mkDerivation rec { librsvg gsound clutter-gtk - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libgee libgnome-games-support ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-nibbles"; - attrPath = "gnome3.gnome-nibbles"; + attrPath = "gnome.gnome-nibbles"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome/games/gnome-robots/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/games/gnome-robots/default.nix rename to pkgs/desktops/gnome/games/gnome-robots/default.nix index 1a49ee387609..c9f7cbfc213b 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome/games/gnome-robots/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , librsvg @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-robots"; - attrPath = "gnome3.gnome-robots"; + attrPath = "gnome.gnome-robots"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix similarity index 88% rename from pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix rename to pkgs/desktops/gnome/games/gnome-sudoku/default.nix index 101f3c4f2bd0..3bd0ec3b3cdf 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome/games/gnome-sudoku/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome3, wrapGAppsHook +{ lib, stdenv, fetchurl, meson, ninja, vala, pkg-config, gobject-introspection, gettext, gtk3, gnome, wrapGAppsHook , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { @@ -19,9 +19,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-sudoku"; - attrPath = "gnome3.gnome-sudoku"; + attrPath = "gnome.gnome-sudoku"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome/games/gnome-taquin/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/games/gnome-taquin/default.nix rename to pkgs/desktops/gnome/games/gnome-taquin/default.nix index 91bd96373446..c3e78ff20144 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome/games/gnome-taquin/default.nix @@ -3,7 +3,7 @@ , fetchurl , fetchpatch , pkg-config -, gnome3 +, gnome , gtk3 , wrapGAppsHook , librsvg @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { gtk3 librsvg gsound - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-taquin"; - attrPath = "gnome3.gnome-taquin"; + attrPath = "gnome.gnome-taquin"; }; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix similarity index 78% rename from pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix rename to pkgs/desktops/gnome/games/gnome-tetravex/default.nix index 9ae737737993..a1cdf98d9a15 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome/games/gnome-tetravex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnome3, gtk3, wrapGAppsHook +{ lib, stdenv, fetchurl, pkg-config, gnome, gtk3, wrapGAppsHook , libxml2, gettext, itstool, meson, ninja, python3 , vala, desktop-file-utils }: @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome3.gnome-tetravex"; }; + updateScript = gnome.updateScript { packageName = "gnome-tetravex"; attrPath = "gnome.gnome-tetravex"; }; }; nativeBuildInputs = [ - wrapGAppsHook itstool libxml2 gnome3.adwaita-icon-theme + wrapGAppsHook itstool libxml2 gnome.adwaita-icon-theme pkg-config gettext meson ninja python3 vala desktop-file-utils ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome/games/hitori/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/games/hitori/default.nix rename to pkgs/desktops/gnome/games/hitori/default.nix index 8369c571f541..1dc07bae26b1 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome/games/hitori/default.nix @@ -3,7 +3,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , glib , gtk3 , cairo @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome/games/iagno/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/games/iagno/default.nix rename to pkgs/desktops/gnome/games/iagno/default.nix index 443a417da505..d7e3930eae1e 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome/games/iagno/default.nix @@ -3,7 +3,7 @@ , fetchpatch , pkg-config , gtk3 -, gnome3 +, gnome , gdk-pixbuf , librsvg , wrapGAppsHook @@ -54,16 +54,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gdk-pixbuf librsvg gsound ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "iagno"; - attrPath = "gnome3.iagno"; + attrPath = "gnome.iagno"; }; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome/games/lightsoff/default.nix similarity index 78% rename from pkgs/desktops/gnome-3/games/lightsoff/default.nix rename to pkgs/desktops/gnome/games/lightsoff/default.nix index 7e43583d5298..94b71f0e8568 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome/games/lightsoff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook +{ lib, stdenv, fetchurl, vala, pkg-config, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib , meson, ninja, python3 }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { vala pkg-config wrapGAppsHook itstool gettext appstream-glib libxml2 meson ninja python3 ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; + buildInputs = [ gtk3 gnome.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ]; postPatch = '' chmod +x build-aux/meson_post_install.py @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "lightsoff"; - attrPath = "gnome3.lightsoff"; + attrPath = "gnome.lightsoff"; }; }; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome/games/quadrapassel/default.nix similarity index 84% rename from pkgs/desktops/gnome-3/games/quadrapassel/default.nix rename to pkgs/desktops/gnome/games/quadrapassel/default.nix index de3d67b58bff..d54c49eafee2 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome/games/quadrapassel/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf , librsvg, gsound, libmanette , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook , meson, ninja, python3, vala, desktop-file-utils @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 vala desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ @@ -24,9 +24,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome/games/swell-foop/default.nix similarity index 91% rename from pkgs/desktops/gnome-3/games/swell-foop/default.nix rename to pkgs/desktops/gnome/games/swell-foop/default.nix index d29ac55ce280..50fab598153a 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome/games/swell-foop/default.nix @@ -8,7 +8,7 @@ , glib , gtk3 , libgnome-games-support -, gnome3 +, gnome , desktop-file-utils , clutter , clutter-gtk @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { glib gtk3 libgnome-games-support - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme clutter clutter-gtk ]; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome/games/tali/default.nix similarity index 82% rename from pkgs/desktops/gnome-3/games/tali/default.nix rename to pkgs/desktops/gnome/games/tali/default.nix index e5aad262aa9b..3e2abc873046 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome/games/tali/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome3, gdk-pixbuf +{ lib, stdenv, fetchurl, pkg-config, gtk3, gnome, gdk-pixbuf , librsvg, libgnome-games-support, gettext, itstool, libxml2, wrapGAppsHook , meson, ninja, python3, desktop-file-utils }: @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "tali"; attrPath = "gnome3.tali"; }; + updateScript = gnome.updateScript { packageName = "tali"; attrPath = "gnome.tali"; }; }; nativeBuildInputs = [ meson ninja python3 desktop-file-utils - pkg-config gnome3.adwaita-icon-theme + pkg-config gnome.adwaita-icon-theme libxml2 itstool gettext wrapGAppsHook ]; buildInputs = [ gtk3 gdk-pixbuf librsvg libgnome-games-support ]; diff --git a/pkgs/desktops/gnome-3/installer.nix b/pkgs/desktops/gnome/installer.nix similarity index 100% rename from pkgs/desktops/gnome-3/installer.nix rename to pkgs/desktops/gnome/installer.nix diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome/misc/geary/default.nix similarity index 97% rename from pkgs/desktops/gnome-3/misc/geary/default.nix rename to pkgs/desktops/gnome/misc/geary/default.nix index 3abddaedaec6..a40cd30eb8da 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome/misc/geary/default.nix @@ -24,7 +24,7 @@ , json-glib , itstool , libgee -, gnome3 +, gnome , webkitgtk , python3 , gnutls @@ -144,9 +144,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gitg/default.nix b/pkgs/desktops/gnome/misc/gitg/default.nix similarity index 97% rename from pkgs/desktops/gnome-3/misc/gitg/default.nix rename to pkgs/desktops/gnome/misc/gitg/default.nix index 492057515912..8f73bdaeb7da 100644 --- a/pkgs/desktops/gnome-3/misc/gitg/default.nix +++ b/pkgs/desktops/gnome/misc/gitg/default.nix @@ -15,7 +15,7 @@ , gtksourceview , gsettings-desktop-schemas , adwaita-icon-theme -, gnome3 +, gnome , gtkspell3 , shared-mime-info , libgee @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome/misc/gnome-applets/default.nix similarity index 94% rename from pkgs/desktops/gnome-3/misc/gnome-applets/default.nix rename to pkgs/desktops/gnome/misc/gnome-applets/default.nix index 21dedba16ad0..d414266a9d9e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-applets/default.nix @@ -18,7 +18,7 @@ , gucharmap , tracker , polkit -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix similarity index 87% rename from pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix rename to pkgs/desktops/gnome/misc/gnome-autoar/default.nix index 8d5f07579c6d..8a74c05dfea2 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-autoar/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , fetchurl , pkg-config -, gnome3 +, gnome , gtk3 , glib , gobject-introspection @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-autoar"; attrPath = "gnome3.gnome-autoar"; }; + updateScript = gnome.updateScript { packageName = "gnome-autoar"; attrPath = "gnome.gnome-autoar"; }; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix similarity index 98% rename from pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix rename to pkgs/desktops/gnome/misc/gnome-flashback/default.nix index 501000f204fd..7e578f27cd29 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-flashback/default.nix @@ -7,7 +7,7 @@ , gnome-desktop , gnome-panel , gnome-session -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , ibus @@ -120,9 +120,9 @@ let PKG_CONFIG_LIBGNOME_PANEL_MODULESDIR = "${placeholder "out"}/lib/gnome-panel/modules"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix similarity index 90% rename from pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix rename to pkgs/desktops/gnome/misc/gnome-packagekit/default.nix index 53be2df471b4..6e0aa78e6fda 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-packagekit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome3, packagekit, polkit +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gettext, gnome, packagekit, polkit , gtk3, systemd, wrapGAppsHook, desktop-file-utils }: stdenv.mkDerivation rec { @@ -21,9 +21,9 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gnome-packagekit"; - attrPath = "gnome3.gnome-packagekit"; + attrPath = "gnome.gnome-packagekit"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome/misc/gnome-panel/default.nix similarity index 95% rename from pkgs/desktops/gnome-3/misc/gnome-panel/default.nix rename to pkgs/desktops/gnome/misc/gnome-panel/default.nix index 113849b935a7..4e42f91e1e3c 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-panel/default.nix @@ -8,7 +8,7 @@ , glib , gnome-desktop , gnome-menus -, gnome3 +, gnome , gtk3 , itstool , libgweather @@ -82,9 +82,9 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch b/pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch similarity index 100% rename from pkgs/desktops/gnome-3/misc/gnome-screensaver/fix-dbus-service-dir.patch rename to pkgs/desktops/gnome/misc/gnome-screensaver/fix-dbus-service-dir.patch diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix similarity index 86% rename from pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix rename to pkgs/desktops/gnome/misc/gnome-tweaks/default.nix index 5d57d7616f09..460ab47733ca 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome/misc/gnome-tweaks/default.nix @@ -5,7 +5,7 @@ , gdk-pixbuf , gettext , glib -, gnome3 +, gnome , gobject-introspection , gsettings-desktop-schemas , gtk3 @@ -43,12 +43,12 @@ python3Packages.buildPythonApplication rec { buildInputs = [ gdk-pixbuf glib - gnome3.gnome-desktop - gnome3.gnome-settings-daemon - gnome3.gnome-shell + gnome.gnome-desktop + gnome.gnome-settings-daemon + gnome.gnome-shell # Makes it possible to select user themes through the `user-theme` extension - gnome3.gnome-shell-extensions - gnome3.mutter + gnome.gnome-shell-extensions + gnome.mutter gsettings-desktop-schemas gtk3 libhandy @@ -65,9 +65,9 @@ python3Packages.buildPythonApplication rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/misc/gpaste/default.nix rename to pkgs/desktops/gnome/misc/gpaste/default.nix diff --git a/pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch b/pkgs/desktops/gnome/misc/gpaste/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/misc/gpaste/fix-paths.patch rename to pkgs/desktops/gnome/misc/gpaste/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome/misc/gtkhtml/default.nix similarity index 73% rename from pkgs/desktops/gnome-3/misc/gtkhtml/default.nix rename to pkgs/desktops/gnome/misc/gtkhtml/default.nix index cc054a983c63..88fb31c4333b 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome/misc/gtkhtml/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gtk3, intltool -, gnome3, enchant, isocodes, gsettings-desktop-schemas }: +, gnome, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "gtkhtml"; @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { packageName = "gtkhtml"; attrPath = "gnome3.gtkhtml"; }; + updateScript = gnome.updateScript { packageName = "gtkhtml"; attrPath = "gnome.gtkhtml"; }; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme + buildInputs = [ gtk3 intltool gnome.adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix similarity index 92% rename from pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix rename to pkgs/desktops/gnome/misc/libgnome-games-support/default.nix index f594c1b0a4dc..dd65f858b6de 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome/misc/libgnome-games-support/default.nix @@ -6,7 +6,7 @@ , libgee , gettext , vala -, gnome3 +, gnome , libintl , meson , ninja @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome/misc/metacity/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/misc/metacity/default.nix rename to pkgs/desktops/gnome/misc/metacity/default.nix index 36c6b66d5ca3..702b7ffb38bb 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome/misc/metacity/default.nix @@ -2,7 +2,7 @@ , fetchurl , gettext , glib -, gnome3 +, gnome , gsettings-desktop-schemas , gtk3 , xorg @@ -55,9 +55,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch b/pkgs/desktops/gnome/misc/metacity/fix-paths.patch similarity index 100% rename from pkgs/desktops/gnome-3/misc/metacity/fix-paths.patch rename to pkgs/desktops/gnome/misc/metacity/fix-paths.patch diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome/misc/nautilus-python/default.nix similarity index 93% rename from pkgs/desktops/gnome-3/misc/nautilus-python/default.nix rename to pkgs/desktops/gnome/misc/nautilus-python/default.nix index 0008f66e9adf..40c1d4c767af 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome/misc/nautilus-python/default.nix @@ -9,7 +9,7 @@ , ncurses , nautilus , gtk3 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; + attrPath = "gnome.${pname}"; versionPolicy = "odd-unstable"; }; }; diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome/misc/pomodoro/default.nix similarity index 96% rename from pkgs/desktops/gnome-3/misc/pomodoro/default.nix rename to pkgs/desktops/gnome/misc/pomodoro/default.nix index ae52c41787be..830900ed8c92 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome/misc/pomodoro/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { This GNOME utility helps to manage time according to Pomodoro Technique. It intends to improve productivity and focus by taking short breaks. ''; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome/update.nix similarity index 100% rename from pkgs/desktops/gnome-3/update.nix rename to pkgs/desktops/gnome/update.nix diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 6ac9c3864abd..8c6df49fd127 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +, libXdamage, libXpresent, libstartup_notification, gnome, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "marco"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { libXpresent libstartup_notification gtk3 - gnome3.zenity + gnome.zenity mate-settings-daemon ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 1046e431a3b8..ccd20a6b875a 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3 +{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gnome, glib, gtk3, gtksourceview3, libwnck3 , libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook , mateUpdateScript }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 gtksourceview3 - gnome3.gucharmap + gnome.gucharmap libwnck3 libgtop libxml2 diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index b1b59dc6402c..62e0b5b3195b 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 3a99538d9298..fd7b19e1de37 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libxml2 libcanberra-gtk3 gtk3 - gnome3.libgnome-keyring + gnome.libgnome-keyring libnotify dbus-glib upower diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 4c98c9cf5207..5e226f4d8869 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: +, gnome, gtksourceview3, libpeas, mate, wrapGAppsHook, mateUpdateScript }: stdenv.mkDerivation rec { pname = "pluma"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { python3 gtksourceview3 libpeas - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme mate.mate-desktop ]; diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index e5182807b3f7..82d6a87b1090 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, gnome3 }: +{ config, pkgs, lib, gnome }: lib.makeScope pkgs.newScope (self: with self; { @@ -23,9 +23,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-session wingpanel-indicator-sound ]; - maintainers = with pkgs.lib.maintainers; [ worldofpeace ]; + maintainers = with pkgs.lib.maintainers; [ ]; - mutter = pkgs.gnome3.mutter334; + mutter = pkgs.gnome.mutter334; elementary-gsettings-schemas = callPackage ./desktop/elementary-gsettings-schemas { }; @@ -72,17 +72,17 @@ lib.makeScope pkgs.newScope (self: with self; { elementary-print-shim = callPackage ./desktop/elementary-print-shim { }; elementary-session-settings = callPackage ./desktop/elementary-session-settings { - inherit (gnome3) gnome-session gnome-keyring; + inherit (gnome) gnome-session gnome-keyring; }; elementary-shortcut-overlay = callPackage ./desktop/elementary-shortcut-overlay { }; extra-elementary-contracts = callPackage ./desktop/extra-elementary-contracts { - inherit (gnome3) file-roller gnome-bluetooth; + inherit (gnome) file-roller gnome-bluetooth; }; gala = callPackage ./desktop/gala { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; wingpanel = callPackage ./desktop/wingpanel { }; @@ -109,7 +109,7 @@ lib.makeScope pkgs.newScope (self: with self; { # explained here -> https://github.com/elementary/greeter/issues/92#issuecomment-376215614 # Take note of "I am holding off on "fixing" this bug for as long as possible." elementary-settings-daemon = callPackage ./services/elementary-settings-daemon { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; pantheon-agent-geoclue2 = callPackage ./services/pantheon-agent-geoclue2 { }; @@ -169,7 +169,7 @@ lib.makeScope pkgs.newScope (self: with self; { switchboard-plug-onlineaccounts = callPackage ./apps/switchboard-plugs/onlineaccounts { }; switchboard-plug-pantheon-shell = callPackage ./apps/switchboard-plugs/pantheon-shell { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; }; switchboard-plug-power = callPackage ./apps/switchboard-plugs/power { }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index a9a310ade828..43fd7a69e8ad 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -6,7 +6,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , perl , gettext , gtk3 @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = repoName; attrPath = "pantheon.${pname}"; }; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 1b7877cd79da..6ccd2a0c6124 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -80,7 +80,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-terminal = callPackage ./applications/xfce4-terminal { }; xfce4-screenshooter = callPackage ./applications/xfce4-screenshooter { - inherit (pkgs.gnome3) libsoup; + inherit (pkgs.gnome) libsoup; }; xfdashboard = callPackage ./applications/xfdashboard {}; @@ -211,7 +211,7 @@ lib.makeScope pkgs.newScope (self: with self; { libxfcegui4 = throw "libxfcegui4 is the deprecated Xfce GUI library. It has been superseded by the libxfce4ui library"; xinitrc = xfce4-session.xinitrc; inherit (pkgs.gnome2) libglade; - inherit (pkgs.gnome3) vte gtksourceview; + inherit (pkgs.gnome) vte gtksourceview; xfce4-mixer-pulse = xfce4-mixer; thunar-bare = thunar.override { thunarPlugins = []; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d6af1a4f1576..74e03550255a 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -38,7 +38,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.11.20200824" +, version ? "9.3.20210504" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -110,8 +110,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "3f50154591ada9064351ccec4adfe6df53ca2439"; - sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d"; + rev = "049c3a83fbce67e58e70c727d89e8331608a4e04"; + sha256 = "0dk7c9ywam9fj33lqzpwxhiwz017m58j6ixvc8b07kzp7kskaxq7"; }; enableParallelBuilding = true; @@ -139,6 +139,9 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" + # otherwise haddock fails when generating the compiler docs + export LANG=C.UTF-8 + echo -n "${buildMK dontStrip}" > mk/build.mk echo ${version} > VERSION echo ${src.rev} > GIT_COMMIT_ID diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix index 55936fd3db23..0c002227914a 100644 --- a/pkgs/development/compilers/vala/default.nix +++ b/pkgs/development/compilers/vala/default.nix @@ -90,7 +90,7 @@ let # Wait for PR #59372 # passthru = { - # updateScript = gnome3.updateScript { + # updateScript = gnome.updateScript { # attrPath = "${pname}_${lib.versions.major version}_${lib.versions.minor version}"; # packageName = pname; # }; @@ -101,7 +101,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar lethalman peterhoeg worldofpeace ]; + maintainers = with maintainers; [ antono jtojnar peterhoeg ]; }; }); diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f84e4d048731..db5dc27e8b8c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -864,6 +864,20 @@ self: super: { snap-templates = doJailbreak super.snap-templates; # https://github.com/snapframework/snap-templates/issues/22 swagger2 = if (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) then dontHaddock (dontCheck super.swagger2) else super.swagger2; + # hledger-lib requires the latest version of pretty-simple + hledger-lib = appendPatch super.hledger-lib + # This patch has been merged but not released yet: + # https://github.com/simonmichael/hledger/pull/1512. It is + # important for ledger-autosync test suite: + # https://github.com/egh/ledger-autosync/issues/123 + (pkgs.fetchpatch { + name = "hledger-properly-escape-quotes-csv.patch"; + url = "https://github.com/simonmichael/hledger/commit/c9a72e1615e2ddc2824f2e248456e1042eb31e1d.patch"; + sha256 = "10knvrd5bl9nrmi27i0pm82sfr64jy04xgbjp228qywyijpr3pqv"; + includes = [ "Hledger/Read/CsvReader.hs" ]; + stripLen = 1; + }); + # Copy hledger man pages from data directory into the proper place. This code # should be moved into the cabal2nix generator. hledger = overrideCabal super.hledger (drv: { diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 6f38c89088cd..fbed88ccbdc0 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -307,7 +307,7 @@ self: super: builtins.intersectAttrs super { # Tries to run GUI in tests leksah = dontCheck (overrideCabal super.leksah (drv: { executableSystemDepends = (drv.executableSystemDepends or []) ++ (with pkgs; [ - gnome3.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... + gnome.adwaita-icon-theme # Fix error: Icon 'window-close' not present in theme ... wrapGAppsHook # Fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system gtk3 # Fix error: GLib-GIO-ERROR **: Settings schema 'org.gtk.Settings.FileChooser' is not installed ]); diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 86afed3a6006..406493133c63 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -107466,7 +107466,7 @@ self: { platforms = [ "aarch64-linux" "armv7l-linux" "i686-linux" "x86_64-linux" ]; - }) {inherit (pkgs.gnome3) gnome-keyring; + }) {inherit (pkgs.gnome) gnome-keyring; inherit (pkgs) libgnome-keyring;}; "gnomevfs" = callPackage diff --git a/pkgs/development/libraries/amtk/default.nix b/pkgs/development/libraries/amtk/default.nix index 7d51dbd48e72..efea7ef624e9 100644 --- a/pkgs/development/libraries/amtk/default.nix +++ b/pkgs/development/libraries/amtk/default.nix @@ -5,7 +5,7 @@ , ninja , pkg-config , gobject-introspection -, gnome3 +, gnome , dbus , xvfb_run }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meson test --print-errorlogs ''; - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 1cd9fb2c8b76..64c0b031e47d 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -89,6 +89,6 @@ stdenv.mkDerivation rec { homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ lethalman matthewbauer ]; + maintainers = with maintainers; [ matthewbauer ]; }; } diff --git a/pkgs/development/libraries/aravis/default.nix b/pkgs/development/libraries/aravis/default.nix index a915723e2ca7..67e621ad8597 100644 --- a/pkgs/development/libraries/aravis/default.nix +++ b/pkgs/development/libraries/aravis/default.nix @@ -6,7 +6,7 @@ , gst-plugins-good ? null , gst-plugins-bad ? null , libnotify ? null -, gnome3 ? null +, gnome ? null , gtk3 ? null , enableUsb ? true , enablePacketSocket ? true @@ -26,7 +26,7 @@ in assert enableGstPlugin -> lib.all (pkg: pkg != null) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]; assert enableViewer -> enableGstPlugin; assert enableViewer -> libnotify != null; - assert enableViewer -> gnome3 != null; + assert enableViewer -> gnome != null; assert enableViewer -> gtk3 != null; assert enableViewer -> gstreamerAtLeastVersion1; @@ -56,7 +56,7 @@ in ++ lib.optional enableUsb libusb1 ++ lib.optional enablePacketSocket audit ++ lib.optionals (enableViewer || enableGstPlugin) [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ] - ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome3.adwaita-icon-theme ]; + ++ lib.optionals (enableViewer) [ libnotify gtk3 gnome.adwaita-icon-theme ]; preAutoreconf = "./autogen.sh"; diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index 881c411db392..7989cfd85777 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -11,7 +11,7 @@ , glib , libxml2 -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails with "No test data file provided" passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 38131b0f357f..4e85c7a92a64 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -16,7 +16,7 @@ , libXi , libXext -, gnome3 # To pass updateScript +, gnome # To pass updateScript }: stdenv.mkDerivation rec { @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Ddbus_daemon=/run/current-system/sw/bin/dbus-daemon" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index e0cdb3a9b4c3..7961211dc63e 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, gettext, pkg-config, glib -, fixDarwinDylibNames, gobject-introspection, gnome3 +, fixDarwinDylibNames, gobject-introspection, gnome }: let @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/atkmm/default.nix b/pkgs/development/libraries/atkmm/default.nix index 123e7c984fcf..b357ed047259 100644 --- a/pkgs/development/libraries/atkmm/default.nix +++ b/pkgs/development/libraries/atkmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, atk, glibmm, pkg-config, gnome }: stdenv.mkDerivation rec { pname = "atkmm"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 95d54993e069..faee853808cc 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -3,7 +3,7 @@ , autoconf , automake , libtool -, gnome3 +, gnome , which , fetchgit , libgtop @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { automake dbus docbook_xsl - gnome3.gnome-common + gnome.gnome-common gobject-introspection gtk-doc libtool diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index f2caa0bd3d55..e4752c7748be 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }: +{ fetchurl, lib, stdenv, pkg-config, clutter, gtk3, glib, cogl, gnome, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "clutter-gst"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 8dfe6781740b..7573da66c0d8 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, meson, ninja -, gobject-introspection, clutter, gtk3, gnome3 }: +, gobject-introspection, clutter, gtk3, gnome }: let pname = "clutter-gtk"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "Clutter-GTK"; homepage = "http://www.clutter-project.org/"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.gnu ++ lib.platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 2d0f57f279a6..aacb8581c8fc 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, libGLU, libGL, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json-glib -, gobject-introspection, gtk3, gnome3, libinput, libgudev, libxkbcommon +, gobject-introspection, gtk3, gnome, libinput, libgudev, libxkbcommon }: let @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { #doCheck = true; # no tests possible without a display passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; homepage = "http://www.clutter-project.org/"; - maintainers = with lib.maintainers; [ lethalman ]; + maintainers = with lib.maintainers; [ ]; platforms = lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 9962ebf09e88..75ec2a2acc7f 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, pkg-config, libGL, glib, gdk-pixbuf, xorg, libintl -, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3 +, pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome , mesa, automake, autoconf , gstreamerSupport ? true, gst_all_1 }: @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { #doCheck = true; # all tests fail (no idea why) passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/ctpl/default.nix b/pkgs/development/libraries/ctpl/default.nix index 69380c2eeeb4..634c2cf44cf4 100644 --- a/pkgs/development/libraries/ctpl/default.nix +++ b/pkgs/development/libraries/ctpl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { homepage = "http://ctpl.tuxfamily.org/"; description = "Template engine library written in C"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index fd7df4d5ba37..e9543fd95f93 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; license = licenses.gpl2Plus; # most is also under AFL-2.1 - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 26862ee99f01..550940f5a1e7 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -9,7 +9,7 @@ , glib , bash-completion , dbus -, gnome3 +, gnome , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_42 @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/dee/default.nix b/pkgs/development/libraries/dee/default.nix index 3d46028ec438..a023d164d8c3 100644 --- a/pkgs/development/libraries/dee/default.nix +++ b/pkgs/development/libraries/dee/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/dee"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ abbradar worldofpeace ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index c21c14962540..6cd651e66ebb 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -4,7 +4,7 @@ , meson , ninja , glib -, gnome3 +, gnome , nspr , gettext , gobject-introspection @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index a7f8fa89c166..5eb180731f31 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -118,6 +118,6 @@ stdenv.mkDerivation rec { homepage = "http://fontconfig.org/"; license = licenses.bsd2; # custom but very bsd-like platforms = platforms.all; - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; teams.freedesktop.members ++ [ ]; }; } diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 0ad9f607dfea..efc533c55041 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -12,7 +12,7 @@ , vala , glib , zlib -, gnome3 +, gnome , nixosTests }: @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index 57323bbc70dd..da3a0d31f41e 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -15,7 +15,7 @@ , makeWrapper , libxslt , vala -, gnome3 +, gnome , python3 , shared-mime-info }: @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index d7a2604876fd..fd2d62a032c3 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -15,7 +15,7 @@ , libtiff , libjpeg , libpng -, gnome3 +, gnome , gobject-introspection , doCheck ? false , makeWrapper @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { separateDebugInfo = stdenv.isLinux; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index f924571deae1..5b73e3d7a139 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome3, intltool }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, gtk3, gnome, intltool }: stdenv.mkDerivation rec { pname = "gdl"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 gtk3 ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gdl"; }; }; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index f401c25aa394..458e0d59a0d5 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome3, libsoup, json-glib, glib }: +{ fetchurl, lib, stdenv, meson, ninja, pkg-config, gettext, gtk-doc, docbook_xsl, gobject-introspection, gnome, libsoup, json-glib, glib }: stdenv.mkDerivation rec { pname = "geocode-glib"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 958e524aa09c..c46a42049bce 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome3, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, exiv2, glib, gnome, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: stdenv.mkDerivation rec { pname = "gexiv2"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 4cbc6f341dc4..7f4625b66512 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, glib, librest, gnome-online-accounts -, gnome3, libsoup, json-glib, gobject-introspection +, gnome, libsoup, json-glib, gobject-introspection , gtk-doc, pkgs, docbook-xsl-nons, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index ff61c95a9855..d6920086034a 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -4,7 +4,7 @@ , meson , ninja , pkg-config -, gnome3 +, gnome , gtk3 , atk , gobject-introspection @@ -124,7 +124,7 @@ in stdenv.mkDerivation rec { installed-tests = nixosTests.installed-tests.gjs; }; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gjs"; }; }; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 21321ce9f0c8..690279fcf213 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -12,7 +12,7 @@ , gnutls , p11-kit , libproxy -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 2bfb4edeb52c..08f7c9a4c780 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,5 @@ { config, lib, stdenv, fetchurl, gettext, meson, ninja, pkg-config, perl, python3 -, libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 +, libiconv, zlib, libffi, pcre, libelf, gnome, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45 # use util-linuxMinimal to avoid circular dependency (util-linux, systemd, glib) , util-linuxMinimal ? null , buildPackages @@ -194,14 +194,14 @@ stdenv.mkDerivation rec { makeSchemaPath = dir: name: "${dir}/share/gsettings-schemas/${name}/glib-2.0/schemas"; getSchemaPath = pkg: makeSchemaPath pkg pkg.name; inherit flattenInclude; - updateScript = gnome3.updateScript { packageName = "glib"; }; + updateScript = gnome.updateScript { packageName = "glib"; }; }; meta = with lib; { description = "C library of programming buildings blocks"; homepage = "https://www.gtk.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ lovek323 raskin worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ lovek323 raskin ]); platforms = platforms.unix; longDescription = '' diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix index 18a862e7d76b..660e3b3b9bd7 100644 --- a/pkgs/development/libraries/glibmm/2.68.nix +++ b/pkgs/development/libraries/glibmm/2.68.nix @@ -5,7 +5,7 @@ , gnum4 , glib , libsigcxx30 -, gnome3 +, gnome , Cocoa , meson , ninja @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "glibmm_2_68"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index e952ab04cc06..9c4488a04a97 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome3, darwin, meson, ninja }: +{ lib, stdenv, fetchurl, pkg-config, gnum4, glib, libsigcxx, gnome, darwin, meson, ninja }: stdenv.mkDerivation rec { pname = "glibmm"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails. one test needs the net, another /etc/fstab passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gnome-menus/default.nix b/pkgs/development/libraries/gnome-menus/default.nix index c8e77148c6d8..0b3d6689cb0b 100644 --- a/pkgs/development/libraries/gnome-menus/default.nix +++ b/pkgs/development/libraries/gnome-menus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "gnome-menus"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobject-introspection ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index ecb4390df269..2d349181deed 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -20,7 +20,7 @@ , libsoup , docbook-xsl-nons , docbook_xml_dtd_412 -, gnome3 +, gnome , gcr , libkrb5 , gvfs @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index a2206c19b1b4..e8fd3ca7e2c2 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -4,7 +4,7 @@ , meson , ninja , gettext -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index afe4ac427826..e6a1ad979b91 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -14,7 +14,7 @@ , python3 , cctools , cairo -, gnome3 +, gnome , substituteAll , nixStoreDir ? builtins.storeDir , x11Support ? true @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index f3580e904b85..3a48fa524842 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, glib, gtk3, lasem -, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome3 }: +, libgsf, libxml2, libxslt, cairo, pango, librsvg, gnome }: stdenv.mkDerivation rec { pname = "goffice"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 56036897ad8e..d11ecc6a29a5 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -7,7 +7,7 @@ , python3 , sqlite , gdk-pixbuf -, gnome3 +, gnome , gobject-introspection }: @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.isx86_64; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index c9fd5b263429..1bc763349a86 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome3 }: +{ lib, stdenv, fetchurl, gtk2, cairo, glib, pkg-config, gnome }: stdenv.mkDerivation rec { pname = "goocanvas"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 cairo glib ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index 11ea1e40ab96..4e706f409870 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, goocanvas2, gtkmm3, gnome }: stdenv.mkDerivation rec { pname = "goocanvasmm"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "goocanvasmm2"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/graphene/default.nix b/pkgs/development/libraries/graphene/default.nix index 57cad4497653..b1b27a3d2980 100644 --- a/pkgs/development/libraries/graphene/default.nix +++ b/pkgs/development/libraries/graphene/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "A thin layer of graphic data types"; homepage = "https://ebassi.github.com/graphene"; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index d1c00d588223..13ec503fae0e 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -10,7 +10,7 @@ , librest , libarchive , libsoup -, gnome3 +, gnome , libxml2 , lua5_3 , liboauth @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index fbab49273e82..1b8c46394da3 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, vala, glib, liboauth, gtk3 , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, libxml2, gnome3, gobject-introspection, libsoup, totem-pl-parser }: +, libxml2, gnome, gobject-introspection, libsoup, totem-pl-parser }: let pname = "grilo"; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib liboauth gtk3 libxml2 libsoup totem-pl-parser ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index c918e0ededcc..e9814a43b244 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -7,7 +7,7 @@ , ninja , python3 # just for passthru -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gsignond/default.nix b/pkgs/development/libraries/gsignond/default.nix index 92123dbc3ea5..912054eb85c3 100644 --- a/pkgs/development/libraries/gsignond/default.nix +++ b/pkgs/development/libraries/gsignond/default.nix @@ -54,7 +54,7 @@ unwrapped = stdenv.mkDerivation rec { description = "D-Bus service which performs user authentication on behalf of its clients"; homepage = "https://gitlab.com/accounts-sso/gsignond"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; }; diff --git a/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/pkgs/development/libraries/gsignond/plugins/lastfm.nix index a05069f205fe..6141528a9fe6 100644 --- a/pkgs/development/libraries/gsignond/plugins/lastfm.nix +++ b/pkgs/development/libraries/gsignond/plugins/lastfm.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles Last.FM credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-lastfm"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/mail.nix b/pkgs/development/libraries/gsignond/plugins/mail.nix index 8bce32f976ab..977bc1489420 100644 --- a/pkgs/development/libraries/gsignond/plugins/mail.nix +++ b/pkgs/development/libraries/gsignond/plugins/mail.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Plugin for the Accounts-SSO gSignOn daemon that handles E-Mail credentials"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-mail"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/oauth.nix b/pkgs/development/libraries/gsignond/plugins/oauth.nix index 3bf3ab194643..bc496e8ac2cc 100644 --- a/pkgs/development/libraries/gsignond/plugins/oauth.nix +++ b/pkgs/development/libraries/gsignond/plugins/oauth.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the OAuth 1.0 and 2.0 authentication protocols"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-oa"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsignond/plugins/sasl.nix b/pkgs/development/libraries/gsignond/plugins/sasl.nix index b73559f8a532..bd87d4f72bb5 100644 --- a/pkgs/development/libraries/gsignond/plugins/sasl.nix +++ b/pkgs/development/libraries/gsignond/plugins/sasl.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { description = "Plugin for the Accounts-SSO gSignOn daemon that handles the SASL authentication protocol"; homepage = "https://gitlab.com/accounts-sso/gsignond-plugin-sasl"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index 9f656a428f5b..bcd39ce22733 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, vala, libcanberra, gobject-introspection, libtool, gnome }: stdenv.mkDerivation rec { pname = "gsound"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib libcanberra ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 890fcb981181..f591246eaf81 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -8,7 +8,7 @@ , icu , vala , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix index 440caba25476..6a76c07fec7b 100644 --- a/pkgs/development/libraries/gssdp/default.nix +++ b/pkgs/development/libraries/gssdp/default.nix @@ -11,7 +11,7 @@ , libsoup , gtk3 , glib -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index ae361366ac1c..7123aa0d3ac1 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, glibmm, gst_all_1, gnome }: stdenv.mkDerivation rec { pname = "gstreamermm"; version = "1.10.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gst_all_1.gstreamermm"; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 9f7d30505248..f9b5d5f68b56 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -29,7 +29,7 @@ , libxkbcommon , libxml2 , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , sassc , trackerSupport ? stdenv.isLinux @@ -206,7 +206,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk+"; attrPath = "gtk3"; }; diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix index 455e54ded21c..8791d24ad361 100644 --- a/pkgs/development/libraries/gtk/4.x.nix +++ b/pkgs/development/libraries/gtk/4.x.nix @@ -28,7 +28,7 @@ , libsoup , ffmpeg , gmp -, gnome3 +, gnome , gsettings-desktop-schemas , gst_all_1 , sassc @@ -216,7 +216,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtk"; attrPath = "gtk4"; }; @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtk.org/"; license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin lethalman worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); platforms = platforms.all; changelog = "https://gitlab.gnome.org/GNOME/gtk/-/raw/${version}/NEWS"; }; diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix index a3aa18b058a2..eaf8a94d137e 100644 --- a/pkgs/development/libraries/gtkd/default.nix +++ b/pkgs/development/libraries/gtkd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome3, gst_all_1, librsvg +{ lib, stdenv, fetchzip, fetchpatch, atk, cairo, ldc, gdk-pixbuf, gnome, gst_all_1, librsvg , glib, gtk3, gtksourceview4, libgda, libpeas, pango, pkg-config, which, vte }: let diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 521f4ca15f30..cf26e22da5bc 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ raskin vcunat ]; + maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 20456ffd6d1b..1e5932c3854e 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, gtk3, glibmm, cairomm, pangomm, atkmm, epoxy, gnome }: stdenv.mkDerivation rec { pname = "gtkmm"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}3"; versionPolicy = "odd-unstable"; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; - maintainers = with maintainers; [ raskin vcunat ]; + maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix index f7fca93d8704..04fa7e5dd2f3 100644 --- a/pkgs/development/libraries/gtkmm/4.x.nix +++ b/pkgs/development/libraries/gtkmm/4.x.nix @@ -10,7 +10,7 @@ , cairomm_1_16 , pangomm_2_48 , epoxy -, gnome3 +, gnome , makeFontsConf , xvfb_run }: @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}4"; versionPolicy = "odd-unstable"; @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://gtkmm.org/"; license = licenses.lgpl2Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ raskin vcunat ]); + maintainers = teams.gnome.members ++ (with maintainers; [ raskin ]); platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index 4f144219ce09..21dc5c3a884d 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -15,7 +15,7 @@ , libxml2 , perl , gettext -, gnome3 +, gnome , gobject-introspection , dbus , xvfb_run @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview4"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index a1bc60ebc308..6825b34d0ac1 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -13,7 +13,7 @@ , libxml2 , perl , gettext -, gnome3 +, gnome , gobject-introspection , dbus , xvfb_run @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceview"; attrPath = "gtksourceview5"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index 5e80f91abc1b..3011a126c10d 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview4, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gtksourceviewmm/default.nix b/pkgs/development/libraries/gtksourceviewmm/default.nix index 7ee6b656ead1..fc4439e223ee 100644 --- a/pkgs/development/libraries/gtksourceviewmm/default.nix +++ b/pkgs/development/libraries/gtksourceviewmm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, gtkmm3, glibmm, gtksourceview3, gnome }: stdenv.mkDerivation rec { pname = "gtksourceviewmm"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "gtksourceviewmm"; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 74a5e6c6d45d..8d800f979402 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , glib , libxml2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gupnp-dlna/default.nix b/pkgs/development/libraries/gupnp-dlna/default.nix index be249e0fdcac..f9efe352a84b 100644 --- a/pkgs/development/libraries/gupnp-dlna/default.nix +++ b/pkgs/development/libraries/gupnp-dlna/default.nix @@ -8,7 +8,7 @@ , docbook_xml_dtd_412 , libxml2 , gst_all_1 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gupnp-igd/default.nix b/pkgs/development/libraries/gupnp-igd/default.nix index 93240fc8b33f..6eb44b9172ab 100644 --- a/pkgs/development/libraries/gupnp-igd/default.nix +++ b/pkgs/development/libraries/gupnp-igd/default.nix @@ -10,7 +10,7 @@ , docbook_xml_dtd_412 , glib , gupnp -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { #doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index d6465d71c50f..bd8151d603e9 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -14,7 +14,7 @@ , libsoup , libxml2 , libuuid -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index b589775a4dff..547c35e66eca 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -23,7 +23,7 @@ , samba , libmtp , gnomeSupport ? false -, gnome3 +, gnome , gcr , glib-networking , gnome-online-accounts @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { gsettings-desktop-schemas # TODO: a ligther version of libsoup to have FTP/HTTP support? ] ++ lib.optionals gnomeSupport [ - gnome3.libsoup + gnome.libsoup gcr glib-networking # TLS support gnome-online-accounts @@ -117,7 +117,7 @@ stdenv.mkDerivation rec { doInstallCheck = doCheck; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; @@ -127,6 +127,6 @@ stdenv.mkDerivation rec { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ] ++ teams.gnome.members; + maintainers = [ ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index fdda5647bf96..9ef66fd2ce69 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -12,7 +12,7 @@ , gtk-doc , docbook-xsl-nons , docbook_xml_dtd_43 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index 170ae424dcc6..b43bcd07ca6b 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, glib, json-glib, pkg-config, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_43, gnome }: stdenv.mkDerivation rec { pname = "jsonrpc-glib"; version = "3.38.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 663abb152804..fb481c19d05f 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchurl, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk2, python2Packages, lua, gobject-introspection }: @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - autoconf automake libtool gnome3.gnome-common gtk-doc gtk2 + autoconf automake libtool gnome.gnome-common gtk-doc gtk2 python pygtk lua gobject-introspection ]; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index e291ec56bb21..78755a87919d 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome3 +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, gnome , gtk-doc, gtk3, libX11, libXext, libXrender, gobject-introspection }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake libtool pkg-config ]; buildInputs = [ - gnome3.gnome-common gtk-doc gtk3 + gnome.gnome-common gtk-doc gtk3 libX11 libXext libXrender gobject-introspection ]; diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix index 953cf20afdbc..9c49429ece45 100644 --- a/pkgs/development/libraries/lasem/default.nix +++ b/pkgs/development/libraries/lasem/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gobject-introspection, glib, gdk-pixbuf -, libxml2, cairo, pango, gnome3 }: +, libxml2, cairo, pango, gnome }: stdenv.mkDerivation rec { pname = "lasem"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 3ad01ba871ea..20609509b66d 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome3 +{ fetchurl, lib, stdenv, meson, ninja, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, pkg-config, glib, gtk3, cairo, sqlite, gnome , clutter-gtk, libsoup, gobject-introspection /*, libmemphis */ }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libcrafter/default.nix b/pkgs/development/libraries/libcrafter/default.nix index e7a6e6c98372..37ac9bf7f171 100644 --- a/pkgs/development/libraries/libcrafter/default.nix +++ b/pkgs/development/libraries/libcrafter/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pellegre/libcrafter"; description = "High level C++ network packet sniffing and crafting library"; license = lib.licenses.bsd3; - maintainers = [ lib.maintainers.lethalman ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libcryptui/default.nix b/pkgs/development/libraries/libcryptui/default.nix index 4b60e27a99f7..e816846842f1 100644 --- a/pkgs/development/libraries/libcryptui/default.nix +++ b/pkgs/development/libraries/libcryptui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome3, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, intltool, glib, gnome, gtk3, gnupg22, gpgme, dbus-glib, libgnome-keyring }: stdenv.mkDerivation rec { pname = "libcryptui"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index d929af5d47f1..912e79d54101 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, ninja, meson, pkg-config, vala, gobject-introspection, libxml2 -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome3 }: +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, dbus, xvfb_run, glib, gtk3, gnome }: stdenv.mkDerivation rec { pname = "libdazzle"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 0656f3a2ee91..9755d0977c85 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, intltool, gtk-doc, glib, avahi, gnutls, libuuid, libsoup, gtk3, gnome }: let avahiWithGtk = avahi.override { gtk3Support = true; }; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgda/6.x.nix b/pkgs/development/libraries/libgda/6.x.nix index 6474aceb4173..28235d65d98a 100644 --- a/pkgs/development/libraries/libgda/6.x.nix +++ b/pkgs/development/libraries/libgda/6.x.nix @@ -12,7 +12,7 @@ , json-glib , isocodes , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libgda6"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index 1599a7868712..b3f6e1a7cdd9 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -7,7 +7,7 @@ , libxml2 , gtk3 , openssl -, gnome3 +, gnome , gobject-introspection , vala , libgee @@ -84,7 +84,7 @@ assert postgresSupport -> postgresql != null; hardeningDisable = [ "format" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index 15ff99f3a556..ad5e0cbecd6e 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome3 +{ lib, stdenv, fetchurl, pkg-config, glibmm, libgda, libxml2, gnome , mysqlSupport ? false , postgresSupport ? false }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index fdaace2dc4f0..f85dbea54d9d 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -12,7 +12,7 @@ , gcr , gnome-online-accounts , gobject-introspection -, gnome3 +, gnome , p11-kit , openssl , uhttpmock @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; # Stable version has not been updated for a long time. }; @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; - maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; + maintainers = with maintainers; [ raskin ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index aefb0be84afe..1a40d1f17b41 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, autoconf, vala, pkg-config, glib, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "libgee"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { PKG_CONFIG_GOBJECT_INTROSPECTION_1_0_TYPELIBDIR = "${placeholder "out"}/lib/girepository-1.0"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index e058c7ed5af3..7ae7bff50efa 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, gnome , webkitgtk, libsoup, libxml2, libarchive }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib webkitgtk libsoup libxml2 libarchive ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index fe36a9d663f3..56259814d8a5 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, gnome3, meson, ninja, pkg-config, vala, libssh2 +{ lib, stdenv, fetchurl, gnome, meson, ninja, pkg-config, vala, libssh2 , gtk-doc, gobject-introspection, libgit2, glib, python3 }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index cf8f5ab48786..b00e7b324518 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome3, +{ lib, stdenv, fetchurl, pkg-config, wrapGAppsHook, gtk2, gnome2, gnome, libstartup_notification, libgtop, perlPackages, autoreconfHook, intltool, docbook_xsl, xauth }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 gnome2.GConf libstartup_notification - gnome3.libgnome-keyring libgtop gnome2.libglade + gnome.libgnome-keyring libgtop gnome2.libglade ] ++ (with perlPackages; [ perl XMLParser ]); enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index 23261020cc11..957c21342524 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, file, intltool, glib, gtk3, libxklavier, wrapGAppsHook, gnome }: stdenv.mkDerivation rec { pname = "libgnomekbd"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index b8c7c7bc4977..8c5ea73af0b9 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, vala, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome }: let version = "0.7.0"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index bfa0b861dd84..1ccc5d778967 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,5 +1,5 @@ { fetchurl, lib, stdenv, pkg-config, intltool, gettext, glib, libxml2, zlib, bzip2 -, perl, gdk-pixbuf, libiconv, libintl, gnome3 }: +, perl, gdk-pixbuf, libiconv, libintl, gnome }: stdenv.mkDerivation rec { pname = "libgsf"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { preCheck = "patchShebangs ./tests/"; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index c919e667766a..98b0dc89fee8 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -5,7 +5,7 @@ , perl , gettext , gobject-introspection -, gnome3 +, gnome , gtk-doc }: @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index d3482456f2e4..a35cf51679ce 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -6,7 +6,7 @@ , udev , glib , gobject-introspection -, gnome3 +, gnome , vala }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index fd742d5b58b9..fbab67e08652 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -17,7 +17,7 @@ , tzdata , geocode-glib , vala -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index be088496f2e1..fc871f174eb5 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, cairo -, libarchive, freetype, libjpeg, libtiff, gnome3, lcms2 +, libarchive, freetype, libjpeg, libtiff, gnome, lcms2 }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libhandy/0.x.nix b/pkgs/development/libraries/libhandy/0.x.nix index ff2093255cf0..d836efb1aeb9 100644 --- a/pkgs/development/libraries/libhandy/0.x.nix +++ b/pkgs/development/libraries/libhandy/0.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitLab, meson, ninja, pkg-config, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 +, gtk3, gnome , dbus, xvfb_run, libxml2 , hicolor-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 libxml2 ]; + buildInputs = [ gnome.gnome-desktop gtk3 libxml2 ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 56853b0c3b8c..65f8ccd39ec3 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -20,7 +20,7 @@ , hicolor-icon-theme , at-spi2-atk , at-spi2-core -, gnome3 +, gnome , libhandy , runCommand }: @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; } // lib.optionalAttrs (!enableGlade) { diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index 871aafeafd6b..975ad2258131 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkg-config, meson, ninja, makeFontsConf, vala, fetchpatch -, gnome3, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: +, gnome, libgee, glib, json-glib, libarchive, libsoup, gobject-introspection }: let pname = "libhttpseverywhere"; @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { outputs = [ "out" "devdoc" ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 4e5f44dd1535..645b521b8172 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -11,7 +11,7 @@ , glib , libgudev , libevdev -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 28c8ae6db940..ee1b306c3e51 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3, fetchpatch }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome, fetchpatch }: stdenv.mkDerivation rec { pname = "libmediaart"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = false; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix index fc68149c14c3..524f948703f3 100644 --- a/pkgs/development/libraries/libndp/default.nix +++ b/pkgs/development/libraries/libndp/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { homepage = "http://libndp.org/"; description = "Library for Neighbor Discovery Protocol"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; license = licenses.lgpl21; }; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index 29b371642280..b108a5c5eea5 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -8,7 +8,7 @@ , glib , gdk-pixbuf , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 5d3bad6d6205..55c884d215fd 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome3 +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, gnome , glib, gtk3, gobject-introspection, python3, ncurses }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index a8bcebb533d0..0c885f0764b5 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -5,7 +5,7 @@ , glib , libsoup , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "librest"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7047d15c0f05..02cd9accbaf0 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -14,7 +14,7 @@ , libobjc , rustc , cargo -, gnome3 +, gnome , vala , gobject-introspection , nixosTests @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 6c28b7d16c16..8d9011bc575d 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, fetchpatch, glib, pkg-config, gettext, libxslt, python3 , docbook_xsl, docbook_xml_dtd_42 , libgcrypt, gobject-introspection, vala -, gtk-doc, gnome3, gjs, libintl, dbus, xvfb_run }: +, gtk-doc, gnome, gjs, libintl, dbus, xvfb_run }: stdenv.mkDerivation rec { pname = "libsecret"; @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; # Does not seem to use the odd-unstable policy: https://gitlab.gnome.org/GNOME/libsecret/issues/30 versionPolicy = "none"; diff --git a/pkgs/development/libraries/libsigcxx/3.0.nix b/pkgs/development/libraries/libsigcxx/3.0.nix index 3c92d8e13060..edb74c807bfa 100644 --- a/pkgs/development/libraries/libsigcxx/3.0.nix +++ b/pkgs/development/libraries/libsigcxx/3.0.nix @@ -4,7 +4,7 @@ , pkg-config , meson , ninja -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libsigcxx30"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index cfd161cc9619..cbc2c8a617b4 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, gnome }: stdenv.mkDerivation rec { pname = "libsigc++"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "libsigcxx"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/libsignon-glib/default.nix b/pkgs/development/libraries/libsignon-glib/default.nix index ae7a6775de55..f20f80c28429 100644 --- a/pkgs/development/libraries/libsignon-glib/default.nix +++ b/pkgs/development/libraries/libsignon-glib/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "A library for managing single signon credentials which can be used from GLib applications"; homepage = "https://gitlab.com/accounts-sso/libsignon-glib"; license = licenses.lgpl21; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 64519dc355d4..fc805b2db9ec 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome3, libsysprof-capture +{ stdenv, lib, fetchurl, glib, libxml2, meson, ninja, pkg-config, gnome, libsysprof-capture , gnomeSupport ? true, sqlite, glib-networking, gobject-introspection, vala , libpsl, python3, brotli }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { passthru = { propagatedUserEnvPackages = [ glib-networking.out ]; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libunity/default.nix b/pkgs/development/libraries/libunity/default.nix index 81b7226e3137..c27fce32ec00 100644 --- a/pkgs/development/libraries/libunity/default.nix +++ b/pkgs/development/libraries/libunity/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation { homepage = "https://launchpad.net/libunity"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix index 5fb405f880e8..425a1bab3550 100644 --- a/pkgs/development/libraries/libwnck/3.x.nix +++ b/pkgs/development/libraries/libwnck/3.x.nix @@ -16,7 +16,7 @@ , libstartup_notification , gettext , gobject-introspection -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}${lib.versions.major version}"; versionPolicy = "odd-unstable"; @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { description = "Library to manage X windows and workspaces (via pagers, tasklists, etc.)"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 6db7e1f421b7..67c5a0794ed5 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, libxml2, glibmm, perl, gnome }: stdenv.mkDerivation rec { pname = "libxml++"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 glibmm ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 805aaba9773c..8acb5e858df8 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome3, gnome-online-accounts, gobject-introspection }: +{ lib, stdenv, fetchurl, pkg-config, glib, intltool, json-glib, librest, libsoup, gnome, gnome-online-accounts, gobject-introspection }: stdenv.mkDerivation rec { pname = "libzapojit"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib json-glib librest libsoup gnome-online-accounts ]; # zapojit-0.0.pc passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index a43d99503a3f..7ce2675e3017 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -1,6 +1,6 @@ { lib, stdenv , fetchurl -, gnome3 +, gnome , meson , python3 , ninja @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/mutest/default.nix b/pkgs/development/libraries/mutest/default.nix index 9470b812586a..f2d3a5595530 100644 --- a/pkgs/development/libraries/mutest/default.nix +++ b/pkgs/development/libraries/mutest/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { homepage = "https://ebassi.github.io/mutest/mutest.md.html"; description = "A BDD testing framework for C, inspired by Mocha"; license = licenses.mit; - maintainers = with maintainers; [ jtojnar worldofpeace ]; + maintainers = with maintainers; [ jtojnar ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/osm-gps-map/default.nix b/pkgs/development/libraries/osm-gps-map/default.nix index 9ba581e3a401..79bc2421dc99 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, gnome3, gtk3, gobject-introspection, pkg-config, lib, stdenv }: +{ cairo, fetchzip, glib, gnome, gtk3, gobject-introspection, pkg-config, lib, stdenv }: stdenv.mkDerivation rec { pname = "osm-gps-map"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib gobject-introspection - gnome3.gnome-common gtk3 gnome3.libsoup + gnome.gnome-common gtk3 gnome.libsoup ]; meta = with lib; { diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix index e181ca45a79e..f4dba00d3518 100644 --- a/pkgs/development/libraries/pango/default.nix +++ b/pkgs/development/libraries/pango/default.nix @@ -9,7 +9,7 @@ , gobject-introspection , darwin , fribidi -, gnome3 +, gnome , gi-docgen , makeFontsConf , freefont_ttf @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/pangomm/2.48.nix b/pkgs/development/libraries/pangomm/2.48.nix index a5d452ac16ff..3c25d113d727 100644 --- a/pkgs/development/libraries/pangomm/2.48.nix +++ b/pkgs/development/libraries/pangomm/2.48.nix @@ -8,7 +8,7 @@ , pango , glibmm_2_68 , cairomm_1_16 -, gnome3 +, gnome , ApplicationServices }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "${pname}_2_48"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index d858288af84f..afb79c7eafed 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome3 +{ lib, stdenv, fetchurl, pkg-config, meson, ninja, python3, pango, glibmm, cairomm, gnome , ApplicationServices }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix index 7e8e95ef1eac..7f0ad5acdceb 100644 --- a/pkgs/development/libraries/polkit/default.nix +++ b/pkgs/development/libraries/polkit/default.nix @@ -116,6 +116,6 @@ stdenv.mkDerivation rec { description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); }; } diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix index f739c1bc275e..e3bb938f5f8f 100644 --- a/pkgs/development/libraries/qgnomeplatform/default.nix +++ b/pkgs/development/libraries/qgnomeplatform/default.nix @@ -62,7 +62,7 @@ mkDerivation rec { description = "QPlatformTheme for a better Qt application inclusion in GNOME"; homepage = "https://github.com/FedoraQt/QGnomePlatform"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = teams.gnome.members ++ (with maintainers; [ ]); platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index aa575f7e72aa..b8995e6a2c48 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome3}: +{lib, stdenv, fetchurl, pkg-config, perlPackages, libxml2, libxslt, docbook_xml_dtd_42, gnome}: let pname = "rarian"; version = "0.8.1"; diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index e2bf9bbd49a5..c0ee2c1d3506 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome3, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, glib, gobject-introspection, flex, bison, vala, gettext, gnome, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: let version = "3.34.0"; pname = "template-glib"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/tepl/default.nix b/pkgs/development/libraries/tepl/default.nix index b6ce86ddff4d..f561efb473c5 100644 --- a/pkgs/development/libraries/tepl/default.nix +++ b/pkgs/development/libraries/tepl/default.nix @@ -3,7 +3,7 @@ , meson , ninja , amtk -, gnome3 +, gnome , gobject-introspection , gtk3 , gtksourceview4 @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # correctly installed or GVfs metadata are not supported on this platform. In # the latter case, you should configure Tepl with --disable-gvfs-metadata. - passthru.updateScript = gnome3.updateScript { + passthru.updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index b559d4f59cf0..08c989b799b6 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome3 }: +{ lib, stdenv, fetchurl, meson, ninja, pkg-config, gettext, libxml2, gobject-introspection, gnome }: stdenv.mkDerivation rec { pname = "totem-pl-parser"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index fddf9becb2df..c571e2238447 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -20,7 +20,7 @@ , exempi , giflib , glib -, gnome3 +, gnome , gst_all_1 , icu , json-glib @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 0af1476e7e26..0ee5e0fa5672 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -18,7 +18,7 @@ , sqlite , libxslt , libstemmer -, gnome3 +, gnome , icu , libuuid , libsoup @@ -133,7 +133,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/libraries/vte/2.90.nix b/pkgs/development/libraries/vte/2.90.nix index 4a9e4d8a66c9..55ef86c88a0e 100644 --- a/pkgs/development/libraries/vte/2.90.nix +++ b/pkgs/development/libraries/vte/2.90.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ]; + maintainers = with maintainers; [ astsmtl antono ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 13d4169cf14a..c3631cccbe01 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -6,7 +6,7 @@ , pkg-config , meson , ninja -, gnome3 +, gnome , glib , gtk3 , gobject-introspection @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl3Plus; - maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members; + maintainers = with maintainers; [ astsmtl antono ] ++ teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index f94d35fd131c..93a308a658da 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -5,7 +5,7 @@ , libxml2 , xdg-desktop-portal , gtk3 -, gnome3 +, gnome , glib , wrapGAppsHook , gsettings-desktop-schemas @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { glib gsettings-desktop-schemas # settings exposed by settings portal gtk3 - gnome3.gnome-desktop - gnome3.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) + gnome.gnome-desktop + gnome.gnome-settings-daemon # schemas needed for settings api (mostly useless now that fonts were moved to g-d-s) ]; meta = with lib; { diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 339f21c138b1..de1953622e93 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A service which logs the users’s activities and events"; homepage = "https://zeitgeist.freedesktop.org/"; - maintainers = with maintainers; [ lethalman worldofpeace ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/misc/yelp-tools/default.nix b/pkgs/development/misc/yelp-tools/default.nix index ca7050c06781..fc3be7421adb 100644 --- a/pkgs/development/misc/yelp-tools/default.nix +++ b/pkgs/development/misc/yelp-tools/default.nix @@ -4,7 +4,7 @@ , libxml2 , libxslt , itstool -, gnome3 +, gnome , pkg-config , meson , ninja @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ itstool # build script checks for its presence but I am not sure if anything uses it - gnome3.yelp-xsl + gnome.yelp-xsl ]; pythonPath = [ @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { doCheck = true; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index ede11fdf754e..7e18131eebf6 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.10.0"; + version = "3.11.0"; src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - sha256 = "sha256-lIyDYt6OsBOPq1ytD4B4JxX7JeSGWprH2kqqFMzZcGY="; + sha256 = "sha256-FgE0/OnqUuzpC5jCM4Q1g49F3fg1Mdstr7nys7G1MOs="; }; nativeBuildInputs = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch b/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch new file mode 100644 index 000000000000..0d319eb2a0d4 --- /dev/null +++ b/pkgs/development/python-modules/aioamqp/compat-pamqp-3.patch @@ -0,0 +1,498 @@ +From 17b5be250cb5ecf95cf4f77c8c930450d876efa6 Mon Sep 17 00:00:00 2001 +From: dzen +Date: Thu, 12 Mar 2020 08:32:29 +0100 +Subject: [PATCH 1/3] Moves to pamqp 3.0 + +--- + aioamqp/channel.py | 114 +++++++++++++++++++------------------- + aioamqp/frame.py | 1 - + aioamqp/protocol.py | 22 ++++---- + aioamqp/tests/testcase.py | 2 +- + 4 files changed, 69 insertions(+), 70 deletions(-) + +diff --git a/aioamqp/channel.py b/aioamqp/channel.py +index 7f0f402..ea164c4 100644 +--- a/aioamqp/channel.py ++++ b/aioamqp/channel.py +@@ -9,7 +9,7 @@ + from itertools import count + import warnings + +-import pamqp.specification ++import pamqp.commands + + from . import frame as amqp_frame + from . import exceptions +@@ -78,35 +78,35 @@ def connection_closed(self, server_code=None, server_reason=None, exception=None + + async def dispatch_frame(self, frame): + methods = { +- pamqp.specification.Channel.OpenOk.name: self.open_ok, +- pamqp.specification.Channel.FlowOk.name: self.flow_ok, +- pamqp.specification.Channel.CloseOk.name: self.close_ok, +- pamqp.specification.Channel.Close.name: self.server_channel_close, +- +- pamqp.specification.Exchange.DeclareOk.name: self.exchange_declare_ok, +- pamqp.specification.Exchange.BindOk.name: self.exchange_bind_ok, +- pamqp.specification.Exchange.UnbindOk.name: self.exchange_unbind_ok, +- pamqp.specification.Exchange.DeleteOk.name: self.exchange_delete_ok, +- +- pamqp.specification.Queue.DeclareOk.name: self.queue_declare_ok, +- pamqp.specification.Queue.DeleteOk.name: self.queue_delete_ok, +- pamqp.specification.Queue.BindOk.name: self.queue_bind_ok, +- pamqp.specification.Queue.UnbindOk.name: self.queue_unbind_ok, +- pamqp.specification.Queue.PurgeOk.name: self.queue_purge_ok, +- +- pamqp.specification.Basic.QosOk.name: self.basic_qos_ok, +- pamqp.specification.Basic.ConsumeOk.name: self.basic_consume_ok, +- pamqp.specification.Basic.CancelOk.name: self.basic_cancel_ok, +- pamqp.specification.Basic.GetOk.name: self.basic_get_ok, +- pamqp.specification.Basic.GetEmpty.name: self.basic_get_empty, +- pamqp.specification.Basic.Deliver.name: self.basic_deliver, +- pamqp.specification.Basic.Cancel.name: self.server_basic_cancel, +- pamqp.specification.Basic.Ack.name: self.basic_server_ack, +- pamqp.specification.Basic.Nack.name: self.basic_server_nack, +- pamqp.specification.Basic.RecoverOk.name: self.basic_recover_ok, +- pamqp.specification.Basic.Return.name: self.basic_return, +- +- pamqp.specification.Confirm.SelectOk.name: self.confirm_select_ok, ++ pamqp.commands.Channel.OpenOk.name: self.open_ok, ++ pamqp.commands.Channel.FlowOk.name: self.flow_ok, ++ pamqp.commands.Channel.CloseOk.name: self.close_ok, ++ pamqp.commands.Channel.Close.name: self.server_channel_close, ++ ++ pamqp.commands.Exchange.DeclareOk.name: self.exchange_declare_ok, ++ pamqp.commands.Exchange.BindOk.name: self.exchange_bind_ok, ++ pamqp.commands.Exchange.UnbindOk.name: self.exchange_unbind_ok, ++ pamqp.commands.Exchange.DeleteOk.name: self.exchange_delete_ok, ++ ++ pamqp.commands.Queue.DeclareOk.name: self.queue_declare_ok, ++ pamqp.commands.Queue.DeleteOk.name: self.queue_delete_ok, ++ pamqp.commands.Queue.BindOk.name: self.queue_bind_ok, ++ pamqp.commands.Queue.UnbindOk.name: self.queue_unbind_ok, ++ pamqp.commands.Queue.PurgeOk.name: self.queue_purge_ok, ++ ++ pamqp.commands.Basic.QosOk.name: self.basic_qos_ok, ++ pamqp.commands.Basic.ConsumeOk.name: self.basic_consume_ok, ++ pamqp.commands.Basic.CancelOk.name: self.basic_cancel_ok, ++ pamqp.commands.Basic.GetOk.name: self.basic_get_ok, ++ pamqp.commands.Basic.GetEmpty.name: self.basic_get_empty, ++ pamqp.commands.Basic.Deliver.name: self.basic_deliver, ++ pamqp.commands.Basic.Cancel.name: self.server_basic_cancel, ++ pamqp.commands.Basic.Ack.name: self.basic_server_ack, ++ pamqp.commands.Basic.Nack.name: self.basic_server_nack, ++ pamqp.commands.Basic.RecoverOk.name: self.basic_recover_ok, ++ pamqp.commands.Basic.Return.name: self.basic_return, ++ ++ pamqp.commands.Confirm.SelectOk.name: self.confirm_select_ok, + } + + if frame.name not in methods: +@@ -144,7 +144,7 @@ async def _write_frame_awaiting_response(self, waiter_id, channel_id, request, + + async def open(self): + """Open the channel on the server.""" +- request = pamqp.specification.Channel.Open() ++ request = pamqp.commands.Channel.Open() + return (await self._write_frame_awaiting_response( + 'open', self.channel_id, request, no_wait=False, check_open=False)) + +@@ -159,7 +159,7 @@ async def close(self, reply_code=0, reply_text="Normal Shutdown"): + if not self.is_open: + raise exceptions.ChannelClosed("channel already closed or closing") + self.close_event.set() +- request = pamqp.specification.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) ++ request = pamqp.commands.Channel.Close(reply_code, reply_text, class_id=0, method_id=0) + return (await self._write_frame_awaiting_response( + 'close', self.channel_id, request, no_wait=False, check_open=False)) + +@@ -169,7 +169,7 @@ async def close_ok(self, frame): + self.protocol.release_channel_id(self.channel_id) + + async def _send_channel_close_ok(self): +- request = pamqp.specification.Channel.CloseOk() ++ request = pamqp.commands.Channel.CloseOk() + await self._write_frame(self.channel_id, request) + + async def server_channel_close(self, frame): +@@ -183,7 +183,7 @@ async def server_channel_close(self, frame): + self.connection_closed(results['reply_code'], results['reply_text']) + + async def flow(self, active): +- request = pamqp.specification.Channel.Flow(active) ++ request = pamqp.commands.Channel.Flow(active) + return (await self._write_frame_awaiting_response( + 'flow', self.channel_id, request, no_wait=False, + check_open=False)) +@@ -201,7 +201,7 @@ async def flow_ok(self, frame): + + async def exchange_declare(self, exchange_name, type_name, passive=False, durable=False, + auto_delete=False, no_wait=False, arguments=None): +- request = pamqp.specification.Exchange.Declare( ++ request = pamqp.commands.Exchange.Declare( + exchange=exchange_name, + exchange_type=type_name, + passive=passive, +@@ -222,7 +222,7 @@ async def exchange_declare_ok(self, frame): + return future + + async def exchange_delete(self, exchange_name, if_unused=False, no_wait=False): +- request = pamqp.specification.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) ++ request = pamqp.commands.Exchange.Delete(exchange=exchange_name, if_unused=if_unused, nowait=no_wait) + return await self._write_frame_awaiting_response( + 'exchange_delete', self.channel_id, request, no_wait) + +@@ -235,7 +235,7 @@ async def exchange_bind(self, exchange_destination, exchange_source, routing_key + no_wait=False, arguments=None): + if arguments is None: + arguments = {} +- request = pamqp.specification.Exchange.Bind( ++ request = pamqp.commands.Exchange.Bind( + destination=exchange_destination, + source=exchange_source, + routing_key=routing_key, +@@ -255,7 +255,7 @@ async def exchange_unbind(self, exchange_destination, exchange_source, routing_k + if arguments is None: + arguments = {} + +- request = pamqp.specification.Exchange.Unbind( ++ request = pamqp.commands.Exchange.Unbind( + destination=exchange_destination, + source=exchange_source, + routing_key=routing_key, +@@ -297,7 +297,7 @@ async def queue_declare(self, queue_name=None, passive=False, durable=False, + + if not queue_name: + queue_name = 'aioamqp.gen-' + str(uuid.uuid4()) +- request = pamqp.specification.Queue.Declare( ++ request = pamqp.commands.Queue.Declare( + queue=queue_name, + passive=passive, + durable=durable, +@@ -327,7 +327,7 @@ async def queue_delete(self, queue_name, if_unused=False, if_empty=False, no_wai + if_empty: bool, the queue is deleted if it has no messages. Raise if not. + no_wait: bool, if set, the server will not respond to the method + """ +- request = pamqp.specification.Queue.Delete( ++ request = pamqp.commands.Queue.Delete( + queue=queue_name, + if_unused=if_unused, + if_empty=if_empty, +@@ -346,7 +346,7 @@ async def queue_bind(self, queue_name, exchange_name, routing_key, no_wait=False + if arguments is None: + arguments = {} + +- request = pamqp.specification.Queue.Bind( ++ request = pamqp.commands.Queue.Bind( + queue=queue_name, + exchange=exchange_name, + routing_key=routing_key, +@@ -367,7 +367,7 @@ async def queue_unbind(self, queue_name, exchange_name, routing_key, arguments=N + if arguments is None: + arguments = {} + +- request = pamqp.specification.Queue.Unbind( ++ request = pamqp.commands.Queue.Unbind( + queue=queue_name, + exchange=exchange_name, + routing_key=routing_key, +@@ -383,7 +383,7 @@ async def queue_unbind_ok(self, frame): + logger.debug("Queue unbound") + + async def queue_purge(self, queue_name, no_wait=False): +- request = pamqp.specification.Queue.Purge( ++ request = pamqp.commands.Queue.Purge( + queue=queue_name, nowait=no_wait + ) + return (await self._write_frame_awaiting_response( +@@ -406,7 +406,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, + if properties is None: + properties = {} + +- method_request = pamqp.specification.Basic.Publish( ++ method_request = pamqp.commands.Basic.Publish( + exchange=exchange_name, + routing_key=routing_key, + mandatory=mandatory, +@@ -417,7 +417,7 @@ async def basic_publish(self, payload, exchange_name, routing_key, + + header_request = pamqp.header.ContentHeader( + body_size=len(payload), +- properties=pamqp.specification.Basic.Properties(**properties) ++ properties=pamqp.commands.Basic.Properties(**properties) + ) + await self._write_frame(self.channel_id, header_request, drain=False) + +@@ -446,7 +446,7 @@ async def basic_qos(self, prefetch_size=0, prefetch_count=0, connection_global=F + settings should apply per-consumer channel; and global=true to mean + that the QoS settings should apply per-channel. + """ +- request = pamqp.specification.Basic.Qos( ++ request = pamqp.commands.Basic.Qos( + prefetch_size, prefetch_count, connection_global + ) + return (await self._write_frame_awaiting_response( +@@ -490,7 +490,7 @@ async def basic_consume(self, callback, queue_name='', consumer_tag='', no_local + if arguments is None: + arguments = {} + +- request = pamqp.specification.Basic.Consume( ++ request = pamqp.commands.Basic.Consume( + queue=queue_name, + consumer_tag=consumer_tag, + no_local=no_local, +@@ -561,7 +561,7 @@ async def server_basic_cancel(self, frame): + callback, error) + + async def basic_cancel(self, consumer_tag, no_wait=False): +- request = pamqp.specification.Basic.Cancel(consumer_tag, no_wait) ++ request = pamqp.commands.Basic.Cancel(consumer_tag, no_wait) + return (await self._write_frame_awaiting_response( + 'basic_cancel', self.channel_id, request, no_wait=no_wait) + ) +@@ -575,7 +575,7 @@ async def basic_cancel_ok(self, frame): + logger.debug("Cancel ok") + + async def basic_get(self, queue_name='', no_ack=False): +- request = pamqp.specification.Basic.Get(queue=queue_name, no_ack=no_ack) ++ request = pamqp.commands.Basic.Get(queue=queue_name, no_ack=no_ack) + return (await self._write_frame_awaiting_response( + 'basic_get', self.channel_id, request, no_wait=False) + ) +@@ -606,11 +606,11 @@ async def basic_get_empty(self, frame): + future.set_exception(exceptions.EmptyQueue) + + async def basic_client_ack(self, delivery_tag, multiple=False): +- request = pamqp.specification.Basic.Ack(delivery_tag, multiple) ++ request = pamqp.commands.Basic.Ack(delivery_tag, multiple) + await self._write_frame(self.channel_id, request) + + async def basic_client_nack(self, delivery_tag, multiple=False, requeue=True): +- request = pamqp.specification.Basic.Nack(delivery_tag, multiple, requeue) ++ request = pamqp.commands.Basic.Nack(delivery_tag, multiple, requeue) + await self._write_frame(self.channel_id, request) + + async def basic_server_ack(self, frame): +@@ -620,15 +620,15 @@ async def basic_server_ack(self, frame): + fut.set_result(True) + + async def basic_reject(self, delivery_tag, requeue=False): +- request = pamqp.specification.Basic.Reject(delivery_tag, requeue) ++ request = pamqp.commands.Basic.Reject(delivery_tag, requeue) + await self._write_frame(self.channel_id, request) + + async def basic_recover_async(self, requeue=True): +- request = pamqp.specification.Basic.RecoverAsync(requeue) ++ request = pamqp.commands.Basic.RecoverAsync(requeue) + await self._write_frame(self.channel_id, request) + + async def basic_recover(self, requeue=True): +- request = pamqp.specification.Basic.Recover(requeue) ++ request = pamqp.commands.Basic.Recover(requeue) + return (await self._write_frame_awaiting_response( + 'basic_recover', self.channel_id, request, no_wait=False) + ) +@@ -681,7 +681,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + delivery_tag = next(self.delivery_tag_iter) # pylint: disable=stop-iteration-return + fut = self._set_waiter('basic_server_ack_{}'.format(delivery_tag)) + +- method_request = pamqp.specification.Basic.Publish( ++ method_request = pamqp.commands.Basic.Publish( + exchange=exchange_name, + routing_key=routing_key, + mandatory=mandatory, +@@ -689,7 +689,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + ) + await self._write_frame(self.channel_id, method_request, drain=False) + +- properties = pamqp.specification.Basic.Properties(**properties) ++ properties = pamqp.commands.Basic.Properties(**properties) + header_request = pamqp.header.ContentHeader( + body_size=len(payload), properties=properties + ) +@@ -710,7 +710,7 @@ async def publish(self, payload, exchange_name, routing_key, properties=None, ma + async def confirm_select(self, *, no_wait=False): + if self.publisher_confirms: + raise ValueError('publisher confirms already enabled') +- request = pamqp.specification.Confirm.Select(nowait=no_wait) ++ request = pamqp.commands.Confirm.Select(nowait=no_wait) + + return (await self._write_frame_awaiting_response( + 'confirm_select', self.channel_id, request, no_wait) +diff --git a/aioamqp/frame.py b/aioamqp/frame.py +index d70cfd7..af27ab5 100644 +--- a/aioamqp/frame.py ++++ b/aioamqp/frame.py +@@ -42,7 +42,6 @@ + import socket + + import pamqp.encode +-import pamqp.specification + import pamqp.frame + + from . import exceptions +diff --git a/aioamqp/protocol.py b/aioamqp/protocol.py +index e111dea..f0b928d 100644 +--- a/aioamqp/protocol.py ++++ b/aioamqp/protocol.py +@@ -5,9 +5,9 @@ + import asyncio + import logging + ++import pamqp.commands + import pamqp.frame + import pamqp.heartbeat +-import pamqp.specification + + from . import channel as amqp_channel + from . import constants as amqp_constants +@@ -159,7 +159,7 @@ async def close(self, no_wait=False, timeout=None): + """Close connection (and all channels)""" + await self.ensure_open() + self.state = CLOSING +- request = pamqp.specification.Connection.Close( ++ request = pamqp.commands.Connection.Close( + reply_code=0, + reply_text='', + class_id=0, +@@ -254,11 +254,11 @@ async def dispatch_frame(self, frame_channel=None, frame=None): + """Dispatch the received frame to the corresponding handler""" + + method_dispatch = { +- pamqp.specification.Connection.Close.name: self.server_close, +- pamqp.specification.Connection.CloseOk.name: self.close_ok, +- pamqp.specification.Connection.Tune.name: self.tune, +- pamqp.specification.Connection.Start.name: self.start, +- pamqp.specification.Connection.OpenOk.name: self.open_ok, ++ pamqp.commands.Connection.Close.name: self.server_close, ++ pamqp.commands.Connection.CloseOk.name: self.close_ok, ++ pamqp.commands.Connection.Tune.name: self.tune, ++ pamqp.commands.Connection.Start.name: self.start, ++ pamqp.commands.Connection.OpenOk.name: self.open_ok, + } + if frame_channel is None and frame is None: + frame_channel, frame = await self.get_frame() +@@ -395,7 +395,7 @@ async def start_ok(self, client_properties, mechanism, auth, locale): + def credentials(): + return '\0{LOGIN}\0{PASSWORD}'.format(**auth) + +- request = pamqp.specification.Connection.StartOk( ++ request = pamqp.commands.Connection.StartOk( + client_properties=client_properties, + mechanism=mechanism, + locale=locale, +@@ -417,7 +417,7 @@ async def server_close(self, frame): + self._stream_writer.close() + + async def _close_ok(self): +- request = pamqp.specification.Connection.CloseOk() ++ request = pamqp.commands.Connection.CloseOk() + await self._write_frame(0, request) + + async def tune(self, frame): +@@ -426,7 +426,7 @@ async def tune(self, frame): + self.server_heartbeat = frame.heartbeat + + async def tune_ok(self, channel_max, frame_max, heartbeat): +- request = pamqp.specification.Connection.TuneOk( ++ request = pamqp.commands.Connection.TuneOk( + channel_max, frame_max, heartbeat + ) + await self._write_frame(0, request) +@@ -436,7 +436,7 @@ async def secure_ok(self, login_response): + + async def open(self, virtual_host, capabilities='', insist=False): + """Open connection to virtual host.""" +- request = pamqp.specification.Connection.Open( ++ request = pamqp.commands.Connection.Open( + virtual_host, capabilities, insist + ) + await self._write_frame(0, request) +diff --git a/aioamqp/tests/testcase.py b/aioamqp/tests/testcase.py +index 120104b..d6d702b 100644 +--- a/aioamqp/tests/testcase.py ++++ b/aioamqp/tests/testcase.py +@@ -147,7 +147,7 @@ def server_version(self, amqp=None): + if amqp is None: + amqp = self.amqp + +- server_version = tuple(int(x) for x in amqp.server_properties['version'].decode().split('.')) ++ server_version = tuple(int(x) for x in amqp.server_properties['version'].split('.')) + return server_version + + async def check_exchange_exists(self, exchange_name): + +From c900f6d5e8ef273000d221d0e46ab81ed4aed2a2 Mon Sep 17 00:00:00 2001 +From: dzen +Date: Wed, 25 Mar 2020 11:02:04 +0100 +Subject: [PATCH 2/3] fix pamqp version for tests on travis + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index a740243..2277b28 100644 +--- a/setup.py ++++ b/setup.py +@@ -25,7 +25,7 @@ + 'aioamqp', + ], + install_requires=[ +- 'pamqp>=2.2.0,<3', ++ 'pamqp>=3.0.0', # TODO(bcalvez): for tests purpose, until 3.0 is released + ], + classifiers=[ + "Development Status :: 4 - Beta", + +From 836340e8d881a93b0111b9aed6f2bb2926f38de6 Mon Sep 17 00:00:00 2001 +From: dzen +Date: Wed, 25 Mar 2020 11:37:45 +0100 +Subject: [PATCH 3/3] pamqp 3.0 is no more compatible with 3.5 + +--- + .travis.yml | 1 - + setup.cfg | 2 +- + setup.py | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/.travis.yml b/.travis.yml +index 1069e7c..46d6fea 100644 +--- a/.travis.yml ++++ b/.travis.yml +@@ -1,7 +1,6 @@ + language: python + dist: bionic + python: +-- 3.5 + - 3.6 + - 3.7-dev + - 3.8 +diff --git a/setup.cfg b/setup.cfg +index 0ab7d0b..d0ba16e 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -1,2 +1,2 @@ + [bdist_wheel] +-python-tag = py35.py36.py37.py38 ++python-tag = py36.py37.py38 +diff --git a/setup.py b/setup.py +index 2277b28..c413078 100644 +--- a/setup.py ++++ b/setup.py +@@ -27,6 +27,7 @@ + install_requires=[ + 'pamqp==3.0.0a6', # TODO(bcalvez): for tests purpose, until 3.0 is released + ], ++ python_requires=">=3.6", + classifiers=[ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", +@@ -34,7 +35,6 @@ + "Operating System :: OS Independent", + "Programming Language :: Python", + "Programming Language :: Python :: 3", +- "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", diff --git a/pkgs/development/python-modules/aioamqp/default.nix b/pkgs/development/python-modules/aioamqp/default.nix index 5be5b6a1dd08..a2882ce1288b 100644 --- a/pkgs/development/python-modules/aioamqp/default.nix +++ b/pkgs/development/python-modules/aioamqp/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { sha256 = "1gpfsrc2vi6w33c9zsycd2qn589pr7a222rb41r85m915283zy48"; }; + patches = [ ./compat-pamqp-3.patch ]; + propagatedBuildInputs = [ pamqp ]; diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix index c11833ba5793..fa92bc44891a 100644 --- a/pkgs/development/python-modules/anytree/default.nix +++ b/pkgs/development/python-modules/anytree/default.nix @@ -52,6 +52,6 @@ buildPythonPackage rec { description = "Powerful and Lightweight Python Tree Data Structure"; homepage = "https://github.com/c0fec0de/anytree"; license = licenses.asl20; - maintainers = [ maintainers.worldofpeace ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index 9271adeb617f..f6d59c633cd9 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -50,6 +50,6 @@ buildPythonPackage rec { description = "Provides an asynchronous client and server implementation of the SSHv2 protocol on top of the Python asyncio framework"; homepage = "https://asyncssh.readthedocs.io/en/latest"; license = licenses.epl20; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/b2sdk/default.nix b/pkgs/development/python-modules/b2sdk/default.nix index b4a3e7acaec0..47ed0fe5fd68 100644 --- a/pkgs/development/python-modules/b2sdk/default.nix +++ b/pkgs/development/python-modules/b2sdk/default.nix @@ -1,17 +1,48 @@ -{ lib, buildPythonPackage, fetchPypi, setuptools-scm, isPy27, pytestCheckHook -, requests, arrow, logfury, tqdm }: +{ lib +, arrow +, buildPythonPackage +, fetchPypi +, importlib-metadata +, isPy27 +, logfury +, pytestCheckHook +, pytest-lazy-fixture +, pytest-mock +, pythonOlder +, requests +, setuptools-scm +, tqdm +}: buildPythonPackage rec { pname = "b2sdk"; - version = "1.6.0"; - + version = "1.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-6fjreuMUC056ljddfAidfBbJkvEDndB/dIkx1bF7efs="; + sha256 = "sha256-8X5XLh9SxZI1P7/2ZjOy8ipcEzTcriJfGI7KlMXncv4="; }; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + arrow + logfury + requests + tqdm + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; + + checkInputs = [ + pytestCheckHook + pytest-lazy-fixture + pytest-mock + ]; + postPatch = '' substituteInPlace setup.py \ --replace 'setuptools_scm<6.0' 'setuptools_scm' @@ -19,16 +50,16 @@ buildPythonPackage rec { --replace 'arrow>=0.8.0,<1.0.0' 'arrow' ''; + disabledTests = [ + # Test requires an API key + "test_raw_api" + "test_files_headers" + ]; + pythonImportsCheck = [ "b2sdk" ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ requests arrow logfury tqdm ]; - - # requires unpackaged dependencies like liccheck - doCheck = false; - meta = with lib; { - description = "Client library and utilities for access to B2 Cloud Storage (backblaze)."; + description = "Client library and utilities for access to B2 Cloud Storage (backblaze)"; homepage = "https://github.com/Backblaze/b2-sdk-python"; license = licenses.mit; }; diff --git a/pkgs/development/python-modules/dask-image/default.nix b/pkgs/development/python-modules/dask-image/default.nix index a38350f0f6ac..38d113eee706 100644 --- a/pkgs/development/python-modules/dask-image/default.nix +++ b/pkgs/development/python-modules/dask-image/default.nix @@ -2,12 +2,10 @@ , buildPythonPackage , fetchPypi , dask -, numpy, toolz # dask[array] , scipy , pims -, pytest -, pytest-flake8 , scikitimage +, pytestCheckHook }: buildPythonPackage rec { @@ -19,24 +17,17 @@ buildPythonPackage rec { sha256 = "0bf7ea8dcd9d795505b498bd632394720c048f50761e23c574d9a6bacfb27cbb"; }; - nativeBuildInputs = [ pytest-flake8 ]; - propagatedBuildInputs = [ dask numpy toolz scipy pims ]; + propagatedBuildInputs = [ dask scipy pims ]; + + prePatch = '' + substituteInPlace setup.cfg --replace "--flake8" "" + ''; + checkInputs = [ - pytest + pytestCheckHook scikitimage ]; - # ignore errors from newer versions of flake8 - prePatch = '' - substituteInPlace setup.cfg \ - --replace "docs/conf.py,versioneer.py" \ - "docs/conf.py,versioneer.py,dask_image/ndfilters/_utils.py" - ''; - - # scikit.external is not exported - checkPhase = '' - pytest --ignore=tests/test_dask_image/ - ''; pythonImportsCheck = [ "dask_image" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/gtimelog/default.nix b/pkgs/development/python-modules/gtimelog/default.nix index bb31baa78880..15a1ddbf0614 100644 --- a/pkgs/development/python-modules/gtimelog/default.nix +++ b/pkgs/development/python-modules/gtimelog/default.nix @@ -46,11 +46,11 @@ buildPythonPackage rec { To run gtimelog successfully on a system that does not have full GNOME 3 installed, the following NixOS options should be set: - programs.dconf.enable = true; - - services.gnome3.gnome-keyring.enable = true; + - services.gnome.gnome-keyring.enable = true; In addition, the following packages should be added to the environment: - - gnome3.adwaita-icon-theme - - gnome3.dconf + - gnome.adwaita-icon-theme + - gnome.dconf ''; homepage = "https://gtimelog.org/"; license = licenses.gpl2Plus; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix index db59ba70bb26..bb186d6594c0 100644 --- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix +++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, fetchpatch , isPy3k +, fetchPypi +, substituteAll +, ffmpeg +, python }: buildPythonPackage rec { pname = "imageio-ffmpeg"; - version = "0.4.2"; - - src = fetchPypi { - inherit pname version; - sha256 = "13b05b17a941a9f4a90b16910b1ffac159448cff051a153da8ba4b4343ffa195"; - }; - patches = [ (fetchpatch { - # Fixes compatibility with python3.9 - # Should be included in the next release after 0.4.2 - url = "https://github.com/imageio/imageio-ffmpeg/pull/43/commits/b90c39fe3d29418d67d953588ed9fdf4d848f811.patch"; - sha256 = "0d9kf4w6ldwag3s2dr9zjin6wrj66fnl4fn8379ci4q4qfsqgx3f"; - })]; + version = "0.4.3"; disabled = !isPy3k; - # No test infrastructure in repository. - doCheck = false; + src = fetchPypi { + inherit pname version; + sha256 = "f826260a3207b872f1a4ba87ec0c8e02c00afba4fd03348a59049bdd8215841e"; + }; + + patches = [ + (substituteAll { + src = ./ffmpeg-path.patch; + ffmpeg = "${ffmpeg}/bin/ffmpeg"; + }) + ]; + + checkPhase = '' + runHook preCheck + + ${python.interpreter} << EOF + from imageio_ffmpeg import get_ffmpeg_version + assert get_ffmpeg_version() == '${ffmpeg.version}' + EOF + + runHook postCheck + ''; + + pythonImportsCheck = [ "imageio_ffmpeg" ]; meta = with lib; { description = "FFMPEG wrapper for Python"; diff --git a/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch new file mode 100644 index 000000000000..d193ec199f9b --- /dev/null +++ b/pkgs/development/python-modules/imageio-ffmpeg/ffmpeg-path.patch @@ -0,0 +1,39 @@ +diff --git a/imageio_ffmpeg/_utils.py b/imageio_ffmpeg/_utils.py +index 1399cfd..c0eb9be 100644 +--- a/imageio_ffmpeg/_utils.py ++++ b/imageio_ffmpeg/_utils.py +@@ -23,33 +23,7 @@ def get_ffmpeg_exe(): + if exe: + return exe + +- plat = get_platform() +- +- # 2. Try from here +- bin_dir = resource_filename("imageio_ffmpeg", "binaries") +- exe = os.path.join(bin_dir, FNAME_PER_PLATFORM.get(plat, "")) +- if exe and os.path.isfile(exe) and _is_valid_exe(exe): +- return exe +- +- # 3. Try binary from conda package +- # (installed e.g. via `conda install ffmpeg -c conda-forge`) +- if plat.startswith("win"): +- exe = os.path.join(sys.prefix, "Library", "bin", "ffmpeg.exe") +- else: +- exe = os.path.join(sys.prefix, "bin", "ffmpeg") +- if exe and os.path.isfile(exe) and _is_valid_exe(exe): +- return exe +- +- # 4. Try system ffmpeg command +- exe = "ffmpeg" +- if _is_valid_exe(exe): +- return exe +- +- # Nothing was found +- raise RuntimeError( +- "No ffmpeg exe could be found. Install ffmpeg on your system, " +- "or set the IMAGEIO_FFMPEG_EXE environment variable." +- ) ++ return '@ffmpeg@' + + + def _popen_kwargs(prevent_sigint=False): diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 2b334fd121ce..1672e798f304 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -1,17 +1,12 @@ { lib , buildPythonPackage , isPy27 -, pathlib , fetchPypi +, imageio-ffmpeg +, numpy , pillow , psutil -, imageio-ffmpeg -, pytest -, numpy -, isPy3k -, ffmpeg_3 -, futures ? null -, enum34 +, pytestCheckHook }: buildPythonPackage rec { @@ -24,26 +19,21 @@ buildPythonPackage rec { inherit pname version; }; - checkInputs = [ pytest psutil ] ++ lib.optionals isPy3k [ - imageio-ffmpeg ffmpeg_3 - ]; - propagatedBuildInputs = [ numpy pillow ]; + propagatedBuildInputs = [ + imageio-ffmpeg + numpy + pillow + ]; - checkPhase = '' + checkInputs = [ + psutil + pytestCheckHook + ]; + + preCheck = '' export IMAGEIO_USERDIR="$TMP" export IMAGEIO_NO_INTERNET="true" export HOME="$(mktemp -d)" - py.test - ''; - - # For some reason, importing imageio also imports xml on Nix, see - # https://github.com/imageio/imageio/issues/395 - - # Also, there are tests that test the downloading of ffmpeg if it's not installed. - # "Uncomment" those by renaming. - postPatch = '' - substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\"," - substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed' ''; meta = with lib; { @@ -51,5 +41,4 @@ buildPythonPackage rec { homepage = "http://imageio.github.io/"; license = licenses.bsd2; }; - } diff --git a/pkgs/development/python-modules/infoqscraper/default.nix b/pkgs/development/python-modules/infoqscraper/default.nix deleted file mode 100644 index 629f343a7cb9..000000000000 --- a/pkgs/development/python-modules/infoqscraper/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ lib -, buildPythonPackage -, html5lib -, six -, beautifulsoup4 -, pkgs -}: - -buildPythonPackage rec { - version = "0.1.0"; - pname = "infoqscraper"; - - src = pkgs.fetchFromGitHub { - owner = "cykl"; - repo = pname; - rev = "v${version}"; - sha256 = "07mxp4mla7fwfc032f3mxrhjarnhkjqdxxibf9ba87c93z3dq8jj"; - }; - - # requires network - doCheck = false; - - buildInputs = [ html5lib ]; - propagatedBuildInputs = [ six beautifulsoup4 pkgs.ffmpeg_3 pkgs.swftools pkgs.rtmpdump ]; - - meta = with lib; { - description = "Discover presentations and/or create a movie consisting of slides and audio track from an infoq url"; - homepage = "https://github.com/cykl/infoqscraper/wiki"; - license = licenses.mit; - maintainers = with maintainers; [ edwtjo ]; - # infoq HTML has changed: - # https://github.com/cykl/infoqscraper/issues/29 - broken = true; - }; - -} diff --git a/pkgs/development/python-modules/monty/default.nix b/pkgs/development/python-modules/monty/default.nix index 53f139dde343..4690f9f8820f 100644 --- a/pkgs/development/python-modules/monty/default.nix +++ b/pkgs/development/python-modules/monty/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , pythonOlder , msgpack -, nose +, pytestCheckHook , numpy , pydantic , pymongo @@ -31,7 +31,7 @@ buildPythonPackage rec { ]; checkInputs = [ - nose + pytestCheckHook numpy pydantic pymongo @@ -42,12 +42,6 @@ buildPythonPackage rec { --replace 'self.assertEqual("/usr/bin/find", which("/usr/bin/find"))' '#' ''; - checkPhase = '' - runHook preCheck - nosetests -v - runHook postCheck - ''; - meta = with lib; { description = "Serves as a complement to the Python standard library by providing a suite of tools to solve many common problems"; longDescription = " diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix index d018a924d898..33d027f1beed 100644 --- a/pkgs/development/python-modules/ofxparse/default.nix +++ b/pkgs/development/python-modules/ofxparse/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , six , beautifulsoup4 , lxml @@ -8,11 +8,15 @@ buildPythonPackage rec { pname = "ofxparse"; - version = "0.20"; + version = "unstable-2020-02-05"; - src = fetchPypi { - inherit pname version; - sha256 = "0zn3grc6xhgzcc81qc3dxkkwk731cjjqqhb46smw12lk09cdnigb"; + # The newer changes haven't been released yet and ledger-autosync + # depends on them: + src = fetchFromGitHub { + owner = "jseutter"; + repo = "ofxparse"; + rev = "3236cfd96434feb6bc79a8b66f3400f18e2ad3c4"; + sha256 = "1rkp174102q7hwjrg3na0qnfd612xb3r360b9blkbprjhzxy7gr7"; }; propagatedBuildInputs = [ six beautifulsoup4 lxml ]; diff --git a/pkgs/development/python-modules/pyatspi/default.nix b/pkgs/development/python-modules/pyatspi/default.nix index bd4de5229432..b566edef64d1 100644 --- a/pkgs/development/python-modules/pyatspi/default.nix +++ b/pkgs/development/python-modules/pyatspi/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome3 }: +{ lib, fetchurl, pkg-config, buildPythonPackage, isPy3k, at-spi2-core, pygobject3, gnome }: buildPythonPackage rec { pname = "pyatspi"; @@ -20,7 +20,7 @@ buildPythonPackage rec { disabled = !isPy3k; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/python-modules/pybrowserid/default.nix b/pkgs/development/python-modules/pybrowserid/default.nix index 7517de597544..391be3c17bd4 100644 --- a/pkgs/development/python-modules/pybrowserid/default.nix +++ b/pkgs/development/python-modules/pybrowserid/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { description = "Python library for the BrowserID Protocol"; homepage = "https://github.com/mozilla/PyBrowserID"; license = licenses.mpl20; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/python-modules/pygobject/3.36.nix b/pkgs/development/python-modules/pygobject/3.36.nix index 27bf8762d591..ce9410eaf8b5 100644 --- a/pkgs/development/python-modules/pygobject/3.36.nix +++ b/pkgs/development/python-modules/pygobject/3.36.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, buildPythonPackage, pkg-config, glib, gobject-introspection, -pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome3 }: +pycairo, cairo, which, ncurses, meson, ninja, isPy3k, gnome }: buildPythonPackage rec { pname = "pygobject"; diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix index 641a30b16277..373577dc4675 100644 --- a/pkgs/development/python-modules/pygobject/3.nix +++ b/pkgs/development/python-modules/pygobject/3.nix @@ -12,7 +12,7 @@ , meson , ninja , isPy3k -, gnome3 +, gnome }: buildPythonPackage rec { @@ -50,7 +50,7 @@ buildPythonPackage rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "python3.pkgs.${pname}3"; versionPolicy = "odd-unstable"; diff --git a/pkgs/development/python-modules/rst2ansi/default.nix b/pkgs/development/python-modules/rst2ansi/default.nix new file mode 100644 index 000000000000..e161f56d3177 --- /dev/null +++ b/pkgs/development/python-modules/rst2ansi/default.nix @@ -0,0 +1,20 @@ +{ lib, buildPythonPackage, fetchPypi, docutils, }: + +buildPythonPackage rec { + pname = "rst2ansi"; + version = "0.1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Gxf7mmKNQPV5M60aOqlSNGREvgaUaVCOc+lQYNoz/m8="; + }; + + propagatedBuildInputs = [ docutils ]; + + meta = with lib; { + description = "A rst converter to ansi-decorated console output"; + homepage = "https://github.com/Snaipe/python-rst-to-ansi"; + license = licenses.mit; + maintainers = with maintainers; [ vojta001 ]; + }; +} diff --git a/pkgs/development/python-modules/stytra/default.nix b/pkgs/development/python-modules/stytra/default.nix index 80eefc0a639e..fba544789a81 100644 --- a/pkgs/development/python-modules/stytra/default.nix +++ b/pkgs/development/python-modules/stytra/default.nix @@ -8,7 +8,6 @@ , pandas , tables , git -, ffmpeg_3 , scikitimage , matplotlib , qdarkstyle @@ -59,7 +58,6 @@ buildPythonPackage rec { pandas tables git - ffmpeg_3 scikitimage matplotlib qdarkstyle @@ -79,7 +77,7 @@ buildPythonPackage rec { meta = { homepage = "https://github.com/portugueslab/stytra"; description = "A modular package to control stimulation and track behaviour"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ tbenst ]; }; } diff --git a/pkgs/development/ruby-modules/solargraph/default.nix b/pkgs/development/ruby-modules/solargraph/default.nix index e95fb1573dd2..356224c02309 100644 --- a/pkgs/development/ruby-modules/solargraph/default.nix +++ b/pkgs/development/ruby-modules/solargraph/default.nix @@ -11,6 +11,6 @@ bundlerApp { description = "A Ruby language server"; homepage = "https://solargraph.org/"; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace nicknovitski angristan ]; + maintainers = with maintainers; [ nicknovitski angristan ]; }; } diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index c2f0236ed0b4..78f8bbeb683e 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -25,6 +25,6 @@ mkDerivation rec { description = "Tool that visualizes massif data generated by valgrind"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman zraexy ]; + maintainers = with maintainers; [ zraexy ]; }; } diff --git a/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch b/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch new file mode 100644 index 000000000000..bfb636bf562a --- /dev/null +++ b/pkgs/development/tools/async-profiler/0001-Fix-darwin-build.patch @@ -0,0 +1,27 @@ +From e54c17899118ea940c36bc17a48d8ff759243f16 Mon Sep 17 00:00:00 2001 +From: Uri Baghin +Date: Sat, 8 May 2021 09:49:18 +1000 +Subject: [PATCH] Fix darwin build. + +--- + src/itimer.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/itimer.cpp b/src/itimer.cpp +index 08c46d1..52628ef 100644 +--- a/src/itimer.cpp ++++ b/src/itimer.cpp +@@ -52,8 +52,8 @@ Error ITimer::start(Arguments& args) { + + OS::installSignalHandler(SIGPROF, signalHandler); + +- long sec = _interval / 1000000000; +- long usec = (_interval % 1000000000) / 1000; ++ time_t sec = _interval / 1000000000; ++ suseconds_t usec = (_interval % 1000000000) / 1000; + struct itimerval tv = {{sec, usec}, {sec, usec}}; + + if (setitimer(ITIMER_PROF, &tv, NULL) != 0) { +-- +2.31.1 + diff --git a/pkgs/development/tools/async-profiler/default.nix b/pkgs/development/tools/async-profiler/default.nix index d271528de7ef..66177d3a34f3 100644 --- a/pkgs/development/tools/async-profiler/default.nix +++ b/pkgs/development/tools/async-profiler/default.nix @@ -22,6 +22,11 @@ stdenv.mkDerivation rec { runHook postInstall ''; + patches = [ + # https://github.com/jvm-profiling-tools/async-profiler/pull/428 + ./0001-Fix-darwin-build.patch + ]; + fixupPhase = '' substituteInPlace $out/bin/async-profiler \ --replace 'JATTACH=$SCRIPT_DIR/build/jattach' \ diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 446d54f90ca4..fd1cc241195a 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -1,21 +1,41 @@ { fetchFromGitHub, lib, python3Packages }: +let + python3Packages2 = python3Packages.override { + overrides = self: super: { + arrow = self.callPackage ../../python-modules/arrow/2.nix { }; + }; + }; +in +let + python3Packages = python3Packages2; # two separate let … in to avoid infinite recursion +in python3Packages.buildPythonApplication rec { pname = "backblaze-b2"; - version = "2.1.0"; + version = "2.4.0"; - src = fetchFromGitHub { - owner = "Backblaze"; - repo = "B2_Command_Line_Tool"; - rev = "v${version}"; - sha256 = "1kkpvxqgh5pw4kr8lh5gy9d7960hv9zvajbjiqhj6xgykwbpbgmq"; + src = python3Packages.fetchPypi { + inherit version; + pname = "b2"; + sha256 = "sha256-nNQDdSjUolj3PjWRn1fPBAEtPlgeent2PxzHqwH1Z6s="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'setuptools_scm<6.0' 'setuptools_scm' + ''; + propagatedBuildInputs = with python3Packages; [ b2sdk class-registry phx-class-registry setuptools + docutils + rst2ansi + ]; + + nativeBuildInputs = with python3Packages; [ + setuptools-scm ]; checkInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix index d031145a9977..b536dc940670 100644 --- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix +++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome3 +{ lib, fetchurl, pkg-config, libxml2Python, libxslt, intltool, gnome , python2Packages }: python2Packages.buildPythonApplication rec { @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = [ libxml2Python ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index 55fd0feff105..5951c8d71fd5 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -8,7 +8,7 @@ , docbook-xsl-nons , libxslt , gettext -, gnome3 +, gnome , withDblatex ? false, dblatex }: @@ -77,7 +77,7 @@ python3.pkgs.buildPythonApplication rec { passthru = { # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index d77772c32db6..3e5c7b0438fd 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -15,7 +15,7 @@ , libxml2 , docbook-xsl-nons , docbook_xml_dtd_42 -, gnome3 +, gnome , gdk-pixbuf , libxslt , gsettings-desktop-schemas @@ -54,11 +54,11 @@ stdenv.mkDerivation rec { python3.pkgs.pygobject3 gsettings-desktop-schemas gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 5c130a99c926..73126752b98e 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -7,7 +7,7 @@ , gtk3 , python3 , wrapGAppsHook -, gnome3 +, gnome , libwnck3 , gobject-introspection , gettext @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { buildInputs = [ glib - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme gtk3 libwnck3 ]; @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "dfeet"; versionPolicy = "none"; diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix index b78c111ccbf8..06487845fb3d 100644 --- a/pkgs/development/tools/misc/gob2/default.nix +++ b/pkgs/development/tools/misc/gob2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome3 }: +{ lib, stdenv, fetchurl, pkg-config, glib, bison, flex, gnome }: stdenv.mkDerivation rec { pname = "gob2"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib bison flex ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 96ce9d405914..ab196ebc5b34 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -14,7 +14,7 @@ , libgsf , gcab , bzip2 -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/misc/opengrok/default.nix b/pkgs/development/tools/misc/opengrok/default.nix index 01f2ced1f4bb..0a2bbc30fb52 100644 --- a/pkgs/development/tools/misc/opengrok/default.nix +++ b/pkgs/development/tools/misc/opengrok/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Source code search and cross reference engine"; homepage = "https://opengrok.github.io/OpenGrok/"; license = licenses.cddl; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/nemiver/default.nix b/pkgs/development/tools/nemiver/default.nix index 58c0f2ed28b1..7894dfe797d6 100644 --- a/pkgs/development/tools/nemiver/default.nix +++ b/pkgs/development/tools/nemiver/default.nix @@ -2,7 +2,7 @@ , fetchurl , fetchpatch , pkg-config -, gnome3 +, gnome , gtk3 , libxml2 , intltool @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = "nemiver"; versionPolicy = "none"; }; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 725d8d10e118..6ceda016045b 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -16,7 +16,7 @@ , shared-mime-info , systemd , wrapGAppsHook -, gnome3 +, gnome }: stdenv.mkDerivation rec { @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { pkg-config shared-mime-info wrapGAppsHook - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; buildInputs = [ @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix index ae1ac3e39f3e..ca8359a32a8c 100644 --- a/pkgs/development/tools/react-native-debugger/default.nix +++ b/pkgs/development/tools/react-native-debugger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome3, atk, at-spi2-atk, at-spi2-core +{ lib, stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome, atk, at-spi2-atk, at-spi2-core , gtk3, glib, freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem }: diff --git a/pkgs/development/tools/vala-language-server/default.nix b/pkgs/development/tools/vala-language-server/default.nix index 4cad79f9a85f..7a5ab2ae4190 100644 --- a/pkgs/development/tools/vala-language-server/default.nix +++ b/pkgs/development/tools/vala-language-server/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { description = "Code Intelligence for Vala & Genie"; homepage = "https://github.com/benwaffle/vala-language-server"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ andreasfelix worldofpeace ]; + maintainers = with maintainers; [ andreasfelix ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/web/cog/default.nix b/pkgs/development/web/cog/default.nix index 5344c1b833ca..ed94b56e695f 100644 --- a/pkgs/development/web/cog/default.nix +++ b/pkgs/development/web/cog/default.nix @@ -11,7 +11,7 @@ , webkitgtk , makeWrapper , wrapGAppsHook -, gnome3 +, gnome , gdk-pixbuf }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { webkitgtk glib-networking gdk-pixbuf - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/development/web/valum/default.nix b/pkgs/development/web/valum/default.nix index 847943d83bcf..f62e9027af10 100644 --- a/pkgs/development/web/valum/default.nix +++ b/pkgs/development/web/valum/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "Web micro-framework written in Vala"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/alephone/infinity/default.nix b/pkgs/games/alephone/infinity/default.nix index 5db83c579e4e..f6002469a096 100644 --- a/pkgs/games/alephone/infinity/default.nix +++ b/pkgs/games/alephone/infinity/default.nix @@ -3,13 +3,13 @@ alephone.makeWrapper rec { pname = "marathon-infinity"; desktopName = "Marathon-Infinity"; - version = "20200904"; + version = "20210408"; icon = alephone.icons + "/marathon-infinity.png"; zip = fetchurl { url = "https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${version}/MarathonInfinity-${version}-Data.zip"; - sha256 = "1n2zfiqjbakkk9dpnzfndqyvq3aml2kjrr2b1wm8g1n44nbc8clq"; + sha256 = "sha256-j9iwSrI7cjqnuRQX+qn8sWXQ6E+DQ19l7OzAL9KHcJU="; }; meta = { diff --git a/pkgs/games/gscrabble/default.nix b/pkgs/games/gscrabble/default.nix index 74411d63d3eb..f0e4121d8f2c 100644 --- a/pkgs/games/gscrabble/default.nix +++ b/pkgs/games/gscrabble/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonApplication, fetchFromGitHub , gtk3, wrapGAppsHook, gst_all_1, gobject-introspection -, python3Packages, gnome3 }: +, python3Packages, gnome }: buildPythonApplication { pname = "gscrabble"; @@ -19,7 +19,7 @@ buildPythonApplication { buildInputs = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - gnome3.adwaita-icon-theme gtk3 gobject-introspection + gnome.adwaita-icon-theme gtk3 gobject-introspection ]; propagatedBuildInputs = with python3Packages; [ gst-python pygobject3 ]; diff --git a/pkgs/games/gweled/default.nix b/pkgs/games/gweled/default.nix index b15bb43a4517..fc187afbe806 100644 --- a/pkgs/games/gweled/default.nix +++ b/pkgs/games/gweled/default.nix @@ -1,20 +1,24 @@ -{ lib, stdenv, fetchbzr, intltool +{ lib, stdenv, fetchbzr, gettext , gtk2, wrapGAppsHook, autoreconfHook, pkg-config , libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "gweled"; - version = "unstable-2018-02-15"; + version = "unstable-2021-02-11"; src = fetchbzr { url = "lp:gweled"; - rev = "94"; - sha256 = "01c38y4df5a06wqbsmsn8ysxx7hav9yvw6zdwbc9m5m55z7vmdb8"; + rev = "108"; + sha256 = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo="; }; doCheck = false; - nativeBuildInputs = [ wrapGAppsHook intltool autoreconfHook pkg-config ]; + postPatch = '' + substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])" + ''; + + nativeBuildInputs = [ wrapGAppsHook gettext autoreconfHook pkg-config ]; buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ]; diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index c97ea55882b0..5f79b86956cc 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, cmake, pkg-config, git, curl, SDL2, xercesc, openal, lua, libvlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome, libGLU, glib , fetchFromGitHub }: let @@ -13,7 +13,7 @@ let }; path-env = buildEnv { name = "megaglest-path-env"; - paths = [ bash which gnome3.zenity ]; + paths = [ bash which gnome.zenity ]; }; in stdenv.mkDerivation { diff --git a/pkgs/games/openra/default.nix b/pkgs/games/openra/default.nix index 2e8533f7816e..22d3c6c879ed 100644 --- a/pkgs/games/openra/default.nix +++ b/pkgs/games/openra/default.nix @@ -25,7 +25,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/openra/packages.nix b/pkgs/games/openra/packages.nix index c09b697771a3..2f4c83c7d5a3 100644 --- a/pkgs/games/openra/packages.nix +++ b/pkgs/games/openra/packages.nix @@ -15,7 +15,7 @@ let lua = pkgs.lua5_1; # It is not necessary to run the game, but it is nicer to be given an error dialog in the case of failure, # rather than having to look to the logs why it is not starting. - inherit (pkgs.gnome3) zenity; + inherit (pkgs.gnome) zenity; }); /* Building a set of engines or mods requires some dependencies as well, diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index f17c436cccb5..de2163d67844 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -85,7 +85,7 @@ in buildFHSUserEnv rec { targetPkgs = pkgs: with pkgs; [ steamPackages.steam # License agreement - gnome3.zenity + gnome.zenity ] ++ commonTargetPkgs pkgs; multiPkgs = pkgs: with pkgs; [ diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix index 246dbb7dd350..dddcc3a74682 100644 --- a/pkgs/misc/emulators/cdemu/analyzer.nix +++ b/pkgs/misc/emulators/cdemu/analyzer.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }: +, python3Packages, gtk3, glib, libxml2, gnuplot, gnome, gdk-pixbuf, librsvg, intltool, libmirage }: let pkg = import ./base.nix { version = "3.2.3"; pkgName = "image-analyzer"; @@ -7,7 +7,7 @@ let pkg = import ./base.nix { }; in callPackage pkg { buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool + gnome.adwaita-icon-theme gdk-pixbuf librsvg intltool python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 599531950a21..8ce84ccae204 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,5 +1,5 @@ { callPackage, makeWrapper, gobject-introspection, cmake -, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }: +, python3Packages, gtk3, glib, libnotify, intltool, gnome, gdk-pixbuf, librsvg }: let pkg = import ./base.nix { version = "3.2.3"; @@ -9,7 +9,7 @@ let inherit (python3Packages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper - gnome3.adwaita-icon-theme gdk-pixbuf librsvg ]; + gnome.adwaita-icon-theme gdk-pixbuf librsvg ]; drvParams = { nativeBuildInputs = [ gobject-introspection cmake ]; postFixup = '' diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 70e5d94def6f..502e5c647237 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, pkg-config, SDL2, alsaLib, gtk3 , makeWrapper, libGLU, libGL, libarchive, libao, unzip, xdg-utils -, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook +, epoxy, gdk-pixbuf, gnome, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { libarchive libao xdg-utils - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ diff --git a/pkgs/misc/screensavers/vlock/default.nix b/pkgs/misc/screensavers/vlock/default.nix index 243d582bdcee..4813e2493075 100644 --- a/pkgs/misc/screensavers/vlock/default.nix +++ b/pkgs/misc/screensavers/vlock/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Virtual console locking program"; license = licenses.gpl2; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/misc/t-rec/default.nix b/pkgs/misc/t-rec/default.nix new file mode 100644 index 000000000000..cb8ccc8c6ae4 --- /dev/null +++ b/pkgs/misc/t-rec/default.nix @@ -0,0 +1,34 @@ +{ lib, imagemagick, ffmpeg, rustPlatform, fetchFromGitHub, makeWrapper }: + +let + binPath = lib.makeBinPath [ + imagemagick + ffmpeg + ]; +in +rustPlatform.buildRustPackage rec { + pname = "t-rec"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "sassman"; + repo = "t-rec-rs"; + rev = "v${version}"; + sha256 = "InArrBqfhDrsonjmCIPTBVOA/s2vYml9Ay6cdrKLd7c="; + }; + + buildInputs = [ imagemagick ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/t-rec" --prefix PATH : "${binPath}" + ''; + + cargoSha256 = "4gwfrC65YlXV6Wu2ninK1TvMNUkY1GstVYPr0FK+xLU="; + + meta = with lib; { + description = "Blazingly fast terminal recorder that generates animated gif images for the web written in rust"; + homepage = "https://github.com/sassman/t-rec-rs"; + license = with licenses; [ gpl3Only ]; + maintainers = [ maintainers.hoverbear ]; + }; +} diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index f021dce2a8f7..d5e021f746df 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -20,7 +20,7 @@ , dasht , direnv , fzf -, gnome3 +, gnome , khard , languagetool , llvmPackages @@ -515,7 +515,7 @@ self: super: { vCoolor-vim = super.vCoolor-vim.overrideAttrs (old: { # on linux can use either Zenity or Yad. - propagatedBuildInputs = [ gnome3.zenity ]; + propagatedBuildInputs = [ gnome.zenity ]; meta = { description = "Simple color selector/picker plugin"; license = lib.licenses.publicDomain; diff --git a/pkgs/os-specific/linux/piper/default.nix b/pkgs/os-specific/linux/piper/default.nix index 839b3f1b78f5..5edcd263f0d9 100644 --- a/pkgs/os-specific/linux/piper/default.nix +++ b/pkgs/os-specific/linux/piper/default.nix @@ -1,5 +1,5 @@ { lib, meson, ninja, pkg-config, gettext, fetchFromGitHub, python3 -, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome3 +, wrapGAppsHook, gtk3, glib, desktop-file-utils, appstream-glib, gnome , gobject-introspection }: python3.pkgs.buildPythonApplication rec { @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = [ meson ninja gettext pkg-config wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ]; buildInputs = [ - gtk3 glib gnome3.adwaita-icon-theme python3 + gtk3 glib gnome.adwaita-icon-theme python3 ]; propagatedBuildInputs = with python3.pkgs; [ lxml evdev pygobject3 ] ++ [ gobject-introspection # fixes https://github.com/NixOS/nixpkgs/issues/56943 for now diff --git a/pkgs/servers/fcgiwrap/default.nix b/pkgs/servers/fcgiwrap/default.nix index ee3f02d0425e..3e0a4e5d9940 100644 --- a/pkgs/servers/fcgiwrap/default.nix +++ b/pkgs/servers/fcgiwrap/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://nginx.localdomain.pl/wiki/FcgiWrap"; description = "Simple server for running CGI applications over FastCGI"; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = with platforms; linux; license = licenses.mit; }; diff --git a/pkgs/servers/ftp/pure-ftpd/default.nix b/pkgs/servers/ftp/pure-ftpd/default.nix index 731d2c9e19a9..3ea030440626 100644 --- a/pkgs/servers/ftp/pure-ftpd/default.nix +++ b/pkgs/servers/ftp/pure-ftpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A free, secure, production-quality and standard-conformant FTP server"; homepage = "https://www.pureftpd.org"; license = licenses.isc; # with some parts covered by BSD3(?) - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index da1b4e456b76..773136a0201c 100644 --- a/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { description = "Provide Zeroconf support via DNS-SD using Avahi"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index bcf091f8e769..d5c197d5da6e 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -21,6 +21,6 @@ buildGoModule rec { description = "The fastest shell plugin manager"; homepage = "https://github.com/getantibody/antibody"; license = licenses.mit; - maintainers = with maintainers; [ Br1ght0ne worldofpeace ]; + maintainers = with maintainers; [ Br1ght0ne ]; }; } diff --git a/pkgs/tools/X11/wpgtk/default.nix b/pkgs/tools/X11/wpgtk/default.nix index cf9bbd9bb988..66464ae0b532 100644 --- a/pkgs/tools/X11/wpgtk/default.nix +++ b/pkgs/tools/X11/wpgtk/default.nix @@ -1,5 +1,5 @@ { lib, python3Packages, fetchFromGitHub, libxslt, - gobject-introspection, gtk3, wrapGAppsHook, gnome3 }: + gobject-introspection, gtk3, wrapGAppsHook, gnome }: python3Packages.buildPythonApplication rec { pname = "wpgtk"; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { wrapGAppsHook gtk3 gobject-introspection - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme libxslt ]; diff --git a/pkgs/tools/X11/xdg-user-dirs/default.nix b/pkgs/tools/X11/xdg-user-dirs/default.nix index 207c052686f8..991b9be22389 100644 --- a/pkgs/tools/X11/xdg-user-dirs/default.nix +++ b/pkgs/tools/X11/xdg-user-dirs/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "http://freedesktop.org/wiki/Software/xdg-user-dirs"; description = "A tool to help manage well known user directories like the desktop folder and the music folder"; license = licenses.gpl2; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 9f4d4effeeeb..5e00e487e23e 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -15,7 +15,7 @@ , vala , gettext , perl -, gnome3 +, gnome , gdk-pixbuf , zlib }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "none"; }; diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix index 312dc62d575e..03ea3302d262 100644 --- a/pkgs/tools/audio/gvolicon/default.nix +++ b/pkgs/tools/audio/gvolicon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }: +{ lib, stdenv, makeWrapper, alsaLib, pkg-config, fetchgit, gtk3, gnome, gdk-pixbuf, librsvg, wrapGAppsHook }: stdenv.mkDerivation { name = "gvolicon-2014-04-28"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme + makeWrapper alsaLib gtk3 gdk-pixbuf gnome.adwaita-icon-theme librsvg wrapGAppsHook ]; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 4a2030d74455..2bedd2abacdd 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchpatch, fetchFromGitHub, pkg-config, autoreconfHook, wrapGAppsHook -, gnome3, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio +, gnome, avahi, gtk3, libayatana-appindicator-gtk3, libnotify, libpulseaudio , xlibsWrapper, gsettings-desktop-schemas }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook wrapGAppsHook ]; buildInputs = [ - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme avahi gtk3 libayatana-appindicator-gtk3 libnotify libpulseaudio xlibsWrapper gsettings-desktop-schemas ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 71ce9060b255..b932b8e66c6f 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , bluez-tools , cinnamon -, gnome3 +, gnome , gobject-introspection , intltool , pavucontrol @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ bluez-tools cinnamon.xapps - gnome3.gnome-bluetooth + gnome.gnome-bluetooth python3Packages.python util-linux ]; diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix index b30a8763706b..7b3aa397fc35 100644 --- a/pkgs/tools/bluetooth/blueman/default.nix +++ b/pkgs/tools/bluetooth/blueman/default.nix @@ -1,6 +1,6 @@ { config, stdenv, lib, fetchurl, intltool, pkg-config, python3Packages, bluez, gtk3 , obex_data_server, xdg-utils, dnsmasq, dhcp, libappindicator, iproute2 -, gnome3, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook +, gnome, librsvg, wrapGAppsHook, gobject-introspection, autoreconfHook , networkmanager, withPulseAudio ? config.pulseaudio or stdenv.isLinux, libpulseaudio, fetchpatch }: let @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ bluez gtk3 pythonPackages.python librsvg - gnome3.adwaita-icon-theme iproute2 libappindicator networkmanager ] + gnome.adwaita-icon-theme iproute2 libappindicator networkmanager ] ++ pythonPath ++ lib.optional withPulseAudio libpulseaudio; diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index 6e0c48d0610c..3d34dcbac175 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome3 }: +{ lib, stdenv, fetchurl, makeWrapper, pkg-config, cmake, fcitx, gtk3, isocodes, gnome }: stdenv.mkDerivation rec { name = "fcitx-configtool-0.4.10"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; - buildInputs = [ fcitx isocodes gtk3 gnome3.adwaita-icon-theme ]; + buildInputs = [ fcitx isocodes gtk3 gnome.adwaita-icon-theme ]; # Patch paths to `fcitx-remote` prePatch = '' diff --git a/pkgs/tools/misc/apparix/default.nix b/pkgs/tools/misc/apparix/default.nix index d446a2cf0af6..8e682aefcc39 100644 --- a/pkgs/tools/misc/apparix/default.nix +++ b/pkgs/tools/misc/apparix/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; - maintainers = with maintainers; [ lethalman ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.all; }; diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix index 570535f80e4a..b5fe5074d7e5 100644 --- a/pkgs/tools/misc/duc/default.nix +++ b/pkgs/tools/misc/duc/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index 3b63d7c02039..9bbbe1493f76 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome3 +{ lib, stdenv, fetchurl, intltool, gettext, makeWrapper, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 , gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome3.adwaita-icon-theme ]; + buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; nativeBuildInputs = [ intltool gettext pkg-config wrapGAppsHook ]; preFixup = '' diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 2dffada9fe74..e52ae44a83f9 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome3 }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: stdenv.mkDerivation rec { version="1.1.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; - buildInputs = [ gtkmm3 pcre-cpp gnome3.adwaita-icon-theme ]; + buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/kodi-cli/default.nix b/pkgs/tools/misc/kodi-cli/default.nix index 56795e7c93f3..10b9cea73d76 100644 --- a/pkgs/tools/misc/kodi-cli/default.nix +++ b/pkgs/tools/misc/kodi-cli/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome3 }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, curl, bash, jq, youtube-dl, gnome }: stdenv.mkDerivation rec { pname = "kodi-cli"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp -a kodi-cli $out/bin wrapProgram $out/bin/kodi-cli --prefix PATH : ${lib.makeBinPath [ curl bash ]} cp -a playlist_to_kodi $out/bin - wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome3.zenity jq youtube-dl ]} + wrapProgram $out/bin/playlist_to_kodi --prefix PATH : ${lib.makeBinPath [ curl bash gnome.zenity jq youtube-dl ]} ''; meta = with lib; { diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index 4b28f49acaa2..c5419b27fece 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://launchpad.net/pastebinit"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; - maintainers = with maintainers; [ lethalman raboof ]; + maintainers = with maintainers; [ raboof ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 41828d322e85..c1861e33c081 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -10,7 +10,7 @@ , gettext , gupnp-av , gtksourceview4 -, gnome3 +, gnome , wrapGAppsHook }: @@ -38,11 +38,11 @@ stdenv.mkDerivation rec { gtk3 gupnp-av gtksourceview4 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/tools/networking/networkmanager/applet/default.nix b/pkgs/tools/networking/networkmanager/applet/default.nix index cffacddf8bd4..633c932def83 100644 --- a/pkgs/tools/networking/networkmanager/applet/default.nix +++ b/pkgs/tools/networking/networkmanager/applet/default.nix @@ -5,7 +5,7 @@ , gettext , pkg-config , networkmanager -, gnome3 +, gnome , libnotify , libsecret , polkit @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { glib glib-networking libappindicator-gtk3 - gnome3.adwaita-icon-theme + gnome.adwaita-icon-theme ]; nativeBuildInputs = [ @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanagerapplet"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix index 0b9a18bedea2..11c5462ab202 100644 --- a/pkgs/tools/networking/networkmanager/default.nix +++ b/pkgs/tools/networking/networkmanager/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, intltool, pkg-config, fetchpatch, dbus -, gnome3, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala +, gnome, systemd, libuuid, polkit, gnutls, ppp, dhcp, iptables, python3, vala , libgcrypt, dnsmasq, bluez5, readline, libselinux, audit , gobject-introspection, modemmanager, openresolv, libndp, newt, libsoup , ethtool, gnused, iputils, kmod, jansson, gtk-doc, libxslt @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager"; }; @@ -106,7 +106,7 @@ in stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/NetworkManager"; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom domenkozar obadz worldofpeace maxeaubrey ]; + maintainers = teams.freedesktop.members ++ (with maintainers; [ phreedom domenkozar obadz ]); platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix index 25554b279638..f97bac13cf7f 100644 --- a/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/fortisslvpn/default.nix @@ -11,7 +11,7 @@ , ppp , libsecret , withGnome ? true -, gnome3 +, gnome , fetchpatch , libnma }: @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-fortisslvpn"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/iodine/default.nix b/pkgs/tools/networking/networkmanager/iodine/default.nix index 87069d3c3c80..e56d9411b393 100644 --- a/pkgs/tools/networking/networkmanager/iodine/default.nix +++ b/pkgs/tools/networking/networkmanager/iodine/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitLab, substituteAll, autoreconfHook, iodine, intltool, pkg-config, networkmanager, libsecret, gtk3 -, withGnome ? true, gnome3, fetchpatch, libnma, glib }: +, withGnome ? true, gnome, fetchpatch, libnma, glib }: let pname = "NetworkManager-iodine"; @@ -44,7 +44,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-iodine"; }; diff --git a/pkgs/tools/networking/networkmanager/libnma/default.nix b/pkgs/tools/networking/networkmanager/libnma/default.nix index 35f79a773c3d..50fc66a8d68b 100644 --- a/pkgs/tools/networking/networkmanager/libnma/default.nix +++ b/pkgs/tools/networking/networkmanager/libnma/default.nix @@ -7,7 +7,7 @@ , pkg-config , vala , networkmanager -, gnome3 +, gnome , isocodes , libxml2 , docbook_xsl @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; versionPolicy = "odd-unstable"; }; diff --git a/pkgs/tools/networking/networkmanager/openconnect/default.nix b/pkgs/tools/networking/networkmanager/openconnect/default.nix index 6dbb718a6b64..c03a698514a8 100644 --- a/pkgs/tools/networking/networkmanager/openconnect/default.nix +++ b/pkgs/tools/networking/networkmanager/openconnect/default.nix @@ -13,7 +13,7 @@ , file , gtk3 , withGnome ? true -, gnome3 +, gnome , kmod , fetchpatch }: @@ -66,7 +66,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openconnect"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/openvpn/default.nix b/pkgs/tools/networking/networkmanager/openvpn/default.nix index ab87bc8371d2..06df79e47052 100644 --- a/pkgs/tools/networking/networkmanager/openvpn/default.nix +++ b/pkgs/tools/networking/networkmanager/openvpn/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, openvpn, intltool, libxml2, pkg-config, file, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, kmod, libnma }: +, gtk3, withGnome ? true, gnome, kmod, libnma }: let pname = "NetworkManager-openvpn"; @@ -31,7 +31,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-openvpn"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/networkmanager/sstp/default.nix b/pkgs/tools/networking/networkmanager/sstp/default.nix index d00c0e3e55f8..f48662344380 100644 --- a/pkgs/tools/networking/networkmanager/sstp/default.nix +++ b/pkgs/tools/networking/networkmanager/sstp/default.nix @@ -4,7 +4,7 @@ , fetchpatch , file , glib -, gnome3 +, gnome , gtk3 , intltool , libnma @@ -50,7 +50,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-sstp"; }; diff --git a/pkgs/tools/networking/networkmanager/strongswan/default.nix b/pkgs/tools/networking/networkmanager/strongswan/default.nix index c4cb79b4c8c3..cebcec35a314 100644 --- a/pkgs/tools/networking/networkmanager/strongswan/default.nix +++ b/pkgs/tools/networking/networkmanager/strongswan/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, intltool, pkg-config, networkmanager, strongswanNM -, gtk3, gnome3, libsecret, libnma }: +, gtk3, gnome, libsecret, libnma }: stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; diff --git a/pkgs/tools/networking/networkmanager/vpnc/default.nix b/pkgs/tools/networking/networkmanager/vpnc/default.nix index 5181e3160e23..70e7104696ee 100644 --- a/pkgs/tools/networking/networkmanager/vpnc/default.nix +++ b/pkgs/tools/networking/networkmanager/vpnc/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, substituteAll, vpnc, intltool, pkg-config, networkmanager, libsecret -, gtk3, withGnome ? true, gnome3, glib, kmod, file, fetchpatch, libnma }: +, gtk3, withGnome ? true, gnome, glib, kmod, file, fetchpatch, libnma }: let pname = "NetworkManager-vpnc"; version = "1.2.6"; @@ -35,7 +35,7 @@ in stdenv.mkDerivation { ]; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; attrPath = "networkmanager-vpnc"; versionPolicy = "odd-unstable"; diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix index addb72359297..74347ff83957 100644 --- a/pkgs/tools/networking/polygraph/default.nix +++ b/pkgs/tools/networking/polygraph/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "Performance testing tool for caching proxies, origin server accelerators, L4/7 switches, content filters, and other Web intermediaries"; platforms = platforms.linux; license = licenses.asl20; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/tracebox/default.nix b/pkgs/tools/networking/tracebox/default.nix index a5486252a8af..3d50b11f8e1a 100644 --- a/pkgs/tools/networking/tracebox/default.nix +++ b/pkgs/tools/networking/tracebox/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { homepage = "http://www.tracebox.org/"; description = "A middlebox detection tool"; license = lib.licenses.gpl2; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/crunch/default.nix b/pkgs/tools/security/crunch/default.nix index 0c7620124d15..df1d50c60fad 100644 --- a/pkgs/tools/security/crunch/default.nix +++ b/pkgs/tools/security/crunch/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = platforms.unix; license = with licenses; [ gpl2Only ]; - maintainers = with maintainers; [ lethalman lnl7 ]; + maintainers = with maintainers; [ lnl7 ]; }; } diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 72917bfd0ef1..cf6c965452d1 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.42" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.0.43" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index a28b4f766885..b6735820ad73 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 57fda58cdde0909e975394b34a8daa39c97f7e1c - ref: refs/tags/6.0.42 + revision: 08fd394933eadca2b90e4de4ecce7f478af1f161 + ref: refs/tags/6.0.43 specs: - metasploit-framework (6.0.42) + metasploit-framework (6.0.43) actionpack (~> 5.2.2) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -23,6 +23,7 @@ GIT faye-websocket filesize hrr_rb_ssh (= 0.3.0.pre2) + http-cookie irb jsobfu json @@ -30,7 +31,7 @@ GIT metasploit-concern (~> 3.0.0) metasploit-credential (~> 4.0.0) metasploit-model (~> 3.1.0) - metasploit-payloads (= 2.0.44) + metasploit-payloads (= 2.0.45) metasploit_data_models (~> 4.1.0) metasploit_payloads-mettle (= 1.0.9) mqtt @@ -92,26 +93,26 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.0) - actionpack (5.2.5) - actionview (= 5.2.5) - activesupport (= 5.2.5) + actionpack (5.2.6) + actionview (= 5.2.6) + activesupport (= 5.2.6) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.5) - activesupport (= 5.2.5) + actionview (5.2.6) + activesupport (= 5.2.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.5) - activesupport (= 5.2.5) - activerecord (5.2.5) - activemodel (= 5.2.5) - activesupport (= 5.2.5) + activemodel (5.2.6) + activesupport (= 5.2.6) + activerecord (5.2.6) + activemodel (= 5.2.6) + activesupport (= 5.2.6) arel (>= 9.0) - activesupport (5.2.5) + activesupport (5.2.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -123,7 +124,7 @@ GEM arel-helpers (2.12.0) activerecord (>= 3.1.0, < 7) aws-eventstream (1.1.1) - aws-partitions (1.449.0) + aws-partitions (1.452.0) aws-sdk-core (3.114.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -138,7 +139,7 @@ GEM aws-sdk-kms (1.43.0) aws-sdk-core (~> 3, >= 3.112.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.94.0) + aws-sdk-s3 (1.94.1) aws-sdk-core (~> 3, >= 3.112.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -152,9 +153,11 @@ GEM concurrent-ruby (1.0.5) cookiejar (0.3.3) crass (1.0.6) - daemons (1.3.1) + daemons (1.4.0) dnsruby (1.61.5) simpleidn (~> 0.1) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) ed25519 (1.2.4) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -184,6 +187,8 @@ GEM hashery (2.1.2) hrr_rb_ssh (0.3.0.pre2) ed25519 (~> 1.2) + http-cookie (1.0.3) + domain_name (~> 0.5) http_parser.rb (0.6.0) i18n (1.8.10) concurrent-ruby (~> 1.0) @@ -216,7 +221,7 @@ GEM activemodel (~> 5.2.2) activesupport (~> 5.2.2) railties (~> 5.2.2) - metasploit-payloads (2.0.44) + metasploit-payloads (2.0.45) metasploit_data_models (4.1.4) activerecord (~> 5.2.2) activesupport (~> 5.2.2) @@ -263,7 +268,7 @@ GEM ttfunk pg (1.2.3) public_suffix (4.0.6) - puma (5.2.2) + puma (5.3.0) nio4r (~> 2.0) racc (1.5.2) rack (2.2.3) @@ -276,9 +281,9 @@ GEM nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.5) - actionpack (= 5.2.5) - activesupport (= 5.2.5) + railties (5.2.6) + actionpack (= 5.2.6) + activesupport (= 5.2.6) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index fcd37ad4bb26..f5622bcfeef5 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -8,13 +8,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.0.42"; + version = "6.0.43"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-L4P6QUERoH0JnaTpzrA0UWUYqRepBS97fSexKa8JZQU="; + sha256 = "sha256-dj+8DodQnCJjwhxTD/TjccJvSA8KSjiwiX65V6CIpuQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 2aa5d4fa8366..13d391390ddc 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -4,50 +4,50 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1m9wdcnkls8cs31gfic5hffnrz0l1iyk0dldwx2q2z58qhh3sw0m"; + sha256 = "0b2xl458f2ygnjbvv0hacc8bk9qxbx64m2g7vw6f9y7k8q85930y"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; actionview = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xlcfcbmwlmcp6vi9ay5xw9lqnj70bl1gn19hafygv9w65sw0n2i"; + sha256 = "06f8212kplqhap9jpi49dvqlhwkfxxxm9nh8al6qjvl7mfh9qbzg"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activemodel = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bb600bsxd0gf4vwqq2qiklg7wd37b0as6ll3k5hjy9v6izj006b"; + sha256 = "1r28kcnzr8dm6idirndd8pvbmg5c678ijxk845g84ykq1l69czs6"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activerecord = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03zijqm7xdmmylzp68hadvq5rps67lsq10hnq6kpmhq496pp7wlj"; + sha256 = "05qqnichgxml6z3d1dpgjy2fi62dppnqxgg37hr9a35hwhn05fzc"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; activesupport = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bizrvn05d59l1qzwkhqvwmzicamq4p66z2ziap5ks9y6hqgqmzj"; + sha256 = "1vybx4cj42hr6m8cdwbrqq2idh98zms8c11kr399xjczhl9ywjbj"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; addressable = { groups = ["default"]; @@ -114,10 +114,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18d990l9mraf8j1akfn1f4l3y6n7shhnr9x5naj6pzv5z3y3dzf4"; + sha256 = "0dsmmsk913b50rs4ihk8pafc1gp1i1k1fnbf63ki0j5xdknpli55"; type = "gem"; }; - version = "1.449.0"; + version = "1.452.0"; }; aws-sdk-core = { groups = ["default"]; @@ -164,10 +164,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "119f1nf2q1k7xg7h2agm7g8i87abfdkad0l78hhk6y4f3v02niv9"; + sha256 = "0803g2c1hhdk6fbliww12in4czsxj47fip9dpl35hbqsnrpjc4y9"; type = "gem"; }; - version = "1.94.0"; + version = "1.94.1"; }; aws-sigv4 = { groups = ["default"]; @@ -264,10 +264,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0l5gai3vd4g7aqff0k1mp41j9zcsvm2rbwmqn115a325k9r7pf4w"; + sha256 = "1fki1aipqafqlg8xy25ykk0ql1dciy9kk6lcp5gzgkh9ccmaxzf3"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; dnsruby = { groups = ["default"]; @@ -279,6 +279,16 @@ }; version = "1.61.5"; }; + domain_name = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; ed25519 = { groups = ["default"]; platforms = []; @@ -419,6 +429,16 @@ }; version = "0.3.0.pre2"; }; + http-cookie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; "http_parser.rb" = { groups = ["default"]; platforms = []; @@ -534,12 +554,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "57fda58cdde0909e975394b34a8daa39c97f7e1c"; - sha256 = "01b516pjkc97gmxjy1d92ylihrai6jqcxsd4kl4pv80i850zm0rg"; + rev = "08fd394933eadca2b90e4de4ecce7f478af1f161"; + sha256 = "1r56i2h5gfbyi6q3hjha1x46zhkiwgs0ylqwq9ij572hhw7bqgvn"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.0.42"; + version = "6.0.43"; }; metasploit-model = { groups = ["default"]; @@ -556,10 +576,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z0cgg4fghcpj3pvjyqnnzll5zvhwpv68dvpz2y0zgij14cvfg7y"; + sha256 = "09w5r7g19n845h9ii66h8cx9ikgv69d59ry67183h7c76mhzvm9c"; type = "gem"; }; - version = "2.0.44"; + version = "2.0.45"; }; metasploit_data_models = { groups = ["default"]; @@ -826,10 +846,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0wiprd0v4mjqv5p1vqaidr9ci2xm08lcxdz1k50mb1b6nrw6r74k"; + sha256 = "1q34mqihyg7i46z0pbbkyw58fwmkq7a7315apaqmj41zp6akyjf1"; type = "gem"; }; - version = "5.2.2"; + version = "5.3.0"; }; racc = { groups = ["default"]; @@ -896,10 +916,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "072spzdpc8bv35nflr43i67njlriavqkrz6cgyd42adz6bqyval9"; + sha256 = "0rs97fxv13hgpbmyhk8ag8qzgkh25css0797h90k9w1vg9djl84k"; type = "gem"; }; - version = "5.2.5"; + version = "5.2.6"; }; rake = { groups = ["default"]; diff --git a/pkgs/tools/security/onioncircuits/default.nix b/pkgs/tools/security/onioncircuits/default.nix index 8c5083ee8af6..f5d9185dc986 100644 --- a/pkgs/tools/security/onioncircuits/default.nix +++ b/pkgs/tools/security/onioncircuits/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome3 }: +{ lib, fetchgit, python3, intltool, gtk3, gobject-introspection, gnome }: python3.pkgs.buildPythonApplication rec { pname = "onioncircuits"; @@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec { postFixup = '' wrapProgram "$out/bin/onioncircuits" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix XDG_DATA_DIRS : "$out/share:${gnome3.adwaita-icon-theme}/share" + --prefix XDG_DATA_DIRS : "$out/share:${gnome.adwaita-icon-theme}/share" ''; meta = with lib; { diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index 0d7c3d2863cf..e8d080a132cf 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YUrvdleH332fWDgq8AwUdXkFC7m9ap+OVuQhKlxZfII="; + sha256 = "sha256-pQuCVDXO9sXqCayoSAuxnzUBURJN+W2MZlzC/nV0wUc="; }; - vendorSha256 = "sha256-CzJ83MsBetrzbBT+fmz8F8MjdrManJAd4xpykh/2938="; + vendorSha256 = "sha256-W3RXjjR90nfidkUldKNK0QAmI78SvtgHrZTWMzpqtMs="; # tests want to download a vulnerable Terraform project doCheck = false; diff --git a/pkgs/tools/system/netdata/default.nix b/pkgs/tools/system/netdata/default.nix index c96f92bedfef..5eb39c7f6d85 100644 --- a/pkgs/tools/system/netdata/default.nix +++ b/pkgs/tools/system/netdata/default.nix @@ -87,6 +87,6 @@ in stdenv.mkDerivation rec { homepage = "https://www.netdata.cloud/"; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index 9efb3475a480..be6e8f267637 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -26,6 +26,6 @@ buildGoModule rec { description = "Netdata orchestrator for data collection modules written in go"; homepage = "https://github.com/netdata/go.d.plugin"; license = licenses.gpl3; - maintainers = [ maintainers.lethalman ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/text/gtranslator/default.nix b/pkgs/tools/text/gtranslator/default.nix index 8408d42da1b2..5bc99724e3fa 100644 --- a/pkgs/tools/text/gtranslator/default.nix +++ b/pkgs/tools/text/gtranslator/default.nix @@ -17,7 +17,7 @@ , libdazzle , gtk3 , gtksourceview4 -, gnome3 +, gnome , gsettings-desktop-schemas }: @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { ''; passthru = { - updateScript = gnome3.updateScript { + updateScript = gnome.updateScript { packageName = pname; }; }; diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 1c3d5929636a..f52cf3a29a4e 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -143,7 +143,7 @@ core = stdenv.mkDerivation rec { description = "Basic binaries for TeX Live"; homepage = "http://www.tug.org/texlive"; license = lib.licenses.gpl2; - maintainers = with maintainers; [ vcunat veprbl lovek323 raskin jwiegley ]; + maintainers = with maintainers; [ veprbl lovek323 raskin jwiegley ]; platforms = platforms.all; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d346e0059286..b1bca2c45eef 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -301,6 +301,7 @@ mapAliases ({ gtk_doc = gtk-doc; # added 2018-02-25 guileCairo = guile-cairo; # added 2017-09-24 guileGnome = guile-gnome; # added 2017-09-24 + gnome3 = gnome; # added 2021-05-07 guileLint = guile-lint; # added 2017-09-27 guile_lib = guile-lib; # added 2017-09-24 guile_ncurses = guile-ncurses; # added 2017-09-24 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9be0f72acab..a08fca3172ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -794,7 +794,7 @@ in aj-snapshot = callPackage ../applications/audio/aj-snapshot { }; ajour = callPackage ../tools/games/ajour { - inherit (gnome3) zenity; + inherit (gnome) zenity; inherit (plasma5Packages) kdialog; }; @@ -3534,7 +3534,7 @@ in libpinyin = callPackage ../development/libraries/libpinyin { }; libskk = callPackage ../development/libraries/libskk { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; m17n_db = callPackage ../tools/inputmethods/m17n-db { }; @@ -6369,7 +6369,7 @@ in libite = callPackage ../development/libraries/libite { }; liblangtag = callPackage ../development/libraries/liblangtag { - inherit (gnome3) gnome-common; + inherit (gnome) gnome-common; }; liblouis = callPackage ../development/libraries/liblouis { }; @@ -15693,7 +15693,7 @@ in libgig = callPackage ../development/libraries/libgig { }; libgnome-keyring = callPackage ../development/libraries/libgnome-keyring { }; - libgnome-keyring3 = gnome3.libgnome-keyring; + libgnome-keyring3 = gnome.libgnome-keyring; libgnomekbd = callPackage ../development/libraries/libgnomekbd { }; @@ -16195,7 +16195,7 @@ in libopusenc = callPackage ../development/libraries/libopusenc { }; libosinfo = callPackage ../development/libraries/libosinfo { - inherit (gnome3) libsoup; + inherit (gnome) libsoup; }; libosip = callPackage ../development/libraries/osip {}; @@ -21499,7 +21499,7 @@ in kopia = callPackage ../tools/backup/kopia { }; kora-icon-theme = callPackage ../data/icons/kora-icon-theme { - inherit (gnome3) adwaita-icon-theme; + inherit (gnome) adwaita-icon-theme; inherit (libsForQt5.kdeFrameworks) breeze-icons; }; @@ -22262,7 +22262,7 @@ in awesomebump = libsForQt5.callPackage ../applications/graphics/awesomebump { }; - inherit (gnome3) baobab; + inherit (gnome) baobab; backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; @@ -22323,7 +22323,7 @@ in (callPackage ../applications/science/electronics/bitscope/packages.nix { }); bitwig-studio1 = callPackage ../applications/audio/bitwig-studio/bitwig-studio1.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; libxkbcommon = libxkbcommon_7; }; bitwig-studio2 = callPackage ../applications/audio/bitwig-studio/bitwig-studio2.nix { @@ -22867,7 +22867,7 @@ in pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set }; - inherit (gnome3) empathy; + inherit (gnome) empathy; enhanced-ctorrent = callPackage ../applications/networking/enhanced-ctorrent { }; @@ -22881,7 +22881,7 @@ in epgstation = callPackage ../applications/video/epgstation { }; - inherit (gnome3) epiphany; + inherit (gnome) epiphany; ephemeral = callPackage ../applications/networking/browsers/ephemeral { }; @@ -22936,8 +22936,8 @@ in keeweb = callPackage ../applications/misc/keeweb { }; - inherit (gnome3) evince; - evolution-data-server = gnome3.evolution-data-server; + inherit (gnome) evince; + evolution-data-server = gnome.evolution-data-server; evolution-ews = callPackage ../applications/networking/mailreaders/evolution/evolution-ews { }; evolution = callPackage ../applications/networking/mailreaders/evolution/evolution { }; evolutionWithPlugins = callPackage ../applications/networking/mailreaders/evolution/evolution/wrapper.nix { plugins = [ evolution evolution-ews ]; }; @@ -23215,7 +23215,7 @@ in gtimelog = with python3Packages; toPythonApplication gtimelog; - inherit (gnome3) gucharmap; + inherit (gnome) gucharmap; guitarix = callPackage ../applications/audio/guitarix { fftw = fftwSinglePrec; @@ -23491,7 +23491,7 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - inherit (gnome3) gitg; + inherit (gnome) gitg; gmrun = callPackage ../applications/misc/gmrun {}; @@ -23624,7 +23624,7 @@ in celluloid = callPackage ../applications/video/celluloid { }; gnome-recipes = callPackage ../applications/misc/gnome-recipes { - inherit (gnome3) gnome-autoar; + inherit (gnome) gnome-autoar; }; gollum = callPackage ../applications/misc/gollum { }; @@ -24529,7 +24529,7 @@ in luppp = callPackage ../applications/audio/luppp { }; lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { - inherit (gnome3) gnome-desktop; + inherit (gnome) gnome-desktop; wine = wineWowPackages.staging; }; lutris = callPackage ../applications/misc/lutris/fhsenv.nix { @@ -24679,6 +24679,8 @@ in mikmod = callPackage ../applications/audio/mikmod { }; + miniaudicle = callPackage ../applications/audio/miniaudicle { }; + minicom = callPackage ../tools/misc/minicom { }; minimodem = callPackage ../applications/radio/minimodem { }; @@ -25957,7 +25959,7 @@ in shutter = callPackage ../applications/graphics/shutter { }; - simple-scan = gnome3.simple-scan; + simple-scan = gnome.simple-scan; siproxd = callPackage ../applications/networking/siproxd { }; @@ -26230,7 +26232,7 @@ in surf-display = callPackage ../desktops/surf-display { }; surge = callPackage ../applications/audio/surge { - inherit (gnome3) zenity; + inherit (gnome) zenity; git = gitMinimal; }; @@ -26538,6 +26540,8 @@ in lavalauncher = callPackage ../applications/misc/lavalauncher { }; + t-rec = callPackage ../misc/t-rec { }; + ulauncher = callPackage ../applications/misc/ulauncher { }; twinkle = qt5.callPackage ../applications/networking/instant-messengers/twinkle { }; @@ -27361,7 +27365,7 @@ in yeetgif = callPackage ../applications/graphics/yeetgif { }; - inherit (gnome3) yelp; + inherit (gnome) yelp; yelp-tools = callPackage ../development/misc/yelp-tools { }; @@ -28375,7 +28379,7 @@ in protontricks = python3Packages.callPackage ../tools/package-management/protontricks { inherit steam-run; inherit winetricks; - inherit (gnome3) zenity; + inherit (gnome) zenity; }; sdlpop = callPackage ../games/sdlpop { }; @@ -28647,46 +28651,46 @@ in gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { }); - gnome3 = recurseIntoAttrs (callPackage ../desktops/gnome-3 { }); + gnome = recurseIntoAttrs (callPackage ../desktops/gnome { }); gnomeExtensions = recurseIntoAttrs { - appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; - arcmenu = callPackage ../desktops/gnome-3/extensions/arcmenu { }; - caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; - clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; - clock-override = callPackage ../desktops/gnome-3/extensions/clock-override { }; - dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; - dash-to-panel = callPackage ../desktops/gnome-3/extensions/dash-to-panel { }; - disable-unredirect = callPackage ../desktops/gnome-3/extensions/disable-unredirect { }; - draw-on-your-screen = callPackage ../desktops/gnome-3/extensions/draw-on-your-screen { }; - drop-down-terminal = callPackage ../desktops/gnome-3/extensions/drop-down-terminal { }; - dynamic-panel-transparency = callPackage ../desktops/gnome-3/extensions/dynamic-panel-transparency { }; - easyScreenCast = callPackage ../desktops/gnome-3/extensions/EasyScreenCast { }; - emoji-selector = callPackage ../desktops/gnome-3/extensions/emoji-selector { }; - freon = callPackage ../desktops/gnome-3/extensions/freon { }; - fuzzy-app-search = callPackage ../desktops/gnome-3/extensions/fuzzy-app-search { }; - gsconnect = callPackage ../desktops/gnome-3/extensions/gsconnect { }; - hot-edge = callPackage ../desktops/gnome-3/extensions/hot-edge { }; - icon-hider = callPackage ../desktops/gnome-3/extensions/icon-hider { }; - impatience = callPackage ../desktops/gnome-3/extensions/impatience { }; - material-shell = callPackage ../desktops/gnome-3/extensions/material-shell { }; - mpris-indicator-button = callPackage ../desktops/gnome-3/extensions/mpris-indicator-button { }; - night-theme-switcher = callPackage ../desktops/gnome-3/extensions/night-theme-switcher { }; - no-title-bar = callPackage ../desktops/gnome-3/extensions/no-title-bar { }; - noannoyance = callPackage ../desktops/gnome-3/extensions/noannoyance { }; - paperwm = callPackage ../desktops/gnome-3/extensions/paperwm { }; - pidgin-im-integration = callPackage ../desktops/gnome-3/extensions/pidgin-im-integration { }; - remove-dropdown-arrows = callPackage ../desktops/gnome-3/extensions/remove-dropdown-arrows { }; - sound-output-device-chooser = callPackage ../desktops/gnome-3/extensions/sound-output-device-chooser { }; - system-monitor = callPackage ../desktops/gnome-3/extensions/system-monitor { }; - taskwhisperer = callPackage ../desktops/gnome-3/extensions/taskwhisperer { }; - tilingnome = callPackage ../desktops/gnome-3/extensions/tilingnome { }; - timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; - topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; - unite = callPackage ../desktops/gnome-3/extensions/unite { }; - window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; - window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; - workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; + appindicator = callPackage ../desktops/gnome/extensions/appindicator { }; + arcmenu = callPackage ../desktops/gnome/extensions/arcmenu { }; + caffeine = callPackage ../desktops/gnome/extensions/caffeine { }; + clipboard-indicator = callPackage ../desktops/gnome/extensions/clipboard-indicator { }; + clock-override = callPackage ../desktops/gnome/extensions/clock-override { }; + dash-to-dock = callPackage ../desktops/gnome/extensions/dash-to-dock { }; + dash-to-panel = callPackage ../desktops/gnome/extensions/dash-to-panel { }; + disable-unredirect = callPackage ../desktops/gnome/extensions/disable-unredirect { }; + draw-on-your-screen = callPackage ../desktops/gnome/extensions/draw-on-your-screen { }; + drop-down-terminal = callPackage ../desktops/gnome/extensions/drop-down-terminal { }; + dynamic-panel-transparency = callPackage ../desktops/gnome/extensions/dynamic-panel-transparency { }; + easyScreenCast = callPackage ../desktops/gnome/extensions/EasyScreenCast { }; + emoji-selector = callPackage ../desktops/gnome/extensions/emoji-selector { }; + freon = callPackage ../desktops/gnome/extensions/freon { }; + fuzzy-app-search = callPackage ../desktops/gnome/extensions/fuzzy-app-search { }; + gsconnect = callPackage ../desktops/gnome/extensions/gsconnect { }; + hot-edge = callPackage ../desktops/gnome/extensions/hot-edge { }; + icon-hider = callPackage ../desktops/gnome/extensions/icon-hider { }; + impatience = callPackage ../desktops/gnome/extensions/impatience { }; + material-shell = callPackage ../desktops/gnome/extensions/material-shell { }; + mpris-indicator-button = callPackage ../desktops/gnome/extensions/mpris-indicator-button { }; + night-theme-switcher = callPackage ../desktops/gnome/extensions/night-theme-switcher { }; + no-title-bar = callPackage ../desktops/gnome/extensions/no-title-bar { }; + noannoyance = callPackage ../desktops/gnome/extensions/noannoyance { }; + paperwm = callPackage ../desktops/gnome/extensions/paperwm { }; + pidgin-im-integration = callPackage ../desktops/gnome/extensions/pidgin-im-integration { }; + remove-dropdown-arrows = callPackage ../desktops/gnome/extensions/remove-dropdown-arrows { }; + sound-output-device-chooser = callPackage ../desktops/gnome/extensions/sound-output-device-chooser { }; + system-monitor = callPackage ../desktops/gnome/extensions/system-monitor { }; + taskwhisperer = callPackage ../desktops/gnome/extensions/taskwhisperer { }; + tilingnome = callPackage ../desktops/gnome/extensions/tilingnome { }; + timepp = callPackage ../desktops/gnome/extensions/timepp { }; + topicons-plus = callPackage ../desktops/gnome/extensions/topicons-plus { }; + unite = callPackage ../desktops/gnome/extensions/unite { }; + window-corner-preview = callPackage ../desktops/gnome/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome/extensions/window-is-ready-remover { }; + workspace-matrix = callPackage ../desktops/gnome/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; mediaplayer = throw "gnomeExtensions.mediaplayer deprecated since 2019-09-23: retired upstream https://github.com/JasonLG1979/gnome-shell-extensions-mediaplayer/blob/master/README.md"; @@ -28695,9 +28699,9 @@ in arc-menu = gnomeExtensions.arcmenu; # added 2021-02-14 }; - gnome-connections = callPackage ../desktops/gnome-3/apps/gnome-connections { }; + gnome-connections = callPackage ../desktops/gnome/apps/gnome-connections { }; - gnome-tour = callPackage ../desktops/gnome-3/core/gnome-tour { }; + gnome-tour = callPackage ../desktops/gnome/core/gnome-tour { }; hhexen = callPackage ../games/hhexen { }; @@ -28733,7 +28737,7 @@ in latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; - gnome-themes-extra = gnome3.gnome-themes-extra; + gnome-themes-extra = gnome.gnome-themes-extra; rox-filer = callPackage ../desktops/rox/rox-filer { gtk = gtk2; @@ -30840,7 +30844,7 @@ in }); winetricks = callPackage ../misc/emulators/wine/winetricks.nix { - inherit (gnome3) zenity; + inherit (gnome) zenity; }; wishbone-tool = callPackage ../development/tools/misc/wishbone-tool { }; @@ -31105,7 +31109,7 @@ in chrome-export = callPackage ../tools/misc/chrome-export {}; - chrome-gnome-shell = callPackage ../desktops/gnome-3/extensions/chrome-gnome-shell {}; + chrome-gnome-shell = callPackage ../desktops/gnome/extensions/chrome-gnome-shell {}; chrome-token-signing = libsForQt5.callPackage ../tools/security/chrome-token-signing {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 571fe6773006..af4125d67131 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -86,7 +86,7 @@ in { llvmPackages = pkgs.llvmPackages_10; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc884; # no binary yet + bootPkgs = packages.ghc8104; # no binary yet inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_10; llvmPackages = pkgs.llvmPackages_10; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7ec16ba9e28..567df1fdc9dd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3281,8 +3281,6 @@ in { influxgraph = callPackage ../development/python-modules/influxgraph { }; - infoqscraper = callPackage ../development/python-modules/infoqscraper { }; - inform = callPackage ../development/python-modules/inform { }; iniconfig = callPackage ../development/python-modules/iniconfig { }; @@ -7177,6 +7175,8 @@ in { rsa = callPackage ../development/python-modules/rsa { }; + rst2ansi = callPackage ../development/python-modules/rst2ansi { }; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; Rtree = callPackage ../development/python-modules/Rtree {