dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gnome-shell: Move from gnome scope to top-level

Browse Source
This commit is contained in:
Jan Tojnar 2024-08-28 23:56:05 +02:00
parent 7f387d6bf9
commit ca9576c81d
33 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/gnome.md
View File

@ -167,7 +167,7 @@ You can use `dconf-editor` tool to explore which GSettings you can set.
extraGSettingsOverridePackages = [ extraGSettingsOverridePackages = [
pkgs.gsettings-desktop-schemas # for org.gnome.desktop pkgs.gsettings-desktop-schemas # for org.gnome.desktop
pkgs.gnome.gnome-shell # for org.gnome.shell pkgs.gnome-shell # for org.gnome.shell
]; ];
}; };
} }

10
nixos/modules/services/x11/desktop-managers/gnome.nix
View File

@ -108,7 +108,7 @@ in
favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ] favorite-apps=[ 'firefox.desktop', 'org.gnome.Calendar.desktop' ]
''' '''
''; '';
description = "List of desktop files to put as favorite apps into gnome-shell. These need to be installed somehow globally."; description = "List of desktop files to put as favorite apps into pkgs.gnome-shell. These need to be installed somehow globally.";
}; };
extraGSettingsOverrides = mkOption { extraGSettingsOverrides = mkOption {
@ -309,7 +309,7 @@ in
services.xserver.desktopManager.gnome.sessionPath = services.xserver.desktopManager.gnome.sessionPath =
let let
mandatoryPackages = [ mandatoryPackages = [
pkgs.gnome.gnome-shell pkgs.gnome-shell
]; ];
optionalPackages = [ optionalPackages = [
pkgs.gnome-shell-extensions pkgs.gnome-shell-extensions
@ -331,7 +331,7 @@ in
systemd.packages = with pkgs.gnome; [ systemd.packages = with pkgs.gnome; [
gnome-session gnome-session
gnome-shell pkgs.gnome-shell
]; ];
services.udev.packages = [ services.udev.packages = [
@ -368,8 +368,8 @@ in
# Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-38/elements/core/meta-gnome-core-shell.bst
environment.systemPackages = environment.systemPackages =
let let
mandatoryPackages = with pkgs.gnome; [ mandatoryPackages = [
gnome-shell pkgs.gnome-shell
]; ];
optionalPackages = with pkgs.gnome; [ optionalPackages = with pkgs.gnome; [
pkgs.adwaita-icon-theme pkgs.adwaita-icon-theme

6
nixos/modules/services/x11/display-managers/gdm.nix
View File

@ -181,7 +181,11 @@ in
]; ];
# Otherwise GDM will not be able to start correctly and display Wayland sessions # Otherwise GDM will not be able to start correctly and display Wayland sessions
systemd.packages = with pkgs.gnome; [ gdm gnome-session gnome-shell ]; systemd.packages = with pkgs.gnome; [
gdm
gnome-session
pkgs.gnome-shell
];
environment.systemPackages = [ pkgs.adwaita-icon-theme ]; environment.systemPackages = [ pkgs.adwaita-icon-theme ];
# We dont use the upstream gdm service # We dont use the upstream gdm service

2
nixos/tests/gnome-extensions.nix
View File

@ -45,7 +45,7 @@ import ./make-test-python.nix (
# Eval API is now internal so Shell needs to run in unsafe mode. # Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation # TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess. # that would allow us to drop this mess.
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
]; ];
}; };
}; };

2
nixos/tests/gnome-xorg.nix
View File

@ -35,7 +35,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
# Eval API is now internal so Shell needs to run in unsafe mode. # Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation # TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess. # that would allow us to drop this mess.
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
]; ];
}; };
}; };

2
nixos/tests/gnome.nix
View File

@ -31,7 +31,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
# Eval API is now internal so Shell needs to run in unsafe mode. # Eval API is now internal so Shell needs to run in unsafe mode.
# TODO: improve test driver so that it supports openqa-like manipulation # TODO: improve test driver so that it supports openqa-like manipulation
# that would allow us to drop this mess. # that would allow us to drop this mess.
"${pkgs.gnome.gnome-shell}/bin/gnome-shell --unsafe-mode" "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"
]; ];
}; };
}; };

3
pkgs/applications/window-managers/phosh/default.nix
View File

@ -20,6 +20,7 @@
, gnome , gnome
, gnome-bluetooth , gnome-bluetooth
, gnome-desktop , gnome-desktop
, gnome-shell
, gcr , gcr
, pam , pam
, systemd , systemd
@ -110,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
# Depends on GSettings schemas in gnome-shell # Depends on GSettings schemas in gnome-shell
preFixup = '' preFixup = ''
gappsWrapperArgs+=( gappsWrapperArgs+=(
--prefix XDG_DATA_DIRS : "${gnome.gnome-shell}/share/gsettings-schemas/${gnome.gnome-shell.name}" --prefix XDG_DATA_DIRS : "${glib.getSchemaDataDirPath gnome-shell}"
--set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session" --set GNOME_SESSION "${gnome.gnome-session}/bin/gnome-session"
) )
''; '';

0
pkgs/desktops/gnome/core/gnome-shell/fix-paths.patch → pkgs/by-name/gn/gnome-shell/fix-paths.patch
View File

0
pkgs/desktops/gnome/core/gnome-shell/greeter-logo-size.patch → pkgs/by-name/gn/gnome-shell/greeter-logo-size.patch
View File

1
pkgs/desktops/gnome/core/gnome-shell/default.nix → pkgs/by-name/gn/gnome-shell/package.nix
View File

@ -231,7 +231,6 @@ stdenv.mkDerivation (finalAttrs: {
mozillaPlugin = "/lib/mozilla/plugins"; mozillaPlugin = "/lib/mozilla/plugins";
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = "gnome-shell"; packageName = "gnome-shell";
attrPath = "gnome.gnome-shell";
}; };
}; };

0
pkgs/desktops/gnome/core/gnome-shell/shew-gir-path.patch → pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
View File

0
pkgs/desktops/gnome/core/gnome-shell/wrap-services.patch → pkgs/by-name/gn/gnome-shell/wrap-services.patch
View File

3
pkgs/by-name/gn/gnome-tweaks/package.nix
View File

@ -9,6 +9,7 @@
, gnome , gnome
, gnome-desktop , gnome-desktop
, gnome-settings-daemon , gnome-settings-daemon
, gnome-shell
, gnome-shell-extensions , gnome-shell-extensions
, gobject-introspection , gobject-introspection
, gsettings-desktop-schemas , gsettings-desktop-schemas
@ -51,7 +52,7 @@ python3Packages.buildPythonApplication rec {
glib glib
gnome-desktop gnome-desktop
gnome-settings-daemon gnome-settings-daemon
gnome.gnome-shell gnome-shell
# Makes it possible to select user themes through the `user-theme` extension # Makes it possible to select user themes through the `user-theme` extension
gnome-shell-extensions gnome-shell-extensions
mutter mutter

4
pkgs/by-name/ma/matrix-gtk-theme/package.nix
View File

@ -2,7 +2,7 @@
lib, lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
gnome, gnome-shell,
sassc, sassc,
gnome-themes-extra, gnome-themes-extra,
gtk-engine-murrine, gtk-engine-murrine,
@ -82,7 +82,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
nativeBuildInputs = [ nativeBuildInputs = [
gnome.gnome-shell gnome-shell
sassc sassc
]; ];
buildInputs = [ gnome-themes-extra ]; buildInputs = [ gnome-themes-extra ];

4
pkgs/by-name/to/tokyonight-gtk-theme/package.nix
View File

@ -2,7 +2,7 @@
lib, lib,
stdenvNoCC, stdenvNoCC,
fetchFromGitHub, fetchFromGitHub,
gnome, gnome-shell,
sassc, sassc,
gnome-themes-extra, gnome-themes-extra,
gtk-engine-murrine, gtk-engine-murrine,
@ -83,7 +83,7 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
nativeBuildInputs = [ nativeBuildInputs = [
gnome.gnome-shell gnome-shell
sassc sassc
]; ];
buildInputs = [ gnome-themes-extra ]; buildInputs = [ gnome-themes-extra ];

4
pkgs/data/themes/adapta/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome }: { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome-shell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "adapta-gtk-theme"; pname = "adapta-gtk-theme";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
inkscape inkscape
libxml2 libxml2
glib.dev glib.dev
gnome.gnome-shell gnome-shell
]; ];
buildInputs = [ buildInputs = [

4
pkgs/data/themes/arc/default.nix
View File

@ -4,7 +4,7 @@
, meson , meson
, ninja , ninja
, glib , glib
, gnome , gnome-shell
, gnome-themes-extra , gnome-themes-extra
, gtk-engine-murrine , gtk-engine-murrine
, inkscape , inkscape
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
# "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity" # "-Dthemes=cinnamon,gnome-shell,gtk2,gtk3,plank,xfwm,metacity"
# "-Dvariants=light,darker,dark,lighter" # "-Dvariants=light,darker,dark,lighter"
"-Dcinnamon_version=${cinnamon-common.version}" "-Dcinnamon_version=${cinnamon-common.version}"
"-Dgnome_shell_version=${gnome.gnome-shell.version}" "-Dgnome_shell_version=${gnome-shell.version}"
# You will need to patch gdm to make use of this. # You will need to patch gdm to make use of this.
"-Dgnome_shell_gresource=true" "-Dgnome_shell_gresource=true"
]; ];

4
pkgs/data/themes/ayu-theme-gtk/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv { stdenv
, autoreconfHook , autoreconfHook
, fetchFromGitHub , fetchFromGitHub
, gnome , gnome-shell
, gnome-themes-extra , gnome-themes-extra
, gtk-engine-murrine , gtk-engine-murrine
, gtk3 , gtk3
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
''; '';
configureFlags = [ configureFlags = [
"--with-gnome-shell=${gnome.gnome-shell.version}" "--with-gnome-shell=${gnome-shell.version}"
"--disable-unity" "--disable-unity"
]; ];

4
pkgs/data/themes/equilux-theme/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnome, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }: { lib, stdenv, fetchFromGitHub, gnome-shell, gnome-themes-extra, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "equilux-theme"; pname = "equilux-theme";
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
patchShebangs install.sh patchShebangs install.sh
sed -i install.sh \ sed -i install.sh \
-e "s|if .*which gnome-shell.*;|if true;|" \ -e "s|if .*which gnome-shell.*;|if true;|" \
-e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome.gnome-shell.version}|" -e "s|CURRENT_GS_VERSION=.*$|CURRENT_GS_VERSION=${lib.versions.majorMinor gnome-shell.version}|"
mkdir -p $out/share/themes mkdir -p $out/share/themes
./install.sh --dest $out/share/themes ./install.sh --dest $out/share/themes
rm $out/share/themes/*/COPYING rm $out/share/themes/*/COPYING

4
pkgs/data/themes/lounge/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome, gdk-pixbuf, librsvg, gtk-engine-murrine }: { lib, stdenv, fetchFromGitHub, meson, ninja, sassc, gtk3, gnome-shell, gdk-pixbuf, librsvg, gtk-engine-murrine }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lounge-gtk-theme"; pname = "lounge-gtk-theme";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
mesonFlags = [ mesonFlags = [
"-D gnome_version=${lib.versions.majorMinor gnome.gnome-shell.version}" "-D gnome_version=${lib.versions.majorMinor gnome-shell.version}"
]; ];
postFixup = '' postFixup = ''

4
pkgs/data/themes/materia-theme/default.nix
View File

@ -4,7 +4,7 @@
, meson , meson
, ninja , ninja
, sassc , sassc
, gnome , gnome-shell
, gnome-themes-extra , gnome-themes-extra
, gtk-engine-murrine , gtk-engine-murrine
, gdk-pixbuf , gdk-pixbuf
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
propagatedUserEnvPkgs = [ gtk-engine-murrine ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ];
mesonFlags = [ mesonFlags = [
"-Dgnome_shell_version=${lib.versions.majorMinor gnome.gnome-shell.version}" "-Dgnome_shell_version=${lib.versions.majorMinor gnome-shell.version}"
]; ];
postInstall = '' postInstall = ''

3
pkgs/desktops/gnome/core/gnome-session/default.nix
View File

@ -13,6 +13,7 @@
gsettings-desktop-schemas, gsettings-desktop-schemas,
gnome-desktop, gnome-desktop,
gnome-settings-daemon, gnome-settings-daemon,
gnome-shell,
dbus, dbus,
json-glib, json-glib,
libICE, libICE,
@ -114,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: {
wrapProgram "$out/libexec/gnome-session-binary" \ wrapProgram "$out/libexec/gnome-session-binary" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
--suffix XDG_DATA_DIRS : "${gnome.gnome-shell}/share" \ --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \
--suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg" --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
''; '';

3
pkgs/desktops/gnome/default.nix
View File

@ -21,8 +21,6 @@ in
gnome-session = callPackage ./core/gnome-session { }; gnome-session = callPackage ./core/gnome-session { };
gnome-shell = callPackage ./core/gnome-shell { };
gvfs = pkgs.gvfs.override { gnomeSupport = true; }; gvfs = pkgs.gvfs.override { gnomeSupport = true; };
networkmanager-openvpn = pkgs.networkmanager-openvpn.override { networkmanager-openvpn = pkgs.networkmanager-openvpn.override {
@ -126,6 +124,7 @@ in
gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28. gnome-session-ctl = lib.warn "The ‘gnome.gnome-session-ctl’ was moved to top-level. Please use ‘pkgs.gnome-session-ctl’ directly." pkgs.gnome-session-ctl; # Added on 2024-08-28.
gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28. gnome-settings-daemon = lib.warn "The ‘gnome.gnome-settings-daemon’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon’ directly." pkgs.gnome-settings-daemon; # Added on 2024-08-28.
gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28. gnome-settings-daemon43 = lib.warn "The ‘gnome.gnome-settings-daemon43’ was moved to top-level. Please use ‘pkgs.gnome-settings-daemon43’ directly." pkgs.gnome-settings-daemon43; # Added on 2024-08-28.
gnome-shell = lib.warn "The ‘gnome.gnome-shell’ was moved to top-level. Please use ‘pkgs.gnome-shell’ directly." pkgs.gnome-shell; # Added on 2024-08-28.
gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11. gnome-shell-extensions = lib.warn "The ‘gnome.gnome-shell-extensions’ was moved to top-level. Please use ‘pkgs.gnome-shell-extensions’ directly." pkgs.gnome-shell-extensions; # Added on 2024-08-11.
gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11. gnome-software = lib.warn "The ‘gnome.gnome-software’ was moved to top-level. Please use ‘pkgs.gnome-software’ directly." pkgs.gnome-software; # Added on 2024-08-11.
gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11. gnome-sound-recorder = lib.warn "The ‘gnome.gnome-sound-recorder’ was moved to top-level. Please use ‘pkgs.gnome-sound-recorder’ directly." pkgs.gnome-sound-recorder; # Added on 2024-08-11.

4
pkgs/desktops/gnome/extensions/EasyScreenCast/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome, gettext, jq, intltool }: { lib, stdenv, fetchFromGitHub, substituteAll, glib, gnome-shell, gettext, jq, intltool }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "gnome-shell-extension-EasyScreenCast"; pname = "gnome-shell-extension-EasyScreenCast";
@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
patches = [ patches = [
(substituteAll { (substituteAll {
src = ./fix-gi-path.patch; src = ./fix-gi-path.patch;
gnomeShell = gnome.gnome-shell; gnomeShell = gnome-shell;
}) })
]; ];

4
pkgs/desktops/gnome/extensions/clock-override/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchzip, gnome, gettext, glib }: { lib, stdenv, fetchzip, gnome-shell, gettext, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-clock-override"; pname = "gnome-shell-extension-clock-override";
@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = with maintainers; [ rhoriguchi ]; maintainers = with maintainers; [ rhoriguchi ];
homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override"; homepage = "https://github.com/stuartlangridge/gnome-shell-clock-override";
broken = versionOlder gnome.gnome-shell.version "3.18"; broken = versionOlder gnome-shell.version "3.18";
}; };
} }

3
pkgs/desktops/gnome/extensions/gnome-browser-connector/default.nix
View File

@ -4,6 +4,7 @@
, ninja , ninja
, python3 , python3
, gnome , gnome
, gnome-shell
, wrapGAppsNoGuiHook , wrapGAppsNoGuiHook
, gobject-introspection , gobject-introspection
}: }:
@ -30,7 +31,7 @@ buildPythonApplication rec {
]; ];
buildInputs = [ buildInputs = [
gnome.gnome-shell gnome-shell
]; ];
pythonPath = [ pythonPath = [

4
pkgs/desktops/gnome/extensions/gsconnect/default.nix
View File

@ -13,7 +13,7 @@
, glib-networking , glib-networking
, gtk3 , gtk3
, openssh , openssh
, gnome , gnome-shell
, evolution-data-server-gtk4 , evolution-data-server-gtk4
, gjs , gjs
, nixosTests , nixosTests
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
]; ];
mesonFlags = [ mesonFlags = [
"-Dgnome_shell_libdir=${gnome.gnome-shell}/lib" "-Dgnome_shell_libdir=${gnome-shell}/lib"
"-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts"
"-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts"
"-Dopenssl_path=${openssl}/bin/openssl" "-Dopenssl_path=${openssl}/bin/openssl"

6
pkgs/desktops/gnome/extensions/icon-hider/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnome }: { lib, stdenv, fetchFromGitHub, gnome-shell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-icon-hider"; pname = "gnome-shell-extension-icon-hider";
@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
description = "Icon Hider is a GNOME Shell extension for managing status area items"; description = "Icon Hider is a GNOME Shell extension for managing status area items";
license = licenses.bsd3; license = licenses.bsd3;
maintainers = with maintainers; [ jonafato ]; maintainers = with maintainers; [ jonafato ];
platforms = gnome.gnome-shell.meta.platforms; platforms = gnome-shell.meta.platforms;
homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider"; homepage = "https://github.com/ikalnytskyi/gnome-shell-extension-icon-hider";
broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
}; };
} }

4
pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, glib, gnome }: { lib, stdenv, fetchFromGitHub, glib, gnome-shell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-pidgin-im-integration"; pname = "gnome-shell-extension-pidgin-im-integration";
@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ ]; maintainers = [ ];
broken = versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 broken = versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
}; };
} }

4
pkgs/desktops/gnome/extensions/tilingnome/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchFromGitHub, glib, gnome }: { stdenv, lib, fetchFromGitHub, glib, gnome-shell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-tilingnome"; pname = "gnome-shell-extension-tilingnome";
@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2; license = licenses.gpl2;
maintainers = with maintainers; [ benley ]; maintainers = with maintainers; [ benley ];
homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome"; homepage = "https://github.com/rliang/gnome-shell-extension-tilingnome";
platforms = gnome.gnome-shell.meta.platforms; platforms = gnome-shell.meta.platforms;
}; };
} }

4
pkgs/desktops/gnome/extensions/unite/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, gnome, fetchFromGitHub, xprop, glib }: { lib, stdenv, gnome-shell, fetchFromGitHub, xprop, glib }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-unite"; pname = "gnome-shell-extension-unite";
@ -38,6 +38,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl3Only; license = licenses.gpl3Only;
maintainers = with maintainers; [ rhoriguchi ]; maintainers = with maintainers; [ rhoriguchi ];
homepage = "https://github.com/hardpixel/unite-shell"; homepage = "https://github.com/hardpixel/unite-shell";
broken = versionOlder gnome.gnome-shell.version "3.32"; broken = versionOlder gnome-shell.version "3.32";
}; };
} }

4
pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, gnome }: { lib, stdenv, fetchFromGitHub, gnome-shell }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnome-shell-extension-window-corner-preview"; pname = "gnome-shell-extension-window-corner-preview";
@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
license = licenses.mit; license = licenses.mit;
maintainers = [ ]; maintainers = [ ];
homepage = "https://github.com/medenagan/window-corner-preview"; homepage = "https://github.com/medenagan/window-corner-preview";
broken = lib.versionAtLeast gnome.gnome-shell.version "3.32"; # Doesn't support 3.34 broken = lib.versionAtLeast gnome-shell.version "3.32"; # Doesn't support 3.34
}; };
} }

12
pkgs/top-level/all-packages.nix
View File

@ -28022,9 +28022,7 @@ with pkgs;
mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { }; mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
mojave-gtk-theme = callPackage ../data/themes/mojave { mojave-gtk-theme = callPackage ../data/themes/mojave { };
inherit (gnome) gnome-shell;
};
moka-icon-theme = callPackage ../data/icons/moka-icon-theme { }; moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
@ -28536,9 +28534,7 @@ with pkgs;
vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { }; vimix-cursor-theme = callPackage ../data/icons/vimix-cursor-theme { };
vimix-gtk-themes = callPackage ../data/themes/vimix { vimix-gtk-themes = callPackage ../data/themes/vimix { };
inherit (gnome) gnome-shell;
};
vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { }; vimix-icon-theme = callPackage ../data/icons/vimix-icon-theme { };
@ -28554,9 +28550,7 @@ with pkgs;
whitesur-cursors = callPackage ../data/icons/whitesur-cursors { }; whitesur-cursors = callPackage ../data/icons/whitesur-cursors { };
whitesur-gtk-theme = callPackage ../data/themes/whitesur { whitesur-gtk-theme = callPackage ../data/themes/whitesur { };
inherit (gnome) gnome-shell;
};
whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { }; whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { };