diff options
Diffstat (limited to 'pkgs/desktops')
187 files changed, 501 insertions, 528 deletions
diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index ee0c81d7d39e..3a0695f3fb84 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dbus-factory"; version = "3.1.17"; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 608096951b60..b052a1042403 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -23,7 +23,6 @@ }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "dde-api"; version = "3.18.4.1"; @@ -114,7 +113,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 0d25d9083ebb..427cb1249c90 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -3,7 +3,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-calendar"; version = "1.2.10"; @@ -38,7 +37,7 @@ mkDerivation rec { -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index 88c3639ff2e6..0871e004e5f9 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -7,7 +7,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-control-center"; version = "4.10.11"; @@ -100,7 +99,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Control panel of Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index 4fb0272a3cef..19089a6b050e 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -7,7 +7,6 @@ deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "dde-daemon"; version = "3.27.2.6"; @@ -122,7 +121,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index 21c8221bd13b..fc25d007f200 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -6,7 +6,6 @@ let unwrapped = mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-dock"; version = "4.10.3"; @@ -69,7 +68,7 @@ unwrapped = mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Dock for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 3580eeb43045..081c93a65c86 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -9,7 +9,6 @@ xdg-user-dirs, xorg, zlib, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-file-manager"; version = "4.8.6.4"; @@ -239,7 +238,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "File manager and desktop module for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index f8a05b869802..b36d87604e74 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -4,7 +4,6 @@ which, xdg_utils, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-launcher"; version = "4.6.13"; @@ -64,7 +63,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Desktop Environment launcher module"; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 4fd08749ee49..5397439949b3 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -2,7 +2,6 @@ dde-qt-dbus-factory, proxychains, which, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-network-utils"; version = "0.1.4"; @@ -42,7 +41,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin network utils"; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index d1f1bed2775a..9d181c188d4d 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -2,7 +2,6 @@ dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-polkit-agent"; version = "0.2.10"; @@ -39,7 +38,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "PolicyKit agent for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 0d063cbd8485..a0e1e35ad859 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, qmake, python3, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-qt-dbus-factory"; version = "1.1.5"; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index 8302e8e97bcd..d6713fb3688e 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -6,7 +6,6 @@ xkeyboard_config, xorg, xrandr, wrapGAppsHook }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dde-session-ui"; version = "4.9.12"; @@ -115,7 +114,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index c768fa60ce70..619c66d9f5f8 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -2,7 +2,6 @@ dtkcore, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-anything"; version = "0.1.0"; @@ -52,7 +51,7 @@ mkDerivation rec { searchHardCodedPaths $modsrc # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin file search tool"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 51f0b666cb1e..97d2b53da70a 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -2,7 +2,6 @@ dtkwidget, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-calculator"; version = "1.0.11"; @@ -37,7 +36,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Easy to use calculator for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index f43909f37dc1..ba826eb9063f 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-desktop-base"; version = "2019.06.19"; @@ -41,7 +40,7 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 5849bc78ac0b..b6c20ef71297 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -2,7 +2,6 @@ deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-desktop-schemas"; version = "3.13.6"; @@ -57,7 +56,7 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index d9a6f3701688..f4f4ae2971a4 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-gettext-tools"; version = "1.0.8"; @@ -36,7 +35,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 469a43efe329..4c0643a7ce5c 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-gtk-theme"; version = "17.10.11"; @@ -16,7 +15,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin GTK Theme"; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index c5cf9e9ad3a8..8ecb25f5a2e7 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-icon-theme"; version = "15.12.71"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 89ef62475047..733f4846f5cf 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -4,7 +4,6 @@ }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-image-viewer"; version = "1.3.17"; @@ -42,7 +41,7 @@ mkDerivation rec { -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 4292fb2d212b..9aef8a15eb94 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -2,7 +2,6 @@ qt5integration, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-menu"; version = "3.4.8"; @@ -35,7 +34,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin menu service"; diff --git a/pkgs/desktops/deepin/deepin-metacity/default.nix b/pkgs/desktops/deepin/deepin-metacity/default.nix index a4aede5857c9..18f542233019 100644 --- a/pkgs/desktops/deepin/deepin-metacity/default.nix +++ b/pkgs/desktops/deepin/deepin-metacity/default.nix @@ -4,7 +4,6 @@ deepin, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-metacity"; version = "3.22.24"; @@ -54,7 +53,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "2D window manager for Deepin"; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 6e14f0fd804e..046f589263bd 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -3,7 +3,6 @@ libdvdnav, libdvdread, xorg, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-movie-reborn"; version = "3.2.24"; @@ -45,7 +44,7 @@ mkDerivation rec { sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin movie player"; diff --git a/pkgs/desktops/deepin/deepin-mutter/default.nix b/pkgs/desktops/deepin/deepin-mutter/default.nix index 83afe1ee24f7..9f2e8068d555 100644 --- a/pkgs/desktops/deepin/deepin-mutter/default.nix +++ b/pkgs/desktops/deepin/deepin-mutter/default.nix @@ -5,7 +5,6 @@ deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-mutter"; version = "3.20.38"; @@ -68,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Base window manager for deepin, fork of gnome mutter"; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 256744828db8..e77aa5e68c63 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -3,7 +3,6 @@ deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-screenshot"; version = "4.2.1"; @@ -49,7 +48,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 8c482d534052..62c6c7ed9259 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -2,7 +2,6 @@ qt5integration, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-shortcut-viewer"; version = "1.3.5"; @@ -26,7 +25,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index bb752cc1ca90..398be55398bf 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-sound-theme"; version = "15.10.3"; @@ -14,7 +13,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder ''out''}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin sound theme"; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 51156554f999..59789bd84bbe 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -5,7 +5,6 @@ libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-terminal"; version = "3.2.6"; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Default terminal emulator for Deepin"; diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index 1fe930ea490d..299db5336746 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-turbo"; version = "0.0.3"; @@ -32,7 +31,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "A daemon that helps to launch applications faster"; diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index f99974ba9c26..e822cf6269dd 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, dde-api, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-wallpapers"; version = "1.7.7"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-wm/default.nix b/pkgs/desktops/deepin/deepin-wm/default.nix index 986bee2f0dd2..13b115e7042f 100644 --- a/pkgs/desktops/deepin/deepin-wm/default.nix +++ b/pkgs/desktops/deepin/deepin-wm/default.nix @@ -4,7 +4,6 @@ deepin-desktop-schemas, wrapGAppsHook, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-wm"; version = "1.9.38"; @@ -64,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin Window Manager"; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index 4baa2262cd6e..f645be0f4d9b 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -2,7 +2,6 @@ dde-polkit-agent, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "dpa-ext-gnomekeyring"; version = "0.1.0"; @@ -31,7 +30,7 @@ stdenv.mkDerivation rec { fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GNOME keyring extension for dde-polkit-agent"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 2a527e3cc19c..2ed10f993681 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkcore"; version = "2.0.14"; @@ -43,7 +42,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin tool kit core modules"; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 8487509e73b2..54c4163fcd1d 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -3,7 +3,6 @@ dde-qt-dbus-factory, dtkcore, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkwidget"; version = "2.0.14"; @@ -41,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index c05eedd8857a..4807c3d312b5 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -2,7 +2,6 @@ deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "dtkwm"; version = "2.0.11"; @@ -31,7 +30,7 @@ mkDerivation rec { "LIB_INSTALL_DIR=${outRef}/lib" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index 044d5e2a2eaf..1d97991dffd0 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-dbus-factory"; version = "0.9.0"; @@ -18,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 92cf3960c736..2c63fd5ebe62 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, go, go-lib, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-dbus-generator"; version = "0.6.6"; @@ -22,7 +21,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index 4b79969970a8..68504d756b17 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -2,7 +2,6 @@ libgudev, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-gir-generator"; version = "2.0.2"; @@ -32,7 +31,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 6f3a851eb2f1..fff92b595f8b 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -2,7 +2,6 @@ mobile-broadband-provider-info, deepin }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "go-lib"; version = "1.10.2"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { rm -r $out/share/go/src/pkg.deepin.io/lib/debian ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index b275174fa9f1..ffbc230d2e2a 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -39,7 +39,6 @@ let in mkDerivation rec { - name = "${pname}-${version}"; pname = "qcef"; version = "1.1.6"; @@ -91,7 +90,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt5 binding of Chromium Embedded Framework"; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index f2e6eb0d1233..d76bed1b9b7b 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -2,7 +2,6 @@ mtdev, cairo, deepin, qtbase }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qt5dxcb-plugin"; version = "1.2.2"; @@ -31,7 +30,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 8302e701b386..97e60be6d678 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -3,7 +3,6 @@ qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qt5integration"; version = "0.3.12"; @@ -41,7 +40,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index e7f735a4256a..51c38f6d3474 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,7 +1,6 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: mkDerivation rec { - name = "${pname}-${version}"; pname = "udisks2-qt5"; version = "0.0.1"; @@ -29,7 +28,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { description = "UDisks2 D-Bus interfaces binding for Qt5"; diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 8e73682065d3..93b0cb59650b 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { - name = "econnman-${version}"; + pname = "econnman"; version = "1.1"; src = fetchurl { - url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; + url = "http://download.enlightenment.org/rel/apps/econnman/${pname}-${version}.tar.gz"; sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto.nix index 409b3f7bb8dd..f1455f68338f 100644 --- a/pkgs/desktops/enlightenment/ephoto.nix +++ b/pkgs/desktops/enlightenment/ephoto.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, efl, pcre, mesa, makeWrapper }: stdenv.mkDerivation rec { - name = "ephoto-${version}"; + pname = "ephoto"; version = "1.5"; src = fetchurl { - url = "http://www.smhouston.us/stuff/${name}.tar.gz"; + url = "http://www.smhouston.us/stuff/${pname}-${version}.tar.gz"; sha256 = "09kraa5zz45728h2dw1ssh23b87j01bkfzf977m48y1r507sy3vb"; }; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix index 31dd985af2a7..7d8365337aa8 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python-desktop/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation rec { ver_maj = "2.32"; ver_min = "0"; version = "${ver_maj}.${ver_min}"; - name = "gnome-python-desktop-${version}"; + pname = "gnome-python-desktop"; src = fetchurl { url = "mirror://gnome/sources/gnome-python-desktop/${ver_maj}/gnome-python-desktop-${version}.tar.bz2"; @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { # gnome-python-desktop expects that .pth file is already installed by PyGTK # in the same directory. This is not the case for Nix. postInstall = '' - echo "gtk-2.0" > $out/${python2.sitePackages}/${name}.pth + echo "gtk-2.0" > $out/${python2.sitePackages}/${pname}-${version}.pth ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix index 03440c02c14f..87d2931d2744 100644 --- a/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gtksourceview/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gtksourceview-${version}"; + pname = "gtksourceview"; version = "2.10.5"; src = fetchurl { - url = "mirror://gnome/sources/gtksourceview/2.10/${name}.tar.bz2"; + url = "mirror://gnome/sources/gtksourceview/2.10/${pname}-${version}.tar.bz2"; sha256 = "c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e"; }; diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix index ac9a87299ab8..10b99e4eb5d2 100644 --- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { rev = "9ae8768"; version = "5.4"; - name = "mail-notification-${version}"; + pname = "mail-notification"; src = fetchFromGitHub { inherit rev; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index df3de11e738d..1a1848491b16 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus-glib, glib, ORBit2, libxml2, polkit, python2, intltool }: stdenv.mkDerivation rec { - name = "gconf-${version}"; + pname = "gconf"; version = "3.2.6"; src = fetchurl { diff --git a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix index 3ea04048accc..33c2abef0fab 100644 --- a/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix +++ b/pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { version = "4.10.0"; - name = "gtkhtml-${version}"; + pname = "gtkhtml"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/4.10/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/4.10/${pname}-${version}.tar.xz"; sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya"; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index f21e81237b26..b18e58f6f56f 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -5,11 +5,11 @@ , adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }: stdenv.mkDerivation rec { - name = "cheese-${version}"; + pname = "cheese"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/cheese/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xlmsm4zsx05ahvpd4mgy1hfhxbag0r5i6p63bksjxdligdd36kv"; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 733b8ecca920..267a7f2f7d20 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -2,11 +2,11 @@ , file, json-glib, python3, wrapGAppsHook, desktop-file-utils, libnotify, nautilus, glibcLocales }: stdenv.mkDerivation rec { - name = "file-roller-${version}"; + pname = "file-roller"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0irm72cf8222h93skivn0nn0ckahiiiimy4rb9r3ccjvhi3hiaqw"; }; diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 2dcd265e2e48..35d97a87a86f 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -5,11 +5,11 @@ , gnome3, gspell, perl, itstool, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gedit-${version}"; + pname = "gedit"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1q2rk7fym542c7k3bn2wlnzgy384gxacbifsjny0spbg95gfybvl"; }; diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 4424eb4a3fd4..92b38ed5eee4 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -4,11 +4,11 @@ , gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "glade-${version}"; + pname = "glade"; version = "3.22.1"; src = fetchurl { - url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16p38xavpid51qfy0s26n0n21f9ws1w9k5s65bzh1w7ay8p9my6z"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 2a308a2da450..27ce5d0f078b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -11,10 +11,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-boxes-${version}"; + pname = "gnome-boxes"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "159sxii3g4s5pjb4s4i3kc4q162w5vicp4g6wvk1y2yv68bgmcl4"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index d2845bef2a13..38182f1f994f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -5,11 +5,11 @@ , gnome3, gdk-pixbuf, geoclue2, libgweather }: stdenv.mkDerivation rec { - name = "gnome-clocks-${version}"; + pname = "gnome-clocks"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1w6lgjdak3x76c9gyhd1lqrdmjfh8q77sjnrkcimylsg0jq913bc"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index e8796d49e9a1..1301381e5aaf 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -7,11 +7,11 @@ , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-documents-${version}"; + pname = "gnome-documents"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-documents/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1gqddzbr4d8s0asmrhy0sfmwggzhbmpm61mqf8rxpdjk7s26086c"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 4c215d347299..655e9e9fe34d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "gnome-getting-started-docs-${version}"; + pname = "gnome-getting-started-docs"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v4k465mlzrhgcdddzs6bmm0yliyrfx6jg3gh0s17a08i0w5rbwq"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index d46882deb41e..8681a3c866ce 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -2,11 +2,11 @@ , gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-logs-${version}"; + pname = "gnome-logs"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hh3nnbq7q2xbflvaywanm0j3dqhb04ngphskhnjx2sg7px12068"; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 4a34f12912f7..5978fb217e87 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -7,7 +7,8 @@ let version = "3.32.2"; in stdenv.mkDerivation rec { - name = "gnome-notes-${version}"; + pname = "gnome-notes"; + inherit version; src = fetchurl { url = "mirror://gnome/sources/bijiben/${stdenv.lib.versions.majorMinor version}/bijiben-${version}.tar.xz"; diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index d21cfcfd72d2..1e5a641f08fd 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -2,11 +2,11 @@ , libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-weather-${version}"; + pname = "gnome-weather"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0jfxdfbjkrk3x48w6nxgbmazd6jw1fh4mfw12hlly4rs0cjw698s"; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index ae360d73b879..c5377157ef0c 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -2,11 +2,11 @@ , libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { - name = "vinagre-${version}"; + pname = "vinagre"; version = "3.22.0"; src = fetchurl { - url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/vinagre/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 9ef94adcbd09..a7f4a637b178 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -2,11 +2,11 @@ , iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "adwaita-icon-theme-${version}"; + pname = "adwaita-icon-theme"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11ij35na8nisvxx3qh527iz33h6z2q1a7iinqyp7p65v0zjbd3b9"; }; diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 73c3f65a968a..5e4bbf8cce17 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -10,11 +10,11 @@ , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { - name = "empathy-${version}"; + pname = "empathy"; version = "3.25.90"; src = fetchurl { - url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/empathy/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sn10fcymc6lyrabk7vx8lpvlaxxkqnmcwj9zdkfa8qf3388k4nc"; }; diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 7b7b7f64aa4d..85f31bfdce5d 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -5,11 +5,11 @@ , gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }: stdenv.mkDerivation rec { - name = "epiphany-${version}"; + pname = "epiphany"; version = "3.32.4"; src = fetchurl { - url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/epiphany/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15d9s295yr6m9pbwh344c4akm7rgn19y4g1xkyn7gbq1hdbjia69"; }; diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index 078145e1231f..dda45a71fe20 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -5,13 +5,13 @@ , glib, gtk3, gnome-online-accounts, libgweather, libgdata, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "evolution-data-server-${version}"; + pname = "evolution-data-server"; version = "3.32.4"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zsc9xwy6ixk3x0dx69ax5isrdw8qxjdxg2i5fr95s40nss7rxl3"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; prePatch = '' - substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${name}/glib-2.0/schemas \ + substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch --subst-var-by ESD_GSETTINGS_PATH $out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas \ --subst-var-by GDS_GSETTINGS_PATH "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}/glib-2.0/schemas" patches="$patches $PWD/hardcode-gsettings.patch" ''; diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index 420a0d3e6b11..a4d2fd2be5a5 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -4,11 +4,11 @@ , librsvg, coreutils, xwayland }: stdenv.mkDerivation rec { - name = "gdm-${version}"; + pname = "gdm"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gdm/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12ypdz9i24hwbl1d1wnnxb8zlvfa4f49n9ac5cl9d6h8qp4b0gb4"; }; diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix index 4e43d5f9d50c..303377b8631a 100644 --- a/pkgs/desktops/gnome-3/core/gjs/default.nix +++ b/pkgs/desktops/gnome-3/core/gjs/default.nix @@ -3,11 +3,11 @@ , makeWrapper }: stdenv.mkDerivation rec { - name = "gjs-${version}"; + pname = "gjs"; version = "1.56.2"; src = fetchurl { - url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1b5321krn89p3f7s2ik6gpfnc61apzljhlnbqky8c88f7n6832ac"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 1e332502db5d..e4c772cb1d40 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, gettext }: stdenv.mkDerivation rec { - name = "gnome-backgrounds-${version}"; + pname = "gnome-backgrounds"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-backgrounds/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1s5krdmd3md44p1fgr2lqm5ifxb8s1vzx6hm11sb4cgzr4dw6lrz"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 9214aa0a9a79..df43371a4971 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -3,11 +3,11 @@ , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-calculator-${version}"; + pname = "gnome-calculator"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-calculator/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0fgpn3sc226s9fpzhik5rkkrf669037gc659ga2kn9jsyckj6p41"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index d0ab339a504d..f2eb65e50bbf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, gnome3, autoconf, automake }: stdenv.mkDerivation rec { - name = "gnome-common-${version}"; + pname = "gnome-common"; version = "3.18.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-common/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "22569e370ae755e04527b76328befc4c73b62bfd4a572499fde116b8318af8cf"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 57cb90c7c458..75a15a41f97b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -7,10 +7,11 @@ let version = "3.32.1"; in stdenv.mkDerivation rec { - name = "gnome-contacts-${version}"; + pname = "gnome-contacts"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "17g1gh8yj58cfpdx69h2szivlbjgvv982kmhnkkh0i5bwj0zs2yy"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 4beeb190f025..9d798c2811bd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -3,13 +3,13 @@ , libseccomp, systemd, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-desktop-${version}"; + pname = "gnome-desktop"; version = "3.32.2"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0bidx4626x7k2myv6f64qv4fzmxv8v475wibiz19kj8hjfr737q9"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index 613de6c3c164..98398311882b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -3,11 +3,11 @@ , gnome3, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gnome-dictionary-${version}"; + pname = "gnome-dictionary"; version = "3.26.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-dictionary/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "16b8bc248dcf68987826d5e39234b1bb7fd24a2607fcdbf4258fde88f012f300"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 8e09b152e83a..d6d9f9272528 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -4,11 +4,11 @@ , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { - name = "gnome-disk-utility-${version}"; + pname = "gnome-disk-utility"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-disk-utility/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08vwbji9m1nhjjdiyhhaqi8cncys7i89b4bpy095f8475v8y05bg"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 317c7e915841..976829acd4c6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -3,11 +3,11 @@ , wrapGAppsHook, gnome3, harfbuzz }: stdenv.mkDerivation rec { - name = "gnome-font-viewer-${version}"; + pname = "gnome-font-viewer"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-font-viewer/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "10b150sa3971i5lfnk0jkkzlril97lz09sshwsbkabc8b7kv1qa3"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index f36d3f4a6e0a..4148843d4ab7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -3,11 +3,11 @@ , docbook_xsl, docbook_xml_dtd_43, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-keyring-${version}"; + pname = "gnome-keyring"; version = "3.31.91"; src = fetchurl { - url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-keyring/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1fjylqw4xp0rqsylq4gbxzw1sql2sy55h1mnz1pprrxb9py0mnd4"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index ed4c1a3da13a..93da1f8abec9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -3,11 +3,11 @@ , tracker, gfbgraph, librest, libsoup, json-glib, gmp, openssl, dleyna-server, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "gnome-online-miners-${version}"; + pname = "gnome-online-miners"; version = "3.30.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-online-miners/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pjamwwzn5wqgihyss357dyl2q70r0bngnqmwsqawchx5f9aja9c"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 38adf7137f76..f13ad9f47aa6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -3,11 +3,11 @@ , libxslt, gettext, makeWrapper, systemd, xorg, epoxy, gnugrep, bash }: stdenv.mkDerivation rec { - name = "gnome-session-${version}"; + pname = "gnome-session"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-session/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zrzkpd406i159mla7bfs5npa32fgqh66aip1rfq02rgsgmc9m5v"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 6929f821e379..b9f33ce73a8a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -95,6 +95,12 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + NIX_CFLAGS_COMPILE = [ + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; + # So the polkit policy can reference /run/current-system/sw/bin/gnome-settings-daemon/gsd-backlight-helper postFixup = '' mkdir -p $out/bin/gnome-settings-daemon diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index 21281f15a5c1..761216600120 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -2,11 +2,11 @@ , gnome3, gnome-menus, substituteAll }: stdenv.mkDerivation rec { - name = "gnome-shell-extensions-${version}"; + pname = "gnome-shell-extensions"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "07libf6z24n42hpdsq163w0j8xyrav0lxqrwxrvq5kbz8zxv5ch2"; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { # Fixup adapted from export-zips.sh in the source. extensiondir=$out/share/gnome-shell/extensions - schemadir=$out/share/gsettings-schemas/${name}/glib-2.0/schemas/ + schemadir=$out/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas/ glib-compile-schemas $schemadir diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 1363cf6d6695..a1d8f2c599a8 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -13,11 +13,11 @@ let pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { - name = "gnome-shell-${version}"; + pname = "gnome-shell"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0anlkdnqsp5fqvmg95rqjpp1ifcx5xzsvwcrdsvb1cqzbh6inmp5"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 6d4875979007..12081bbae5b0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { - name = "gnome-software-${version}"; + pname = "gnome-software"; version = "3.32.4"; src = fetchurl { - url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-software/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0g30wdrpypj23npvx85wqh1i4a8bbg00ainz7wmsvry21hcny4d4"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 5c332c4135c5..a9f8367a5484 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -3,11 +3,11 @@ , gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { - name = "gnome-system-monitor-${version}"; + pname = "gnome-system-monitor"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-system-monitor/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wd43qdgjav6xamq5z5cy8fri5zr01jga3plc9w95gcia0rk3ha8"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index c9f5229f8701..75d4b117e778 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -3,11 +3,11 @@ , desktop-file-utils, itstool, wrapGAppsHook, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-terminal-${version}"; + pname = "gnome-terminal"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0shhpnagasyp1kxgjczfrivcxbgrrl3y8lzvp1z101m67h4jp6km"; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix index 1a8582626e3a..7915e71a73c0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - name = "gnome-user-docs-${version}"; + pname = "gnome-user-docs"; version = "3.32.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0dvsl0ldg8rf7yq0r4dv1pn41s7gjgcqp7agkbflkbmhrl6vbhig"; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix index cfdda920e27c..56104aff4840 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/unicode-data.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gnome3 }: stdenv.mkDerivation rec { - name = "unicode-data-${version}"; + pname = "unicode-data"; version = "12.0.0"; srcs = [ (fetchurl { diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 4f57c5247d97..de56b14d46fd 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -3,11 +3,11 @@ , libxml2, sane-backends, vala, gnome3, gobject-introspection }: stdenv.mkDerivation rec { - name = "simple-scan-${version}"; + pname = "simple-scan"; version = "3.32.2.1"; src = fetchurl { - url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqb642bsd2hddsm4bd199vyq8jcipdlxm0br3mjlc5vjcxgkxyp"; }; diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 5554dbdfe302..86675f21f06a 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -4,11 +4,11 @@ , gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }: stdenv.mkDerivation rec { - name = "sushi-${version}"; + pname = "sushi"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/sushi/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02idvqjk76lii9xyg3b1yz4rw721709bdm5j8ikjym6amcghl0aj"; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 4953b7ec7a82..a5388f2eae19 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -6,11 +6,11 @@ , gdk-pixbuf, tracker, nautilus, xvfb_run }: stdenv.mkDerivation rec { - name = "totem-${version}"; + pname = "totem"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/totem/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yra8apc7smpwf7d1k8crhrm8d4wix24ds6i9yxbch1v11jnhr3v"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix index aac216262584..43863bf7f856 100644 --- a/pkgs/desktops/gnome-3/core/yelp-tools/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }: stdenv.mkDerivation rec { - name = "yelp-tools-${version}"; + pname = "yelp-tools"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp-tools/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index f1a393117280..fc5b0268df70 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -2,11 +2,11 @@ , itstool, libxml2, libxslt, gnome3 }: stdenv.mkDerivation rec { - name = "yelp-xsl-${version}"; + pname = "yelp-xsl"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp-xsl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "013z2ixx9kfrs6hq79qpil093xfbc12y1p0mvsh6lpala30iphya"; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 24a49413960c..7e326dd1657d 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -4,11 +4,11 @@ , wrapGAppsHook }: stdenv.mkDerivation rec { - name = "yelp-${version}"; + pname = "yelp"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/yelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yrl96icmmrxvg7sxl519gzg9qb368cmzgrr9ddh181ignkxzx7f"; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 89d0fd7a3b90..5023ffce6b96 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -2,11 +2,11 @@ , gnome-doc-utils, intltool, libX11, which, itstool, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "zenity-${version}"; + pname = "zenity"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/zenity/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "15fdh8xfdhnwcynyh4byx3mrjxbyprqnwxzi7qn3g5wwaqryg1p7"; }; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index d1e5179063f3..573259b7e7d0 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -3,11 +3,11 @@ itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { - name = "anjuta-${version}"; + pname = "anjuta"; version = "3.28.0"; src = fetchurl { - url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/anjuta/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0ya7ajai9rx9g597sr5wawr6l5pb2s34bbjdsbnx0lkrhnjv11xh"; }; diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index 80a3770b7030..23a58011e027 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -3,11 +3,11 @@ , webkitgtk, gettext, itstool, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "devhelp-${version}"; + pname = "devhelp"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06sa83zggk29wcg75fl3gqh0rmi7cd3gsbk09a2z23r7vpy7xanq"; }; diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 647e7163d0b9..81f63941729f 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }: stdenv.mkDerivation rec { - name = "gnome-devel-docs-${version}"; + pname = "gnome-devel-docs"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-devel-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0xqpgf975rws60qxilq635pblbpgwspyykgzxnb4awd9zrs5lbx0"; }; diff --git a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix index 9fbce7c6cc02..7ebacc99c522 100644 --- a/pkgs/desktops/gnome-3/devtools/nemiver/default.nix +++ b/pkgs/desktops/gnome-3/devtools/nemiver/default.nix @@ -3,11 +3,11 @@ gtksourceviewmm, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "nemiver-${version}"; + pname = "nemiver"; version = "0.9.6"; src = fetchurl { - url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/nemiver/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "85ab8cf6c4f83262f441cb0952a6147d075c3c53d0687389a3555e946b694ef2"; }; diff --git a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix index 568a6cace720..6f289fd74d9f 100644 --- a/pkgs/desktops/gnome-3/extensions/appindicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/appindicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-appindicator-${version}"; + pname = "gnome-shell-extension-appindicator"; version = "29"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix index afedd5f98e1a..b7bde83915c1 100644 --- a/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ b/pkgs/desktops/gnome-3/extensions/battery-status/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-battery-status-${version}"; + pname = "gnome-shell-extension-battery-status"; version = "6"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix index e627bec8b931..95a68505c7c8 100644 --- a/pkgs/desktops/gnome-3/extensions/caffeine/default.nix +++ b/pkgs/desktops/gnome-3/extensions/caffeine/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext, bash }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-caffeine-${version}"; + pname = "gnome-shell-extension-caffeine"; version = "unstable-2019-04-02"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 755c8e1b02fb..b4b184d4fa03 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -5,10 +5,11 @@ let inherit (python3.pkgs) python pygobject3 requests; in stdenv.mkDerivation rec { - name = "chrome-gnome-shell-${version}"; + pname = "chrome-gnome-shell"; + inherit version; src = fetchurl { - url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${pname}-${version}.tar.xz"; sha256 = "0f54xyamm383ypbh0ndkza0pif6ljddg2f947p265fkqj3p4zban"; }; diff --git a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix index e41227e85139..0faadbcd2b68 100644 --- a/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix +++ b/pkgs/desktops/gnome-3/extensions/clipboard-indicator/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-clipboard-indicator-${version}"; + pname = "gnome-shell-extension-clipboard-indicator"; version = "30"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index 06e7d27c5444..e80149e50053 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-dash-to-dock-${version}"; + pname = "gnome-shell-dash-to-dock"; version = "66"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix index 0d48b8359c91..30f9ad7d2ab1 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-panel/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-dash-to-panel-${version}"; + pname = "gnome-shell-dash-to-panel"; version = "19"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix index dd2a02b6be85..0d9d54167ff2 100644 --- a/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome-3/extensions/gsconnect/default.nix @@ -3,7 +3,7 @@ , glib, gtk3, at-spi2-core, upower, openssh, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-gsconnect-${version}"; + pname = "gnome-shell-gsconnect"; version = "23"; src = fetchFromGitHub { @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgnome_shell_libdir=${gnome3.gnome-shell}/lib" - "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas" + "-Dgsettings_schemadir=${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" "-Dchrome_nmhdir=${placeholder "out"}/etc/opt/chrome/native-messaging-hosts" "-Dchromium_nmhdir=${placeholder "out"}/etc/chromium/native-messaging-hosts" "-Dopenssl_path=${openssl}/bin/openssl" diff --git a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix index d08e6f3a57df..8214300a5311 100644 --- a/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix +++ b/pkgs/desktops/gnome-3/extensions/icon-hider/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, gnome3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-icon-hider-${version}"; + pname = "gnome-shell-extension-icon-hider"; version = "23"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/impatience.nix b/pkgs/desktops/gnome-3/extensions/impatience.nix index 24b4c1cf703f..b36f3489b57c 100644 --- a/pkgs/desktops/gnome-3/extensions/impatience.nix +++ b/pkgs/desktops/gnome-3/extensions/impatience.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-impatience-${version}"; + pname = "gnome-shell-impatience"; version = "0.4.5"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix index 686d7be91a47..f09822415a6e 100644 --- a/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/mediaplayer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, meson, gettext, ninja, python3 }: stdenv.mkDerivation rec { - name = "gnome-shell-extensions-mediaplayer-${version}"; + pname = "gnome-shell-extensions-mediaplayer"; version = "unstable-2019-03-21"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix index 8c075a11bdcd..f9f72bd77f02 100644 --- a/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix +++ b/pkgs/desktops/gnome-3/extensions/no-title-bar/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, substituteAll, glib, gettext, xorg }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-no-title-bar-${version}"; + pname = "gnome-shell-extension-no-title-bar"; version = "9"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix index 21ff70140be1..e2b5288e8869 100644 --- a/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix +++ b/pkgs/desktops/gnome-3/extensions/nohotcorner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-nohotcorner-${version}"; + pname = "gnome-shell-extension-nohotcorner"; version = "19.0"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix index 5faa55652d8a..d9ea670db09e 100644 --- a/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix +++ b/pkgs/desktops/gnome-3/extensions/remove-dropdown-arrows/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-remove-dropdown-arrows-${version}"; + pname = "gnome-shell-extension-remove-dropdown-arrows"; version = "11"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix index 7046e6737269..285733d5f7c9 100644 --- a/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/extensions/system-monitor/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, glib, glib-networking, libgtop }: stdenv.mkDerivation rec { - name = "gnome-shell-system-monitor-${version}"; + pname = "gnome-shell-system-monitor"; version = "36"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix index c72d72cce126..745541b7cf43 100644 --- a/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix +++ b/pkgs/desktops/gnome-3/extensions/taskwhisperer/default.nix @@ -1,7 +1,7 @@ { stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-taskwhisperer-${version}"; + pname = "gnome-shell-extension-taskwhisperer"; version = "12"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/timepp/default.nix b/pkgs/desktops/gnome-3/extensions/timepp/default.nix index 604b7433ccb4..f841ef2403dc 100644 --- a/pkgs/desktops/gnome-3/extensions/timepp/default.nix +++ b/pkgs/desktops/gnome-3/extensions/timepp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-timepp-${version}"; + pname = "gnome-shell-extension-timepp"; version = "unstable-2019-03-30"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix index 9a151a6ac8f7..f0f6279fe2ee 100644 --- a/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix +++ b/pkgs/desktops/gnome-3/extensions/topicons-plus/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib, gettext }: stdenv.mkDerivation rec { - name = "gnome-shell-extension-topicons-plus-${version}"; + pname = "gnome-shell-extension-topicons-plus"; version = "22"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix index 19ced0b5252c..072d31b84fed 100644 --- a/pkgs/desktops/gnome-3/extensions/volume-mixer.nix +++ b/pkgs/desktops/gnome-3/extensions/volume-mixer.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-volume-mixer-${version}"; + pname = "gnome-shell-volume-mixer"; version = "844ed80ad448855d8f6218847183a80474b523c7"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix index 10aee5cafe6e..811e9911f628 100644 --- a/pkgs/desktops/gnome-3/extensions/workspace-grid.nix +++ b/pkgs/desktops/gnome-3/extensions/workspace-grid.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, glib }: stdenv.mkDerivation rec { - name = "gnome-shell-workspace-grid-${version}"; + pname = "gnome-shell-workspace-grid"; version = "0f3a430e7d04bb5465a17c1225aab0f574426d6b"; src = fetchFromGitHub { diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 21f089b324ef..b4c6eaaec1bf 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -2,11 +2,11 @@ , librsvg, libgnome-games-support, gettext, itstool, libxml2, python3, vala }: stdenv.mkDerivation rec { - name = "five-or-more-${version}"; + pname = "five-or-more"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/five-or-more/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0v52i22ygv6y4zqs8nyb1qmacmj9whhqrw7qss6vn7by4nsikhrn"; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 94428d6640d0..5b233c48385d 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -3,11 +3,11 @@ , python3, ninja, desktop-file-utils }: stdenv.mkDerivation rec { - name = "four-in-a-row-${version}"; + pname = "four-in-a-row"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0h4wmbkdp7x3gp9sbxmvla316m8n6iy4f5sq0ksldj0z7ghlx9zl"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index c6c24be4be8c..d7001e1c5279 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -2,11 +2,11 @@ , gettext, itstool, libxml2, python3, gnome3, glib, gtk3, librsvg }: stdenv.mkDerivation rec { - name = "gnome-chess-${version}"; + pname = "gnome-chess"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-chess/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0hzb6s4wmfy1fysagc5hmn1ijvrwyd2cg7iz41mpn7gfdjyak639"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index ee55b5a65a5d..9d173945cdd8 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-mahjongg-${version}"; + pname = "gnome-mahjongg"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "12kamxnxbh26k4iykhbs873mx25a2wrjnhr013lfkwbyl52kg12j"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index b2c8e99e8239..1ac7e51357eb 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -2,11 +2,11 @@ , librsvg, gettext, itstool, python3, libxml2, libgnome-games-support, libgee, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gnome-mines-${version}"; + pname = "gnome-mines"; version = "3.32.2"; src = fetchurl { - url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-mines/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1nv966wkp2rqxzcdb76bwlbzpjqadcaqzrnkxpzwnvjjr167yx8g"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 3bea240ecb97..7b0699221696 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -3,11 +3,11 @@ , libxml2, libgee, libgnome-games-support }: stdenv.mkDerivation rec { - name = "gnome-nibbles-${version}"; + pname = "gnome-nibbles"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-nibbles/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0g627pzbfywiy2rsh4aidgbln9s4j5m8pryw4cgr5ygc4z8l6l9p"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index 2b40548d37ce..46723867f8ad 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -3,11 +3,11 @@ , libgee, meson, ninja, python3, desktop-file-utils , hicolor-icon-theme, adwaita-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-robots-${version}"; + pname = "gnome-robots"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-robots/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1xp1sijl5k7wmnbb0hdgh4ajxgp74k7fcnmd5c6rw6lf51wpinyh"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index 5c3fafd3d02a..a555ee31cf37 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -2,11 +2,11 @@ , libgee, json-glib, qqwing, itstool, libxml2, python3, desktop-file-utils }: stdenv.mkDerivation rec { - name = "gnome-sudoku-${version}"; + pname = "gnome-sudoku"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-sudoku/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1wwdjflw1lbx3cv6gvqcgp5jnjkrq37ld6mjbjj03g3vr90qaf0l"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 06914d9817c7..b6c60362265d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-taquin-${version}"; + pname = "gnome-taquin"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1kyxh68gg7clxg22ls4sliisxb2sydwccbxqgfvxjg2fklr6r1lm"; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index ab0f0f0faf2d..291415302116 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-tetravex-${version}"; + pname = "gnome-tetravex"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "18drxp43j2jnywxl6qa7mn1iv33jxr0dpc1l9xza3lnrb0jp0kjl"; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 86a1bd6485be..114551ed4ee1 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "iagno-${version}"; + pname = "iagno"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1rcqb4gpam16xw87n4q2akkrg94ksrn16ry21pr6bsd7qs7hw17d"; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 5801c2935632..9c582f037a25 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -3,11 +3,11 @@ , meson, ninja, python3 }: stdenv.mkDerivation rec { - name = "lightsoff-${version}"; + pname = "lightsoff"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/lightsoff/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0vc3ibjs9ynnm0gxlhhin7jpnsx22vnn4ygaybxwmv9w2q49cs9f"; }; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index f0da625316fa..f196ada38504 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "tali-${version}"; + pname = "tali"; version = "3.32.1"; src = fetchurl { - url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/tali/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0na7sswfh63wj44aibcnqdsbb24yfngcwgi07lv8rky6rry0kqgz"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index c80c8b977cf5..c8d26988391d 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gnome-autoar-${version}"; + pname = "gnome-autoar"; version = "0.2.3"; src = fetchurl { - url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-autoar/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02i4zgqqqj56h7bcys6dz7n78m4nj2x4dv1ggjmnrk98n06xpsax"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index d819961d2819..ea9a79de40e4 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -2,11 +2,11 @@ , gtk3, systemd, wrapGAppsHook, desktop-file-utils, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "gnome-packagekit-${version}"; + pname = "gnome-packagekit"; version = "3.32.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gnome-packagekit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08rhsisdvx7pnx3rrg5v7c09jbw4grglkdj979gwl4a31j24zjsd"; }; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index a35067587e04..d8a78686e491 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "3.32.0"; - name = "gpaste-${version}"; + pname = "gpaste"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { substituteInPlace src/gnome-shell/prefs.js \ --subst-var-by typelibPath "${placeholder "out"}/lib/girepository-1.0" substituteInPlace src/libgpaste/settings/gpaste-settings.c \ - --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${name}/glib-2.0/schemas" + --subst-var-by gschemasCompiled "${placeholder "out"}/share/gsettings-schemas/${pname}-${version}/glib-2.0/schemas" ''; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 543453a2bd31..a607a6eb6a07 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -2,11 +2,11 @@ , gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { - name = "gtkhtml-${version}"; + pname = "gtkhtml"; version = "4.10.0"; src = fetchurl { - url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "mirror://gnome/sources/gtkhtml/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "ca3b6424fb2c7ac5d9cb8fdafb69318fa2e825c9cf6ed17d1e38d9b29e5606c3"; }; diff --git a/pkgs/desktops/gnustep/make/default.nix b/pkgs/desktops/gnustep/make/default.nix index 6ef87cece4e4..5e7db35a7276 100644 --- a/pkgs/desktops/gnustep/make/default.nix +++ b/pkgs/desktops/gnustep/make/default.nix @@ -5,7 +5,8 @@ let in stdenv.mkDerivation rec { - name = "gnustep-make-${version}"; + pname = "gnustep-make"; + inherit version; src = fetchurl { url = "ftp://ftp.gnustep.org/pub/gnustep/core/gnustep-make-${version}.tar.gz"; diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix index 6e8644b19b0c..550e98c9dcc8 100644 --- a/pkgs/desktops/lxde/core/lxmenu-data.nix +++ b/pkgs/desktops/lxde/core/lxmenu-data.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "lxmenu-data-${version}"; + pname = "lxmenu-data"; version = "0.1.5"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8"; }; diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix index ca601531b68f..104ab20835fa 100644 --- a/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/pkgs/desktops/lxde/core/lxtask/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libintl }: stdenv.mkDerivation rec { - name = "lxtask-${version}"; + pname = "lxtask"; version = "0.1.9"; src = fetchurl { - url = "mirror://sourceforge/lxde/${name}.tar.xz"; + url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1"; }; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index c1b29b161254..df717debbae8 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,7 +1,6 @@ { lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }: mkDerivation rec { - name = "${pname}-${version}"; pname = "qlipper"; version = "5.1.1"; diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 5ef080ef50be..15dea9b10184 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "atril-${version}"; + pname = "atril"; version = "1.22.1"; src = fetchurl { - url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0i2wgsksgwhrmajj1lay3iym4dcyj8cdd813yh5mrfz4rkv49190"; }; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 108e8fe1e0b1..ba21cb00d35d 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "caja-extensions-${version}"; + pname = "caja-extensions"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1h866jmdd3qpjzi7wjj11krwiaadnlf21844g1zqfb4jgrzj773p"; }; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 8fad6cac8799..675648363f52 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "engrampa-${version}"; + pname = "engrampa"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06z38vfs15f5crrrgvcsqfb557fhpq1mqkj5fd9wb0hvi77hasrk"; }; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 72e509d59afd..cc683ab2db21 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "eom-${version}"; + pname = "eom"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "03lpxqvyaqhz4wmi07nxcyn5q73ym3dzm41cdid53f2dp9lk1mv4"; }; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index bd6488d2c2ce..d6709c375e6d 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: stdenv.mkDerivation rec { - name = "libmatekbd-${version}"; + pname = "libmatekbd"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"; }; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index bf2a91971dd9..17fee5d61cbe 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "libmatemixer-${version}"; + pname = "libmatemixer"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"; }; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 664b85fc287b..e4976f71ae68 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { - name = "libmateweather-${version}"; + pname = "libmateweather"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ribgcwl4ncfbcf9bkcbxrgc7yzajdnxg12837psngymkqswlp6a"; }; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 4f77b3035015..9899256018a8 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "marco-${version}"; + pname = "marco"; version = "1.22.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0sc7x14229yj22ka1vlzbaqndwcgh6idypjmm9rydkj4n968jwry"; }; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 7fbd192ac2ca..ec7ad2b4294d 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-applets-${version}"; + pname = "mate-applets"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "19sjm2180ir8a264rz8m528qaqjpl3q3cq095ab0sbkp2igksrfx"; }; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index f5c151d01f7f..2667c25959e6 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool }: stdenv.mkDerivation rec { - name = "mate-backgrounds-${version}"; + pname = "mate-backgrounds"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"; }; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 85631f03e1d4..64ede5101c75 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-calc-${version}"; + pname = "mate-calc"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zin3w03zrkpb12rvay23bfk9fnjpybkr5mqzkpn9xfnqamhk8ld"; }; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index 3b154fd9812a..f85dd632bd16 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mate-common-${version}"; + pname = "mate-common"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "11lwckndizawbq993ws8lqp59vsc873zri0m8s1i5zyc4qx9f69z"; }; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 6e54b137ba1d..a06c24b9c728 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mate-control-center-${version}"; + pname = "mate-control-center"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0w9w3wkxksbhzyd96y1x6yxb0q5lkp16y8i42564b6njvwqch5a0"; }; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 0bfcab586635..58515a492b5c 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-desktop-${version}"; + pname = "mate-desktop"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1hr4r69855csqrcaqpbcyplsy4cwjfz7gabps2pzkh5132jycfr0"; }; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index ba0cbd526f96..7db01f598164 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "mate-icon-theme-faenza-${version}"; + pname = "mate-icon-theme-faenza"; version = "1.20.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 8f0f15fac2dd..9df0d0ce5a88 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, hicolor-icon-theme, gtk3 }: stdenv.mkDerivation rec { - name = "mate-icon-theme-${version}"; + pname = "mate-icon-theme"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1pn1xbmr4w4mi45nwk1qh18z9rlngmkhp9bw671yn4k6sii8fi3k"; }; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 623e7f240964..e1a6e874d1d6 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-indicator-applet-${version}"; + pname = "mate-indicator-applet"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0zad81qvcin4m329hfxhv4a5j8gf4gj8944mvjrdgdh71bzan2x1"; }; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 7185181d7476..93c765a99533 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-media-${version}"; + pname = "mate-media"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "13g1n2ddgr1yxgl4fsqj3sgb9344b756kam9v3sq6vh0bxlr4yf2"; }; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index bb09b0a4849d..e37a270f9dca 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { - name = "mate-menus-${version}"; + pname = "mate-menus"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1lkakbf2f1815c146z4xp5f0h4lim6jzr02681wbvzalc6k97v5c"; }; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 049e0a4bb69a..51d23e475ff3 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-netbook-${version}"; + pname = "mate-netbook"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "00n162bskbvxhy4k2w14f9zwlsg3wgi43228ssx7sc2p95psmm64"; }; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 45d483503aa7..d53ae8efa356 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -2,11 +2,11 @@ libnotify, libwnck3, gtk3, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-notification-daemon-${version}"; + pname = "mate-notification-daemon"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06z3xczhz5diy4kk7b8lrzljrnql6fz0n1jyy916cf8pnnanpg0j"; }; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index bbb49c203472..39d2c1812cbc 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, gnome3, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-panel-${version}"; + pname = "mate-panel"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0pb9dpgsfjp6gsldg4ad2jz23xdvjfarmz4cjwkpakygkq5i6dma"; }; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index f5b6d62dd590..253472e3987e 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { - name = "mate-polkit-${version}"; + pname = "mate-polkit"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"; }; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 7f4d1c850151..6ba6ac205ce1 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-power-manager-${version}"; + pname = "mate-power-manager"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "06vs2w44l1s25j0mifkid02yncw0nvdxw8r4pp2jm18kxan4frms"; }; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index 53a89bec4c1e..d1c1e481d700 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-screensaver-${version}"; + pname = "mate-screensaver"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c4qq5szsbfrz8hgkmlby2k7f1qs8kgqf2shd63z0pc8p6f47vvc"; }; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index c5ad4628c54f..bd9ed9f6cbe7 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-sensors-applet-${version}"; + pname = "mate-sensors-applet"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3"; }; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 3448e8327f5b..b7735ec77fec 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "mate-session-manager-${version}"; + pname = "mate-session-manager"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1ix8picxgc28m5zd0ww3zvzw6rz38wvzsrbqw28hghrfg926h6ig"; }; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index 00d967a2d5cf..5ee995402ecd 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -4,11 +4,11 @@ wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-settings-daemon-${version}"; + pname = "mate-settings-daemon"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym"; }; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index f7cdf036cebf..6f5993cfc353 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-system-monitor-${version}"; + pname = "mate-system-monitor"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0yh1sh5snd7ivchh6l9rbn1s7ia4j5ihhzhqkyjnhr8ln59dvcbm"; }; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index 2339ad8fb1b3..7ec9944aa0e1 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, gnome3, gtk3, vte, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-terminal-${version}"; + pname = "mate-terminal"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn"; }; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index a4724049f7c1..9ed5515ea3e7 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -2,11 +2,11 @@ gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { - name = "mate-themes-${version}"; + pname = "mate-themes"; version = "3.22.20"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx"; }; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index eae425b18920..a9a0e1712312 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, intltool, itstool, libxml2, yelp }: stdenv.mkDerivation rec { - name = "mate-user-guide-${version}"; + pname = "mate-user-guide"; version = "1.22.2"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "01kcszsjiriqp4hf1k4fhazi2yfqlkn415sfgx0jw0p821bzqf2h"; }; diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index f152515d60e9..999bee2e5d10 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-user-share-${version}"; + pname = "mate-user-share"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; }; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 606a473cfaac..7775173611e2 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "mate-utils-${version}"; + pname = "mate-utils"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "0768y6x33ljc9dxjlfmvplsn4lrxj5xhjddbyab9h6pqav8527rg"; }; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 171d8971c4e8..cfbe33dd380d 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: stdenv.mkDerivation rec { - name = "pluma-${version}"; + pname = "pluma"; version = "1.22.1"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "14d5c5fg31d7br9h1y3gdcr53j4sxlgybf326jvdcw8mgy91k3dg"; }; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index c3b39e85925d..42a8e328a161 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }: stdenv.mkDerivation rec { - name = "python-caja-${version}"; + pname = "python-caja"; version = "1.22.0"; src = fetchurl { - url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + url = "http://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; sha256 = "1zwdjvxci72j0181nlfq6912lw3aq8j3746brlp7wlzn22qp7b0k"; }; diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index 8381796c4561..67a67dd4b3d2 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -150,6 +150,12 @@ stdenv.mkDerivation rec { "-Dudev_dir=${placeholder "out"}/lib/udev" ]; + NIX_CFLAGS_COMPILE = [ + # Default for release buildtype but passed manually because + # we're using plain + "-DG_DISABLE_CAST_CHECKS" + ]; + passthru = { updateScript = gnome3.updateScript { packageName = repoName; diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index d1bd9e957f71..07c6805c689a 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -86,7 +86,7 @@ let lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel nyanloutre ]; homepage = http://www.kde.org; } // (args.meta or {}); in diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 034b57ec06a3..4efd493a3dd7 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.15.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.4/ ) diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 150b97be50d7..01e740f74c4b 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, - knewstuff, libksysguard, qtwebkit + knewstuff, libksysguard }: mkDerivation { @@ -11,6 +11,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n lm_sensors qtwebkit + kdelibs4support ki18n lm_sensors ]; } diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix index 1cbfb87ea563..b4fd032cf1f7 100644 --- a/pkgs/desktops/plasma-5/kwallet-pam.nix +++ b/pkgs/desktops/plasma-5/kwallet-pam.nix @@ -1,9 +1,9 @@ -{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }: +{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, kwallet, }: mkDerivation { name = "kwallet-pam"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ pam socat libgcrypt qtbase ]; + buildInputs = [ pam socat libgcrypt qtbase kwallet ]; postPatch = '' sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|" ''; diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch index 51f15c87d274..9d405b3bbb86 100644 --- a/pkgs/desktops/plasma-5/kwin/xwayland.patch +++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch @@ -1,13 +1,13 @@ -Index: kwin-5.7.3/main_wayland.cpp +Index: kwin-5.15.5/xwl/xwayland.cpp =================================================================== ---- kwin-5.7.3.orig/main_wayland.cpp -+++ kwin-5.7.3/main_wayland.cpp -@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe +--- kwin-5.15.5.orig/xwl/xwayland.cpp ++++ kwin-5.15.5/xwl/xwayland.cpp +@@ -143,7 +143,7 @@ void Xwayland::init() - m_xwaylandProcess = new Process(kwinApp()); + m_xwaylandProcess = new Process(this); m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); - m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); + m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND)); - QProcessEnvironment env = m_environment; + QProcessEnvironment env = m_app->processStartupEnvironment(); env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); - m_xwaylandProcess->setProcessEnvironment(env); + env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM")); diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 0f9fe40d73c3..96d113e11fb6 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit, + kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine, qtx11extras }: @@ -15,7 +15,7 @@ mkDerivation { buildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebkit + qtwebengine ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 55a4518021ed..5c27eee5010e 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -2,12 +2,13 @@ diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake index 69d3070..52e9102 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake -@@ -1,4 +1,4 @@ +@@ -1,5 +1,5 @@ [General] type=image color=#1d99f3 --background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png -+background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/3200x2000.png + fontSize=10 +-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png ++background=${NIXPKGS_WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png diff --git a/startkde/CMakeLists.txt b/startkde/CMakeLists.txt index 6a1a212..f03fd34 100644 --- a/startkde/CMakeLists.txt diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index ac0a3494c226..21dd5c36d78f 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/bluedevil-5.15.5.tar.xz"; - sha256 = "7379230de96c5e6d4ea40f4dfa8732e20a6ee3bd291e6f119ccb57646c33fe1f"; - name = "bluedevil-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/bluedevil-5.16.4.tar.xz"; + sha256 = "36eaff3da49104fb4ca8de32c2cd42657af7cde94f54c95bacf5abd6c1d39521"; + name = "bluedevil-5.16.4.tar.xz"; }; }; breeze = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-5.15.5.tar.xz"; - sha256 = "a13de0472dacd5240c3d38d0841ea7b9098405cf1f8cff77504d1824d09dcac4"; - name = "breeze-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-5.16.4.tar.xz"; + sha256 = "84fea0c31a41521983698ad2aed603b5e2c6e4f6e8723e2c64c66c37eb2a5395"; + name = "breeze-5.16.4.tar.xz"; }; }; breeze-grub = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-grub-5.15.5.tar.xz"; - sha256 = "4a27689446d66b7de043321022093e8f457dd4d47c124186f233b0606ddcfd64"; - name = "breeze-grub-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-grub-5.16.4.tar.xz"; + sha256 = "c36b2183fff7d559ae944881443e0caa03c63bcc81af9f6b21b722109d2e34db"; + name = "breeze-grub-5.16.4.tar.xz"; }; }; breeze-gtk = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-gtk-5.15.5.tar.xz"; - sha256 = "d4e16ffbcbe74c48fda7c5bfd18c3f479f56d54b761d9b1d9678119479412ca8"; - name = "breeze-gtk-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-gtk-5.16.4.tar.xz"; + sha256 = "8c954a8754bc75b2d8edff70a7b322c559da6e23dc75e1ed616ac926fbe186eb"; + name = "breeze-gtk-5.16.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/breeze-plymouth-5.15.5.tar.xz"; - sha256 = "0a518d5a9e1bddeb3e1c7329966ce178a36ab0a0bd6dd28caf803fe8c1680de8"; - name = "breeze-plymouth-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/breeze-plymouth-5.16.4.tar.xz"; + sha256 = "7556c8f6bff771f3439036f843309b45594c5e903fc11a3275cc2c38346dec9f"; + name = "breeze-plymouth-5.16.4.tar.xz"; }; }; discover = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/discover-5.15.5.tar.xz"; - sha256 = "6f2bbaade87b959c8bd847e90ecec0c9aa8b4accee63318d25e5beb77deaf854"; - name = "discover-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/discover-5.16.4.tar.xz"; + sha256 = "0e07a49d3ee93434452d69330b11653546a2104601ec08518be111ba7967f1b0"; + name = "discover-5.16.4.tar.xz"; }; }; drkonqi = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/drkonqi-5.15.5.tar.xz"; - sha256 = "8669913aa8485257cbb19bbe5bb6956044d0a6896a365cea024b1247d0a6502e"; - name = "drkonqi-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/drkonqi-5.16.4.tar.xz"; + sha256 = "9d030a59a6d1d732241f8c54a54291ac60584d542ea0b891ca4b2bcb958bd51f"; + name = "drkonqi-5.16.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kactivitymanagerd-5.15.5.tar.xz"; - sha256 = "e38ec9074e0bc5c1a21bd5eee97b7d99e6528186918e832fecf1e3f95da239db"; - name = "kactivitymanagerd-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kactivitymanagerd-5.16.4.tar.xz"; + sha256 = "a287fc9624390c8493a35a5440e2161d1bb67252b6986231acb6268440bb4770"; + name = "kactivitymanagerd-5.16.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kde-cli-tools-5.15.5.tar.xz"; - sha256 = "fbff40188d7864a11aa6aea0b6d8cca2c66025924b3cb29275ac6d282ece9ace"; - name = "kde-cli-tools-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kde-cli-tools-5.16.4.tar.xz"; + sha256 = "56c7c2566217704a9d613757767c3b8ee8d1bc4601b9414a44acb50aaaaedc0d"; + name = "kde-cli-tools-5.16.4.tar.xz"; }; }; kdecoration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kdecoration-5.15.5.tar.xz"; - sha256 = "33d613b706b83c025675d7d2b20e074219c9a0953a500c306081c24fcf84d99f"; - name = "kdecoration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kdecoration-5.16.4.tar.xz"; + sha256 = "aa77507dcf357243cca9002764f8c8d1c8404d7e5b7249ad0d0f900f0a47ace4"; + name = "kdecoration-5.16.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kde-gtk-config-5.15.5.tar.xz"; - sha256 = "958163b1134b7c9e9735b5b6a4448973f09dbf43991511f768b29bd038baa185"; - name = "kde-gtk-config-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kde-gtk-config-5.16.4.tar.xz"; + sha256 = "c271b1caebac0837483af7ae11d2e4786a7770ff85753f1a3da4c8d28681111c"; + name = "kde-gtk-config-5.16.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kdeplasma-addons-5.15.5.tar.xz"; - sha256 = "1e11158f636e1d4bb25bbe4bb2f2fca37728c6aae07340ca6c2c1ec9e882ece3"; - name = "kdeplasma-addons-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kdeplasma-addons-5.16.4.tar.xz"; + sha256 = "4c0884dcb8413fa836d7e390b1c12fc71127c0e5e6fa278a338c253d1539f4a1"; + name = "kdeplasma-addons-5.16.4.tar.xz"; }; }; kgamma5 = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kgamma5-5.15.5.tar.xz"; - sha256 = "5e5d2dd439d4fd298eb0283fd9f2bad009c5efe22f72aea795138d22adfdc1e7"; - name = "kgamma5-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kgamma5-5.16.4.tar.xz"; + sha256 = "18c01c6a9d73f2450da24ac7a52c00b9d355a1ba41bd346eb71fbe271de85f46"; + name = "kgamma5-5.16.4.tar.xz"; }; }; khotkeys = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/khotkeys-5.15.5.tar.xz"; - sha256 = "59dd6a571d52401b1963cde732b6c6c589a328438155ec0e0c5c77b5ac029127"; - name = "khotkeys-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/khotkeys-5.16.4.tar.xz"; + sha256 = "a8646ab20cd067a515d4a9318c814760be0030f27856f155edf11920caeddd0d"; + name = "khotkeys-5.16.4.tar.xz"; }; }; kinfocenter = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kinfocenter-5.15.5.tar.xz"; - sha256 = "0119da58b2274bab76ef27d37032b5b104bad162675bfbee631286186d2e17a8"; - name = "kinfocenter-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kinfocenter-5.16.4.tar.xz"; + sha256 = "30e4df2d641c4faa385a718c772d893900eca99591ffee5787d6563fe5130426"; + name = "kinfocenter-5.16.4.tar.xz"; }; }; kmenuedit = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kmenuedit-5.15.5.tar.xz"; - sha256 = "ad407757e93928dc506271998881a2e5f4a4c96bf763c25e80347e3e23361c26"; - name = "kmenuedit-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kmenuedit-5.16.4.tar.xz"; + sha256 = "f749ca062d9c7bfd2033c4016e8a3dcc9f849f83f941dd9a60fd5b0232d023a2"; + name = "kmenuedit-5.16.4.tar.xz"; }; }; kscreen = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kscreen-5.15.5.tar.xz"; - sha256 = "c0c47c6d5c618e2c40794dd37586a1733ef6939383b4bb760638e8758a0bd6f7"; - name = "kscreen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kscreen-5.16.4.tar.xz"; + sha256 = "40c29ad2236459a267eed3cad4a6fc64b5e3f12df8567fcf8869ba770c2e2328"; + name = "kscreen-5.16.4.tar.xz"; }; }; kscreenlocker = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kscreenlocker-5.15.5.tar.xz"; - sha256 = "09d9d63e81a60d1c95532639287ba29403e0b04d7e4d46f5a49adbfccf215dcd"; - name = "kscreenlocker-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kscreenlocker-5.16.4.tar.xz"; + sha256 = "92a858f1f4bd6f209f328ca6456dfadc6b542e2a1e3d04ecdcc70f70c1cc2f6f"; + name = "kscreenlocker-5.16.4.tar.xz"; }; }; ksshaskpass = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/ksshaskpass-5.15.5.tar.xz"; - sha256 = "4b6eae3b594480f6265843fa0b2f3d2051fd45894d27eee3681b7b33c4f52e7e"; - name = "ksshaskpass-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/ksshaskpass-5.16.4.tar.xz"; + sha256 = "e3ff91e5c160b8e83b48215fca5d70f4baeef95b6c3b32e8cfc749183b0ec97c"; + name = "ksshaskpass-5.16.4.tar.xz"; }; }; ksysguard = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/ksysguard-5.15.5.tar.xz"; - sha256 = "c767cfff83cb8d6d99a6ba13fa534656d6d31666a3eaa7cdce677535e9f9624a"; - name = "ksysguard-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/ksysguard-5.16.4.tar.xz"; + sha256 = "10abf3bfa676275b6fded5e49979466a011e0552b9357c1b8923f01184c029d5"; + name = "ksysguard-5.16.4.tar.xz"; }; }; kwallet-pam = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwallet-pam-5.15.5.tar.xz"; - sha256 = "36f3e50019dcd9919755d47b62abf99412299aa87ee27fecbf1dca212a94d22e"; - name = "kwallet-pam-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwallet-pam-5.16.4.tar.xz"; + sha256 = "7332dd9729c55f4b24260b3ec1266f72284f834eed66ce76badd4ac5af3dd429"; + name = "kwallet-pam-5.16.4.tar.xz"; }; }; kwayland-integration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwayland-integration-5.15.5.tar.xz"; - sha256 = "8dec5719104a551fc8c1d6249568accedce9b8d18691d818f2b7abc13f21fd17"; - name = "kwayland-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwayland-integration-5.16.4.tar.xz"; + sha256 = "f15ae33af1d9ff999ec45d00752f202242f71fc022ae72b9522e5bf3a20edace"; + name = "kwayland-integration-5.16.4.tar.xz"; }; }; kwin = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwin-5.15.5.tar.xz"; - sha256 = "e341c8165354643fd201292e53418050970bf8819b2cd0dd932423a342d2f805"; - name = "kwin-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwin-5.16.4.tar.xz"; + sha256 = "71b96f1efef0b3f4974900373285a08d425a63628404fe9e89c27f61119383e6"; + name = "kwin-5.16.4.tar.xz"; }; }; kwrited = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/kwrited-5.15.5.tar.xz"; - sha256 = "fbc27517898e57aa6b4c476673971f310121ac3d61e1d30a23e9289930056510"; - name = "kwrited-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/kwrited-5.16.4.tar.xz"; + sha256 = "c3011ee1c7a431b25797e12fa0b16e6d92277c8fe5dc1e656121a135ad156c0f"; + name = "kwrited-5.16.4.tar.xz"; }; }; libkscreen = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/libkscreen-5.15.5.tar.xz"; - sha256 = "bee15b0ce38e17475542b0e500a82567fdbe0a635e84a543b2f3255ac8c58d87"; - name = "libkscreen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/libkscreen-5.16.4.tar.xz"; + sha256 = "f20f33a2f32b3db39e94ca9d10e240591650357d03c1a2f8eb6c5faa4d1bf723"; + name = "libkscreen-5.16.4.tar.xz"; }; }; libksysguard = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/libksysguard-5.15.5.tar.xz"; - sha256 = "4255a997c4f0b2039201db6e00038e08519c5fde73032ba709ae9bcfaceabfd0"; - name = "libksysguard-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/libksysguard-5.16.4.tar.xz"; + sha256 = "b9a8166bf808a54dd80eb8f760047c63989f1f10a9a7f649c8298c9a5031368f"; + name = "libksysguard-5.16.4.tar.xz"; }; }; milou = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/milou-5.15.5.tar.xz"; - sha256 = "2740cbfae30483c402471349f4d1315b98edf054827ec70980bb966cd6b3fcf9"; - name = "milou-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/milou-5.16.4.tar.xz"; + sha256 = "de9addbc504135839b1735742938d340cb191827606aa390f4b6ce1625c1ed89"; + name = "milou-5.16.4.tar.xz"; }; }; oxygen = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/oxygen-5.15.5.tar.xz"; - sha256 = "0791314c8894331bfa46d8b8aa30805972d09497a9e4bbe3f82270d4455be62c"; - name = "oxygen-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/oxygen-5.16.4.tar.xz"; + sha256 = "7ba8a18a0b44d2bf48c96679328f698a9bfd4d041724b960095fed67f228f2e1"; + name = "oxygen-5.16.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-browser-integration-5.15.5.tar.xz"; - sha256 = "f1883b504cb5e86a43e16fea803b93c81b09e4ce1339ae8bcf6cf35d7e734d3b"; - name = "plasma-browser-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-browser-integration-5.16.4.tar.xz"; + sha256 = "a097b90dd47cdd01f6b7207cb9439c7f6e0ce68555272172f8b3b8e2086199ef"; + name = "plasma-browser-integration-5.16.4.tar.xz"; }; }; plasma-desktop = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-desktop-5.15.5.tar.xz"; - sha256 = "42097c0b2553dd4767b6fde441db371d5e2defbd4e82389ca91d076f62ae3741"; - name = "plasma-desktop-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-desktop-5.16.4.tar.xz"; + sha256 = "990e93eed2753053ac732ce5d1d45e7c9a52daa660b41b0d48955428e4834344"; + name = "plasma-desktop-5.16.4.tar.xz"; }; }; plasma-integration = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-integration-5.15.5.tar.xz"; - sha256 = "05920610c68981a9effb1a97395a22d281d3b61e42d55d66adf8bb587da29621"; - name = "plasma-integration-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-integration-5.16.4.tar.xz"; + sha256 = "d4c5022ea91f9727cfebab821cb6b8e7b52671a6508cd7450e05bf51e248452d"; + name = "plasma-integration-5.16.4.tar.xz"; }; }; plasma-nm = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-nm-5.15.5.tar.xz"; - sha256 = "6a2cde83ff031de3565465d48538578380301debb8e49345e25ff3f723c908ee"; - name = "plasma-nm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-nm-5.16.4.tar.xz"; + sha256 = "2da834873d4fa471ad87ee8ce18a871dfb2acdf0bdc0b764789e8e26ebc2ca09"; + name = "plasma-nm-5.16.4.tar.xz"; }; }; plasma-pa = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-pa-5.15.5.tar.xz"; - sha256 = "326a6d3f6f9d462a3b88402ae6be2dac976f166995a5cb750d294d51085a0a92"; - name = "plasma-pa-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-pa-5.16.4.tar.xz"; + sha256 = "9b166e11f7115576181c17f0ced51b9a7ec689334d4b15ebb55d4e6e7ff6cbd4"; + name = "plasma-pa-5.16.4.tar.xz"; }; }; plasma-sdk = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-sdk-5.15.5.tar.xz"; - sha256 = "f91ccb03f016328c2bd54ac11a916b4f874cfe2304da1600f3fa014faeb7d329"; - name = "plasma-sdk-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-sdk-5.16.4.tar.xz"; + sha256 = "ce8152ad6044e2cf430834bf97bb4542e69e168a4b7350e313d148a9bd3b9403"; + name = "plasma-sdk-5.16.4.tar.xz"; }; }; plasma-tests = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-tests-5.15.5.tar.xz"; - sha256 = "534c018f45f8545f027aeccea8731a26311179328e7a746522fa11961c5c5827"; - name = "plasma-tests-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-tests-5.16.4.tar.xz"; + sha256 = "9e0f8fcef080fc1b0ffae01f6b3caa17eccac27445e312243221fcace56d1097"; + name = "plasma-tests-5.16.4.tar.xz"; }; }; plasma-vault = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-vault-5.15.5.tar.xz"; - sha256 = "2d7c356fa951b341fcb5ea48ed819f396fe9096e06e6f2026c9f59a59fa48fd5"; - name = "plasma-vault-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-vault-5.16.4.tar.xz"; + sha256 = "8d01b80079477fd7ea48a4cc3ff59728ae7dac3a5f6e552092dd5e67d72148f6"; + name = "plasma-vault-5.16.4.tar.xz"; }; }; plasma-workspace = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-5.15.5.tar.xz"; - sha256 = "c25f9b348e3ab2d370325f7da989a3f599a408dabfadda65cbb590fb26a2f973"; - name = "plasma-workspace-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-5.16.4.tar.xz"; + sha256 = "5cd9366ef3d0b68159d9dee2f14886d1f81d1ccf7aedceed1ae5cf8e32d243f1"; + name = "plasma-workspace-5.16.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plasma-workspace-wallpapers-5.15.5.tar.xz"; - sha256 = "0dc21728f3a08d823106bae7dd99d9b6b28b9b77abe8cf8f213bd4cf5b66b945"; - name = "plasma-workspace-wallpapers-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plasma-workspace-wallpapers-5.16.4.tar.xz"; + sha256 = "052f6d978b1230706821f67574a7d053fadfb25de65227ffc8389a8570ac6003"; + name = "plasma-workspace-wallpapers-5.16.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/plymouth-kcm-5.15.5.tar.xz"; - sha256 = "9454cff23e7acae549bdd61818cb351332b334f9cf0b7a7eb065d6dd784950aa"; - name = "plymouth-kcm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/plymouth-kcm-5.16.4.tar.xz"; + sha256 = "cf9d3e6f14d012617cc8a5c3381295449e68b1b13209436b561417232d21863f"; + name = "plymouth-kcm-5.16.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.15.5"; + version = "1-5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/polkit-kde-agent-1-5.15.5.tar.xz"; - sha256 = "628ce9a02defa31e98a6a373abb6a1f2bf39f065eaf82fdbb4f93bf07165e267"; - name = "polkit-kde-agent-1-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/polkit-kde-agent-1-5.16.4.tar.xz"; + sha256 = "917b31f194fcf5d56d465bd4a3a1cc8d0a30e302be63b9048b1b85b6746b46a0"; + name = "polkit-kde-agent-1-5.16.4.tar.xz"; }; }; powerdevil = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/powerdevil-5.15.5.tar.xz"; - sha256 = "c435cdcab2ff367ca86f91a45ac43fa9f9b68251e8e444b285b7edd33482ad06"; - name = "powerdevil-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/powerdevil-5.16.4.tar.xz"; + sha256 = "40885869890366f7ea92946ed0f8d251546fb14228eddd2ad128e3be8f88d2ed"; + name = "powerdevil-5.16.4.tar.xz"; }; }; sddm-kcm = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/sddm-kcm-5.15.5.tar.xz"; - sha256 = "4d5ee74e494f78a90d1586862749d53f4dc34970f47307d62a4e6ead9161c25b"; - name = "sddm-kcm-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/sddm-kcm-5.16.4.tar.xz"; + sha256 = "340034c5475d751c19c96a75445fa50877fad1c4de3422bc02f4b95e8f14bd68"; + name = "sddm-kcm-5.16.4.tar.xz"; }; }; systemsettings = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/systemsettings-5.15.5.tar.xz"; - sha256 = "a29227329f8ddd2db2ba8aafb3eb5f2b09d01e3a6f761d291afba95935ceb93a"; - name = "systemsettings-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/systemsettings-5.16.4.tar.xz"; + sha256 = "73b78c3c5177aa3ba0ffe970a83cb8bea1ba8ac54420a6c8379d6e86cabda31e"; + name = "systemsettings-5.16.4.tar.xz"; }; }; user-manager = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/user-manager-5.15.5.tar.xz"; - sha256 = "09e746e14bc732e296e93290929dfd1d378abe0b6b47fce084c97dd82a3f2431"; - name = "user-manager-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/user-manager-5.16.4.tar.xz"; + sha256 = "3dd29a6abf8c15014ed87a448b13190516e16d8dc3a67d56f05f62d1f2e1b745"; + name = "user-manager-5.16.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.15.5"; + version = "5.16.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.15.5/xdg-desktop-portal-kde-5.15.5.tar.xz"; - sha256 = "fd98af5fe77e5a387bee25bcbdfa39607d1b91ba1cd431ae72cff8103548ac50"; - name = "xdg-desktop-portal-kde-5.15.5.tar.xz"; + url = "${mirror}/stable/plasma/5.16.4/xdg-desktop-portal-kde-5.16.4.tar.xz"; + sha256 = "3b8aa78451cfc97ef316f1632f6a255ccebbe383ec8389ffc74d44540fc05052"; + name = "xdg-desktop-portal-kde-5.16.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 79f0800ff34c..2782decf6c4c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -3,12 +3,11 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "xfce4-hardware-monitor-plugin"; version = "1.6.0"; src = fetchurl { - url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; + url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${pname}-${version}.tar.bz2"; sha256 = "0xg5har11fk1wmdymydxlbk1z8aa39j8k0p4gzw2iqslv3n0zf7b"; }; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix index 7134d29c9ffb..f67ba7af8aa9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/appmenu-gtk-module.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, vala, glib, gtk2, gtk3 }: stdenv.mkDerivation rec { - name = "vala-panel-appmenu-xfce-${version}"; + pname = "vala-panel-appmenu-xfce"; version = "0.6.94"; src = "${fetchFromGitHub { diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index 694f6772282b..144291da86d7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -3,7 +3,7 @@ xfce, libwnck3, libdbusmenu, gobject-introspection }: stdenv.mkDerivation rec { - name = "xfce4-vala-panel-appmenu-plugin-${version}"; + pname = "xfce4-vala-panel-appmenu-plugin"; version = "0.6.94"; src = fetchFromGitHub { |