diff options
Diffstat (limited to 'pkgs/desktops')
21 files changed, 283 insertions, 310 deletions
diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index b285498be9dc..2129005ab01e 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -2,9 +2,6 @@ rec { #### CORE EFL efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; }; - evas = callPackage ./evas.nix { }; - emotion = callPackage ./emotion.nix { }; - elementary = callPackage ./elementary.nix { }; #### WINDOW MANAGER enlightenment = callPackage ./enlightenment.nix { }; diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index 9cde3cf45943..60e63dc68ed9 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,14 +1,20 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary, python2Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: + stdenv.mkDerivation rec { name = "econnman-${version}"; version = "1.1"; + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/econnman/${name}.tar.gz"; sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - buildInputs = [ makeWrapper pkgconfig efl python2Packages.python python2Packages.wrapPython dbus ]; - pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python elementary ]; + nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; + + buildInputs = [ efl python2Packages.python dbus ]; + + pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; + postInstall = '' wrapPythonPrograms ''; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 218de3bfa7cd..b8b3d82ccb60 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }: - +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp, curl, libinput, systemd }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.17.2"; + version = "1.18.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "1dpq5flygrjg931nzsr2ra8icqffzrzbs1lnrzarbpsbmgq3zacs"; + sha256 = "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl zlib freetype fontconfig fribidi SDL2 SDL mesa - giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base + buildInputs = [ openssl zlib lz4 freetype fontconfig fribidi SDL2 SDL mesa + giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev utillinux systemd ]; @@ -21,22 +20,19 @@ stdenv.mkDerivation rec { xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext bullet xorg.libXScrnSaver xorg.libXrender xorg.libXfixes xorg.libXrandr xorg.libxkbfile xorg.libxcb xorg.xcbutilkeysyms openjpeg doxygen expat luajit - harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib libwebp curl libdrm + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler ghostscript libraw libspectre xineLib libwebp curl libdrm libinput ]; # ac_ct_CXX must be set to random value, because then it skips some magic which does alternative searching for g++ - configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" - "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" + configureFlags = [ "--enable-sdl" "--enable-drm" "--enable-elput" "--with-opengl=full" + "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-liblz4" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "ac_ct_CXX=foo" ]; - NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; - patches = [ ./efl-elua.patch ]; preConfigure = '' - export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH" export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH" ''; @@ -50,7 +46,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "Enlightenment Core libraries"; + description = "Enlightenment foundation libraries"; homepage = http://enlightenment.org/; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/enlightenment/elementary.nix b/pkgs/desktops/enlightenment/elementary.nix deleted file mode 100644 index 10334eb98e96..000000000000 --- a/pkgs/desktops/enlightenment/elementary.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, efl, libcap, automake, autoconf, libdrm, gdbm }: -stdenv.mkDerivation rec { - name = "elementary-${version}"; - version = "1.17.1"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz"; - sha256 = "149xjq4z71l44w1kd8zks9b2g0wjc9656w46hzd27b58afj1dqc5"; - }; - nativeBuildInputs = [ pkgconfig automake autoconf ]; - buildInputs = [ efl libdrm gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ "-I${libdrm.dev}/include/libdrm" ]; - patches = [ ./elementary.patch ]; - enableParallelBuilding = true; - meta = { - description = "Widget set/toolkit"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.lgpl2; - }; -} diff --git a/pkgs/desktops/enlightenment/emotion.nix b/pkgs/desktops/enlightenment/emotion.nix deleted file mode 100644 index 39b3b1620751..000000000000 --- a/pkgs/desktops/enlightenment/emotion.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, efl, vlc }: -stdenv.mkDerivation rec { - name = "emotion_generic_players-${version}"; - version = "1.17.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz"; - sha256 = "03kaql95mk0c5j50v3c5i5lmlr3gz7xlh8p8q87xz8zf9j5h1pp7"; - }; - buildInputs = [ pkgconfig efl vlc ]; - NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" ]; - meta = { - description = "Extra video decoders"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index f490e030c657..f4ff94ad088e 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,23 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, -libffi, pam, alsaLib, luajit, bzip2, libuuid, libpthreadstubs, gdbm, libcap, mesa_glu -, xkeyboard_config }: +{ stdenv, fetchurl, pkgconfig, efl, xcbutilkeysyms, libXrandr, libXdmcp, +libxcb, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, +mesa_glu , xkeyboard_config }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.21.1"; + version = "0.21.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "119sxrgrz163c01yx0q9n2jpmmbv0a58akmz0c2z4xy37f1m02rx"; + sha256 = "0fi5dxrprnvhnn2y51gnfpsjj44snriqi20k20a73vhaqxfn8xx8"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ efl elementary libXdmcp libxcb - xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libuuid + buildInputs = [ efl libXdmcp libxcb + xcbutilkeysyms libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; - NIX_CFLAGS_COMPILE = [ "-I${efl}/include/eo-1" "-I${efl}/include/emile-1" "-I${libuuid}/include/uuid" ]; + NIX_CFLAGS_COMPILE = [ + "-I${efl}/include/ecore-imf-1" + "-I${efl}/include/emile-1" + "-I${efl}/include/eo-1" + "-I${efl}/include/ethumb-1" + "-I${efl}/include/ethumb-client-1" + ]; preConfigure = '' export USER_SESSION_DIR=$prefix/lib/systemd/user diff --git a/pkgs/desktops/enlightenment/evas.nix b/pkgs/desktops/enlightenment/evas.nix deleted file mode 100644 index fe8897b8be7a..000000000000 --- a/pkgs/desktops/enlightenment/evas.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, efl, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: -stdenv.mkDerivation rec { - name = "evas_generic_loaders-${version}"; - version = "1.17.0"; - src = fetchurl { - url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz"; - sha256 = "0ynq1nx0bfgg19p4vki1fap36yyip53zaxpzncx2slr6jcx1kxf2"; - }; - buildInputs = [ pkgconfig efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; - meta = { - description = "Extra image decoders"; - homepage = http://enlightenment.org/; - maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ftrvxmtrx ]; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - }; -} diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage.nix index 67f9c68cd613..9ef557654dc7 100644 --- a/pkgs/desktops/enlightenment/rage.nix +++ b/pkgs/desktops/enlightenment/rage.nix @@ -1,15 +1,36 @@ -{ stdenv, fetchurl, elementary, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 +{ stdenv, fetchurl, efl, automake, autoconf, libtool, pkgconfig, gst_all_1 , makeWrapper, lib }: + stdenv.mkDerivation rec { name = "rage-${version}"; - version = "0.1.4"; + version = "0.2.0"; + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; - sha256 = "10j3n8crk16jzqz2hn5djx6vms5f6x83qyiaphhqx94h9dgv2mgg"; + sha256 = "06fxhznwbd5x341r8ml3cpwmvwn0aq9i1akcgclk4vjdqiyff1d9"; }; + + nativeBuildInputs = [ + automake autoconf libtool pkgconfig makeWrapper + ]; + + NIX_CFLAGS_COMPILE = [ + "-I${efl}/include/ecore-con-1" + "-I${efl}/include/ecore-evas-1" + "-I${efl}/include/ecore-file-1" + "-I${efl}/include/ecore-imf-1" + "-I${efl}/include/ecore-input-1" + "-I${efl}/include/eet-1" + "-I${efl}/include/efreet-1" + "-I${efl}/include/eldbus-1" + "-I${efl}/include/emile-1" + "-I${efl}/include/eo-1" + "-I${efl}/include/ethumb-1" + "-I${efl}/include/ethumb-client-1" + ]; + buildInputs = [ - elementary efl automake autoconf libtool pkgconfig - makeWrapper + efl gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good @@ -25,6 +46,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/rage \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" ''; + meta = { description = "Video + Audio player along the lines of mplayer"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology.nix index a302b7d5f612..34506c05fabe 100644 --- a/pkgs/desktops/enlightenment/terminology.nix +++ b/pkgs/desktops/enlightenment/terminology.nix @@ -1,12 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, efl, elementary }: +{ stdenv, fetchurl, pkgconfig, efl }: + stdenv.mkDerivation rec { name = "terminology-${version}"; version = "0.9.1"; + src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz"; sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc"; }; - buildInputs = [ pkgconfig efl elementary ]; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ efl ]; + + NIX_CFLAGS_COMPILE = [ + "-I${efl}/include/ecore-con-1" + "-I${efl}/include/eldbus-1" + "-I${efl}/include/elocation-1" + "-I${efl}/include/emile-1" + "-I${efl}/include/eo-1" + "-I${efl}/include/ethumb-1" + ]; + meta = { description = "The best terminal emulator written with the EFL"; homepage = http://enlightenment.org/; diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix index 1aaf23319c4d..f3995e6bc2c6 100644 --- a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "eog-3.20.3"; + name = "eog-3.20.4"; src = fetchurl { url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz; - sha256 = "16308c389deced3acb801dcc180c5e5e18b1db6ba5bd5835b5320cba9b0d2c26"; + sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n"; }; } diff --git a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix index 13464137bd8b..4ee79bbc3dc5 100644 --- a/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/yelp/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib -, file, librsvg, gnome3, gdk_pixbuf, sqlite +, file, librsvg, gnome3, gdk_pixbuf, sqlite, groff , bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1 , wrapGAppsHook }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl - librsvg gdk_pixbuf gnome3.defaultIconTheme + librsvg gdk_pixbuf gnome3.defaultIconTheme groff gnome3.gsettings_desktop_schemas wrapGAppsHook gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 47109aaeac24..3166b94adaa7 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -47,6 +47,7 @@ let kcolorchooser = callPackage ./kcolorchooser.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; + kdf = callPackage ./kdf.nix {}; kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; }; khelpcenter = callPackage ./khelpcenter.nix {}; kio-extras = callPackage ./kio-extras.nix {}; diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh new file mode 100644 index 000000000000..b3c71c44fcf8 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix index 4ddc25ba6443..b93aea764a35 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix @@ -36,8 +36,6 @@ kdeApp { "-DKDE_DEFAULT_HOME=.kde" ]; - setupHook = ./setup-hook.sh; - meta = { platforms = lib.platforms.linux; homepage = "http://www.kde.org"; diff --git a/pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh deleted file mode 100644 index e0a75dc8acd0..000000000000 --- a/pkgs/desktops/kde-5/applications/kdelibs/setup-hook.sh +++ /dev/null @@ -1,10 +0,0 @@ -addQt4Plugins() { - if [[ -d "$1/lib/qt4/plugins" ]]; then - propagatedUserEnvPkgs+=" $1" - fi - - if [[ -d "$1/lib/kde4/plugins" ]]; then - propagatedUserEnvPkgs+=" $1" - fi -} -envHooks+=(addQt4Plugins) diff --git a/pkgs/desktops/kde-5/applications/kdf.nix b/pkgs/desktops/kde-5/applications/kdf.nix new file mode 100644 index 000000000000..835f0344da74 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/kdf.nix @@ -0,0 +1,21 @@ +{ + kdeApp, lib, kdeWrapper, + ecm, kdoctools, + kcmutils +}: + +let + unwrapped = + kdeApp { + name = "kdf"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.peterhoeg ]; + }; + nativeBuildInputs = [ ecm kdoctools ]; + propagatedBuildInputs = [ + kcmutils + ]; + }; +in +kdeWrapper unwrapped { targets = [ "bin/kdf" ]; } diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 4b502a3119bf..2e090255e594 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -77,7 +77,6 @@ let oxygen = callPackage ./oxygen.nix {}; plasma-desktop = callPackage ./plasma-desktop {}; plasma-integration = callPackage ./plasma-integration.nix {}; - plasma-mediacenter = callPackage ./plasma-mediacenter.nix {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix {}; plasma-workspace = callPackage ./plasma-workspace {}; diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh new file mode 100644 index 000000000000..518c2e63163b --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.kde.org/stable/plasma/5.7.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix deleted file mode 100644 index 1967a0b8a4e0..000000000000 --- a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ plasmaPackage, ecm, baloo, kactivities, kconfig -, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice -, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia -, taglib -}: - -plasmaPackage rec { - name = "plasma-mediacenter"; - nativeBuildInputs = [ - ecm - ]; - propagatedBuildInputs = [ - baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework - kconfig kcoreaddons kguiaddons kservice qtdeclarative qtmultimedia taglib - ]; -} diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 2e401796cf41..2531dc66f6cb 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -1,325 +1,317 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { bluedevil = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/bluedevil-5.7.3.tar.xz"; - sha256 = "0485lm4d18qv1w0qgb46g318xbb3cd6d5j42j0s95snrg7rlp717"; - name = "bluedevil-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/bluedevil-5.7.4.tar.xz"; + sha256 = "0f6hdl5z9nfakhgsh9lgf1j63wnrw28wdqibahra6n97z5q6ymn9"; + name = "bluedevil-5.7.4.tar.xz"; }; }; breeze = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/breeze-5.7.3.tar.xz"; - sha256 = "1wyj13sw4xrpb155p00wpn2hvvkpjrpf14b15sk3dpbhlzc8m77p"; - name = "breeze-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/breeze-5.7.4.tar.xz"; + sha256 = "0sjcbn87zk1xnkw19byhqwkldz9j1j10421akc77cwla0qmz1586"; + name = "breeze-5.7.4.tar.xz"; }; }; breeze-grub = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/breeze-grub-5.7.3.tar.xz"; - sha256 = "0xlxpg1z67mjn3mf698b2jrls7fyb19i3carmr56c0f45r628lpf"; - name = "breeze-grub-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/breeze-grub-5.7.4.tar.xz"; + sha256 = "0gixa1myhim3g06jpvbp5ygkmg1pq8bncigc9njc2fxxy8naj8jf"; + name = "breeze-grub-5.7.4.tar.xz"; }; }; breeze-gtk = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/breeze-gtk-5.7.3.tar.xz"; - sha256 = "0bw9hj0ca99kfvfw621l19wm9x81p8pyc19yrlhbr527mhw65i65"; - name = "breeze-gtk-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/breeze-gtk-5.7.4.tar.xz"; + sha256 = "0igrr82cprk69g19h2lgv265780jbjlgbj1rh1j6hpfccwrwhg0x"; + name = "breeze-gtk-5.7.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/breeze-plymouth-5.7.3.tar.xz"; - sha256 = "0hiscvdqrnig594w9b0b69wzbqgcrc56p9r0z52pj2zw4df5m3za"; - name = "breeze-plymouth-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/breeze-plymouth-5.7.4.tar.xz"; + sha256 = "02qn0fvkcq4gd170pakm0ypfmwj51wjascdhylvn9aclmac3j7zk"; + name = "breeze-plymouth-5.7.4.tar.xz"; }; }; discover = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/discover-5.7.3.tar.xz"; - sha256 = "1ylq2mfzqjibfx7g6xd1b83sg9a8s60jjnxzgf808kxqzrb7b6bg"; - name = "discover-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/discover-5.7.4.tar.xz"; + sha256 = "00w4n7c7k0lmjkqa6554sg0fh91n8aj01srcq6dz5h5fx1n858wz"; + name = "discover-5.7.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kactivitymanagerd-5.7.3.tar.xz"; - sha256 = "0ajm5d15qglb7k8js7626mcxi19g0vsgvs7y3ggqngvklpnpgqr0"; - name = "kactivitymanagerd-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kactivitymanagerd-5.7.4.tar.xz"; + sha256 = "10v4w8cadrhnc7xpy8j0s1fi10gmcv1vvisi6lc8vqzdil2hk89b"; + name = "kactivitymanagerd-5.7.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kde-cli-tools-5.7.3.tar.xz"; - sha256 = "1pg6zabll61q8krw3h5i8z0bj6zxm7g21dza5jgvb0vbirr4zgz6"; - name = "kde-cli-tools-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kde-cli-tools-5.7.4.tar.xz"; + sha256 = "0q2dz8qx2zqsc7d185zvmv1x5wz1mvkb8zs6i2454l2l1jy6934p"; + name = "kde-cli-tools-5.7.4.tar.xz"; }; }; kdecoration = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kdecoration-5.7.3.tar.xz"; - sha256 = "1k20x7ndp8rv8ihphkz68g4m7r73gvswcnxi1ahipqnw5mnywl9c"; - name = "kdecoration-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kdecoration-5.7.4.tar.xz"; + sha256 = "160cb3ra9vgxydrgskvsacm50jhwnb0caqmfaj387gcpykxxayl1"; + name = "kdecoration-5.7.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kde-gtk-config-5.7.3.tar.xz"; - sha256 = "0ynpk4p4yx2wy0jm1bk9v8rk27w5fb1ra1d2w6gfz33ijp7iah92"; - name = "kde-gtk-config-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kde-gtk-config-5.7.4.tar.xz"; + sha256 = "0l69d6rj0r9mga2p6rf9vwsalcir140xb3szy2nhdrgqmrka3mbl"; + name = "kde-gtk-config-5.7.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kdeplasma-addons-5.7.3.tar.xz"; - sha256 = "0jdc2avjjy0p4rib7k7wd3ns02pyi57dyfqgja606gbipdvw1fwn"; - name = "kdeplasma-addons-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kdeplasma-addons-5.7.4.tar.xz"; + sha256 = "0vc865f3903g93r5w8phi9l0rnlblq68nirwblic2j2a2gyjsn4r"; + name = "kdeplasma-addons-5.7.4.tar.xz"; }; }; kgamma5 = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kgamma5-5.7.3.tar.xz"; - sha256 = "1zzig2iw5wjhvym35vbljqa4ma7jyprqvqxbcw3aqj1hp5z9g35k"; - name = "kgamma5-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kgamma5-5.7.4.tar.xz"; + sha256 = "15y86qhgrfs7p8imabsf45l7rpfis1mcjg4g22phizk17w4rzk92"; + name = "kgamma5-5.7.4.tar.xz"; }; }; khotkeys = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/khotkeys-5.7.3.tar.xz"; - sha256 = "1xq70j2wfxxbhzn3darjx75120j641v8rd20wjcn5bmr1xlr5fb7"; - name = "khotkeys-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/khotkeys-5.7.4.tar.xz"; + sha256 = "1lggfcgpq4x1hdvlcjmi3k63rffprhrpjkfvjhryhx62648xb24a"; + name = "khotkeys-5.7.4.tar.xz"; }; }; kinfocenter = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kinfocenter-5.7.3.tar.xz"; - sha256 = "1s66400kh49wzfsgahdya6w1j2a4f5w47lllpy2i6w1xl3pag219"; - name = "kinfocenter-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kinfocenter-5.7.4.tar.xz"; + sha256 = "0j4l5yw0h0iwqqcfyah1wh5mnrg47nhqmqza7dz13b48n0bpg31l"; + name = "kinfocenter-5.7.4.tar.xz"; }; }; kmenuedit = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kmenuedit-5.7.3.tar.xz"; - sha256 = "0j0qk1p9j25kk8jysx41jnh52yflb2xf2xg64p7x72i6ci8axyaa"; - name = "kmenuedit-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kmenuedit-5.7.4.tar.xz"; + sha256 = "1g8a092kx68spvrys0b8xjyrnx1y94i5lsi51j1cw0ylgjmqsp3p"; + name = "kmenuedit-5.7.4.tar.xz"; }; }; kscreen = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kscreen-5.7.3.tar.xz"; - sha256 = "1z48sycq6i618ypba78hm5vh8m3c9c0k44jl4lrxvx524axhg11w"; - name = "kscreen-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kscreen-5.7.4.tar.xz"; + sha256 = "1i0c0znfr2y7b5aczmkym5aflh08sv1f7nfi3j6xmbzcxpfdvidy"; + name = "kscreen-5.7.4.tar.xz"; }; }; kscreenlocker = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kscreenlocker-5.7.3.tar.xz"; - sha256 = "1xnzca0mli25mmg0x4pqa1gfhvw4f3m7cqn1ml92z7fnh8rbqw5k"; - name = "kscreenlocker-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kscreenlocker-5.7.4.tar.xz"; + sha256 = "03giy5fxy11bdz6ww5hmgwhnlngcrzk7ahp4l1sd9yf3fd4rav6q"; + name = "kscreenlocker-5.7.4.tar.xz"; }; }; ksshaskpass = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/ksshaskpass-5.7.3.tar.xz"; - sha256 = "1ihhavb87xzgb649lxc2z9hcxrc37pgx52f13hbswbzl1086nfqh"; - name = "ksshaskpass-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/ksshaskpass-5.7.4.tar.xz"; + sha256 = "15b0jhpkg086rspjmcpqi0ylnvxvl9wylz13vkaqdm6408d558gg"; + name = "ksshaskpass-5.7.4.tar.xz"; }; }; ksysguard = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/ksysguard-5.7.3.tar.xz"; - sha256 = "1rkhjjxcp6d0ybpnyjkadx3hyv2r9c1xgby4x042ac0kycvkxdiz"; - name = "ksysguard-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/ksysguard-5.7.4.tar.xz"; + sha256 = "1r96zrplcbfb37r8vxvm2hzq638g979xx9y0jrsyhpzxhxgv4w1w"; + name = "ksysguard-5.7.4.tar.xz"; }; }; kwallet-pam = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kwallet-pam-5.7.3.tar.xz"; - sha256 = "1nfphzlcwx0l6wa4kl7akwmf8wb1pr1acyaxchivj463wbnbygy4"; - name = "kwallet-pam-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kwallet-pam-5.7.4.tar.xz"; + sha256 = "1p3py66qw09s9pcrbn0x356c13w24nrhkgypz0v3kyr51ia1r1jr"; + name = "kwallet-pam-5.7.4.tar.xz"; }; }; kwayland-integration = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kwayland-integration-5.7.3.tar.xz"; - sha256 = "1wlimrd33fa3wkvw5kdg3y73s6x33rd2i70prb4svr15bb82pfin"; - name = "kwayland-integration-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kwayland-integration-5.7.4.tar.xz"; + sha256 = "05n0m38rmil1zg5clilsic2pq7973nymcr54w6kh93dzrr4r9ls3"; + name = "kwayland-integration-5.7.4.tar.xz"; }; }; kwin = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kwin-5.7.3.tar.xz"; - sha256 = "0rh4mjv9cspv21y5a81cfdi3p3mvybmwvcbyx68svpzpfj6mvpca"; - name = "kwin-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kwin-5.7.4.tar.xz"; + sha256 = "06fmk3jpk3zbig46rzsi5wmxa17z0lnh3r0fk9hxdalxdz4c9ws8"; + name = "kwin-5.7.4.tar.xz"; }; }; kwrited = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/kwrited-5.7.3.tar.xz"; - sha256 = "1qx67gv75n9m777g4a6hj75nsbv7wqqb2bb7fm7bm5110lv1j3gl"; - name = "kwrited-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/kwrited-5.7.4.tar.xz"; + sha256 = "14c1rw8vmvi4iffqinkz7pgk49g80hw3mhh2mqk5lqj21rnrliqz"; + name = "kwrited-5.7.4.tar.xz"; }; }; libkscreen = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/libkscreen-5.7.3.tar.xz"; - sha256 = "1zmzhqb2fb6mxilqfyxhgnflqwcf0cx006h3psx3mf634qqh1ixi"; - name = "libkscreen-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/libkscreen-5.7.4.tar.xz"; + sha256 = "1jifb6xi3d541y2c3ipx666dr4wa0i9sc59a4s75cdp82322qvsj"; + name = "libkscreen-5.7.4.tar.xz"; }; }; libksysguard = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/libksysguard-5.7.3.tar.xz"; - sha256 = "1gcrwlksvv1br03j11v2bhgikkwwhh0ynv2z3g9lbyvbjg8jmwya"; - name = "libksysguard-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/libksysguard-5.7.4.tar.xz"; + sha256 = "1kkfsjzpraj0hc02mrz93jdp3ha2dv0m28jmwrxd7z059slfyfj0"; + name = "libksysguard-5.7.4.tar.xz"; }; }; milou = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/milou-5.7.3.tar.xz"; - sha256 = "172qvnkniqbhxdzm1inl6adjxfy13a9hnimqfwdgf1f7ss5dmsp7"; - name = "milou-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/milou-5.7.4.tar.xz"; + sha256 = "1v117cdsiwg4l6g7x2k0mpgp57a9gc6k95jxxms9d41hqwq8qg6q"; + name = "milou-5.7.4.tar.xz"; }; }; oxygen = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/oxygen-5.7.3.tar.xz"; - sha256 = "0y3jf5y21dzpyv9vz44qb7kqr1afmad9yvq45kwpjwlnabz75y3r"; - name = "oxygen-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/oxygen-5.7.4.tar.xz"; + sha256 = "1g18h5a3vxa7pxp07wg9g0yzddvjcqs7cnrlrb2mj8r4zdxg4nx3"; + name = "oxygen-5.7.4.tar.xz"; }; }; plasma-desktop = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-desktop-5.7.3.tar.xz"; - sha256 = "1plfrfzczzz2x2pp8f3vkphds9hfp28qmcyaf2c63snjcply0vjg"; - name = "plasma-desktop-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/plasma-desktop-5.7.4.tar.xz"; + sha256 = "0xm8666acp3149gd9simmbkjpi36fbibpy86ppj0hg26pknc66mr"; + name = "plasma-desktop-5.7.4.tar.xz"; }; }; plasma-integration = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-integration-5.7.3.tar.xz"; - sha256 = "1wlwmjf4m6f4bps8vbk8f1ixjmd3krm5h1mc27mls35r783kh3hl"; - name = "plasma-integration-5.7.3.tar.xz"; - }; - }; - plasma-mediacenter = { - version = "5.7.3"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-mediacenter-5.7.3.tar.xz"; - sha256 = "0p5pip14y2rfv9gsk40jqbv2hg2m7wg8cvycbc774gi19zr19ajr"; - name = "plasma-mediacenter-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/plasma-integration-5.7.4.tar.xz"; + sha256 = "0h0pmwhkz052dzv7gk9j2a699912agzx39z9iirhigkwniij8q1x"; + name = "plasma-integration-5.7.4.tar.xz"; }; }; plasma-nm = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-nm-5.7.3.tar.xz"; - sha256 = "0xap1mjj1lg9nvys1ld9d4bvx5vi3qi2gc4gvdh7h4i1phyzfqwz"; - name = "plasma-nm-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/plasma-nm-5.7.4.tar.xz"; + sha256 = "0p5c4n6xc4dw9393l2an320z85mgg8f9wsa04dxdami2638drq9i"; + name = "plasma-nm-5.7.4.tar.xz"; }; }; plasma-pa = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-pa-5.7.3.tar.xz"; - sha256 = "11dwm848ylm7fx2fgmjxsknqd5vq0832h8d3ak0f0a2gbrqpvgis"; - name = "plasma-pa-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/plasma-pa-5.7.4.tar.xz"; + sha256 = "1zk6kry02vfmm4mwznq5gy7xzjlbpvbb4a749z0zq0nkmlpx78d4"; + name = "plasma-pa-5.7.4.tar.xz"; }; }; plasma-sdk = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-sdk-5.7.3.tar.xz"; - sha256 = "1xi4gyrcwll8m0ilmqrpaa8anx7bravz25f7j613zmr7c59372cb"; - name = "plasma-sdk-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/plasma-sdk-5.7.4.tar.xz"; + sha256 = "11zq31ja965p9xi4k5siki25blmy5lqsmhscq6pysqs7yzijjban"; + name = "plasma-sdk-5.7.4.tar.xz"; }; }; plasma-workspace = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-5.7.3.tar.xz"; - sha256 = "0hlh7qvll48hnpmjkhf53fxx91yx8sdhsyc9y77mfzwavd72354q"; - name = "plasma-workspace-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/plasma-workspace-5.7.4.tar.xz"; + sha256 = "0g8f1wn3cjgxiyvsbgaac91digglrka9lqsf1xr4fj6l7kfvb1ap"; + name = "plasma-workspace-5.7.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/plasma-workspace-wallpapers-5.7.3.tar.xz"; - sha256 = "0452k2ic16cf385l057chh2a3wh4hjxxlpnlapfyxsmxhz29ymgz"; - name = "plasma-workspace-wallpapers-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/plasma-workspace-wallpapers-5.7.4.tar.xz"; + sha256 = "1px6sp59wld8j6b7a22dc61b4x4rk4jv4bdfispkxv9b6nb29pdp"; + name = "plasma-workspace-wallpapers-5.7.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.7.3"; + version = "1-5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/polkit-kde-agent-1-5.7.3.tar.xz"; - sha256 = "1j1724dffrpv06xzmgqvm4xbdscflkcx31bshwh2mizcxknb2bbq"; - name = "polkit-kde-agent-1-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/polkit-kde-agent-1-5.7.4.tar.xz"; + sha256 = "19xw0y1d5cbxs5x79gg8x5nhpsc3lzrk3cq913symg1lz4y8py8l"; + name = "polkit-kde-agent-1-5.7.4.tar.xz"; }; }; powerdevil = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/powerdevil-5.7.3.tar.xz"; - sha256 = "1npbdwhic2bkdzxggkvyl1bqpfb7ihcpa8rds3c6bf6smbkhwiqi"; - name = "powerdevil-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/powerdevil-5.7.4.tar.xz"; + sha256 = "19vjhs7cccfgvln4zn8wdnawk5xq6l12qi9jkzzxbhds456xqr84"; + name = "powerdevil-5.7.4.tar.xz"; }; }; sddm-kcm = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/sddm-kcm-5.7.3.tar.xz"; - sha256 = "1s80j6hjjz8n079k8867xbb1q20n7mxrcjlfm44m2p0qz8nv4kjk"; - name = "sddm-kcm-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/sddm-kcm-5.7.4.tar.xz"; + sha256 = "0aljr8pmc65dd6xq4c1i17wasn50nk3p3qwm54rfm9z063qm865h"; + name = "sddm-kcm-5.7.4.tar.xz"; }; }; systemsettings = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/systemsettings-5.7.3.tar.xz"; - sha256 = "0776vqnwvpf1x52lz8wpl3y43r5zq6l3wviw0fpbj4fcg8jmryr3"; - name = "systemsettings-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/systemsettings-5.7.4.tar.xz"; + sha256 = "024rqmnw5bdph15ck8zmzxjars77jzh0hfh3yys1c3ydbhnvrc3w"; + name = "systemsettings-5.7.4.tar.xz"; }; }; user-manager = { - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.3/user-manager-5.7.3.tar.xz"; - sha256 = "172gl6p6ai0gi2m10b0rpcg69xqf4127cf6gbvv0r22cprhxw1cb"; - name = "user-manager-5.7.3.tar.xz"; + url = "${mirror}/stable/plasma/5.7.4/user-manager-5.7.4.tar.xz"; + sha256 = "002qzlvh911ybffp7d0ln4qn6z87lnikagmcagy5bb3ypg217ijf"; + name = "user-manager-5.7.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh index a39b388cbb7b..256f9949e834 100755 --- a/pkgs/desktops/kde-5/plasma/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma/startkde/startkde.sh @@ -185,28 +185,6 @@ if test -z "$dl"; then esac fi -# Source scripts found in <config locations>/plasma-workspace/env/*.sh -# (where <config locations> correspond to the system and user's configuration -# directories, as identified by Qt's qtpaths, e.g. $HOME/.config -# and /etc/xdg/ on Linux) -# -# This is where you can define environment variables that will be available to -# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` -# or eval `gpg-agent --daemon`. -# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script -# -# (see end of this file). -# For anything else (that doesn't set env vars, or that needs a window manager), -# better use the Autostart folder. - -IFS=":" read -r -a scriptpath <<< $(qtpaths --paths GenericConfigLocation) -# Add /env/ to the directory to locate the scripts to be sourced -for prefix in "${scriptpath[@]}"; do - for file in "$prefix"/plasma-workspace/env/*.sh; do - test -r "$file" && . "$file" || true - done -done - echo 'startkde: Starting up...' 1>&2 # Make sure that D-Bus is running @@ -255,6 +233,28 @@ export KDE_SESSION_UID XDG_CURRENT_DESKTOP=KDE export XDG_CURRENT_DESKTOP +# Source scripts found in <config locations>/plasma-workspace/env/*.sh +# (where <config locations> correspond to the system and user's configuration +# directories, as identified by Qt's qtpaths, e.g. $HOME/.config +# and /etc/xdg/ on Linux) +# +# This is where you can define environment variables that will be available to +# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent` +# or eval `gpg-agent --daemon`. +# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script +# +# (see end of this file). +# For anything else (that doesn't set env vars, or that needs a window manager), +# better use the Autostart folder. + +IFS=":" read -r -a scriptpath <<< $(qtpaths --paths GenericConfigLocation) +# Add /env/ to the directory to locate the scripts to be sourced +for prefix in "${scriptpath[@]}"; do + for file in "$prefix"/plasma-workspace/env/*.sh; do + test -r "$file" && . "$file" || true + done +done + # At this point all the environment is ready, let's send it to kwalletd if running if test -n "$PAM_KWALLET_LOGIN" ; then env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN |