diff options
Diffstat (limited to 'pkgs')
383 files changed, 4330 insertions, 4534 deletions
diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 62fe4197929..0c875308502 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { miniupnpc utillinux protobuf ] ++ optionals withGui [ qt4 qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; meta = { diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix index e678d6e4acb..fd2d2f35bcb 100644 --- a/pkgs/applications/altcoins/bitcoin-xt.nix +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec{ ++ optionals withGui [ qt4 qrencode ]; configureFlags = [ - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--with-libcurl-headers=${curl.dev}/include" ] ++ optionals withGui [ "--with-gui=qt4" ]; diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 1a574635711..7b4e7d54f32 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec{ ++ optionals stdenv.isLinux [ utillinux ] ++ optionals withGui [ qt4 qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; meta = { diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix index 2e9f17017a2..ef42560ee9a 100644 --- a/pkgs/applications/altcoins/dashpay.nix +++ b/pkgs/applications/altcoins/dashpay.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm boost zlib miniupnpc protobuf qt4 qrencode utillinux ]; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; meta = with stdenv.lib; { version = "0.12.0.55"; diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix index cf2f25bfeee..c74f7ce7f24 100644 --- a/pkgs/applications/altcoins/dogecoin.nix +++ b/pkgs/applications/altcoins/dogecoin.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ "--with-incompatible-bdb" - "--with-boost-libdir=${boost.lib}/lib" ] + "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui" ]; meta = { diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix index 4e0198b972d..38e671e8994 100644 --- a/pkgs/applications/altcoins/litecoin.nix +++ b/pkgs/applications/altcoins/litecoin.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { openssl db48 boost zlib miniupnpc glib protobuf utillinux ] ++ optionals withGui [ qt4 qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix index 0470fd21eae..d30133fa551 100644 --- a/pkgs/applications/altcoins/memorycoin.nix +++ b/pkgs/applications/altcoins/memorycoin.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ miniupnpc utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix index 360a39a4fd8..7d25a26fba2 100644 --- a/pkgs/applications/altcoins/primecoin.nix +++ b/pkgs/applications/altcoins/primecoin.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec{ miniupnpc utillinux protobuf ] ++ optionals withGui [ qt4 qmake4Hook qrencode ]; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ] + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] ++ optionals withGui [ "--with-gui=qt4" ]; preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile"; diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 2d6b0434d6a..e3cef30ccda 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # Prebuilt binary distribution. # "patchelf --set-rpath" seems to break the application (cannot start), using # LD_LIBRARY_PATH wrapper script instead. - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p "$out/bin" mkdir -p "$out/libexec/baudline" diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix index 56f7ac50227..20ba1c14745 100644 --- a/pkgs/applications/audio/faust/faust1.nix +++ b/pkgs/applications/audio/faust/faust1.nix @@ -25,7 +25,6 @@ let }; faust = stdenv.mkDerivation { - name = "faust-${version}"; inherit src; @@ -107,9 +106,7 @@ let inherit src; - configurePhase = ":"; - - buildPhase = ":"; + dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 612a3dab99f..3953eb2b7e0 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -132,9 +132,7 @@ let inherit src; - configurePhase = ":"; - - buildPhase = ":"; + dontBuild = true; installPhase = '' runHook preInstall diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 61cb6b9896e..7021cd165cf 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4 +, liblastfm, lucenepp, phonon, phonon-backend-vlc, qca2, qjson, qt4 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { postInstall = let pluginPath = stdenv.lib.concatStringsSep ":" [ - "${phonon_backend_vlc}/lib/kde4/plugins" + "${phonon-backend-vlc}/lib/kde4/plugins" ]; in '' for i in "$out"/bin/*; do diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index d91d8a4ecbe..dbfc2ebb6b3 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -13,7 +13,7 @@ let ]; libPathNative = lib.makeLibraryPath packages; - libPath64 = lib.makeSearchPathOutputs "lib64" ["lib"] packages; + libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages; libPath = "${libPathNative}:${libPath64}"; in { inherit packages libPath; } diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 119125066bd..453dc080995 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -19,7 +19,7 @@ # Supplementary packages required only by the wrapper. , bash, kde_runtime, kde_baseapps, makeWrapper, oxygen_icons -, phonon_backend_vlc /*phonon_backend_gstreamer,*/ +, phonon-backend-vlc /*phonon-backend-gstreamer,*/ , ffmpegthumbs /*mplayerthumbs*/ , runCommand, shared_mime_info, writeScriptBin }: @@ -93,7 +93,7 @@ let kdePkgs = [ build # digikam's own build kdelibs kdepimlibs kde_runtime kde_baseapps libkdcraw oxygen_icons - /*phonon_backend_gstreamer*/ phonon_backend_vlc + /*phonon-backend-gstreamer*/ phonon-backend-vlc ffmpegthumbs /*mplayerthumbs*/ shared_mime_info ] # Optional build time dependencies ++ [ @@ -208,7 +208,7 @@ TODO - Per lib `KDELIBS` environment variable export. See above in-code TODO comment. - Missing optional `qt_soap` or `herqq` (av + normal package) dependencies. Those are not yet (or not fully) packaged in nix. Mainly required for upnp export. - - Possibility to use the `phonon_backend_gstreamer` with its own user specified set of backend. + - Possibility to use the `phonon-backend-gstreamer` with its own user specified set of backend. - Allow user to disable optional features or dependencies reacting properly. - Compile `kipiplugins` as a separate package (so that it can be used by other kde packages and so that this package's build time is reduced). diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 7b22e88bb84..8561c2a4ccf 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,12 +1,6 @@ { stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }: -/* - - -*/ - let - myPatchElf = file: with stdenv.lib; '' patchelf --set-interpreter \ ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \ @@ -15,10 +9,7 @@ let udevRules = callPackage ./udev_rules_type1.nix {}; -in - -stdenv.mkDerivation rec { - +in stdenv.mkDerivation rec { name = "brscan4-0.4.3-3"; src = fetchurl { url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb"; @@ -32,8 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ]; buildInputs = [ libusb ]; - buildPhase = ":"; - + dontBuild = true; patchPhase = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} @@ -47,7 +37,6 @@ stdenv.mkDerivation rec { ''; installPhase = '' - PATH_TO_BRSCAN4="opt/brother/scanner/brscan4" mkdir -p $out/$PATH_TO_BRSCAN4 cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4 diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix index 873240e81fc..da136a7f9e1 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}: - stdenv.mkDerivation rec { - name = "brother-udev-rule-type1-1.0.0-1"; src = fetchurl { @@ -10,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi"; }; - buildInputs = [ ]; + dontBuild = true; unpackPhase = '' ar x $src @@ -37,9 +35,6 @@ stdenv.mkDerivation rec { sed -i -e s/SYSFS/ATTR/g opt/brother/scanner/udev-rules/type1/*.rules ''; - - buildPhase = ":"; - installPhase = '' mkdir -p $out/etc/udev/rules.d cp opt/brother/scanner/udev-rules/type1/NN-brother-mfp-type1.rules \ @@ -57,4 +52,4 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ jraygauthier ]; }; -} \ No newline at end of file +} diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 0dd4eab35f1..28a264af965 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -35,7 +35,7 @@ let configureFlags = [ "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" ]; buildInputs = [ diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 81ac845c5cf..6290f082734 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -16,7 +16,7 @@ gconftool-2 --recursive-unset /apps/guake with lib; let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ]; - pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); + pyPath = makeSearchPathOutput "lib" python2.sitePackages (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]); in stdenv.mkDerivation rec { name = "guake-${version}"; version = "0.8.3"; diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix index 9b74b0c93a9..f204a9fc0ef 100644 --- a/pkgs/applications/misc/jbidwatcher/default.nix +++ b/pkgs/applications/misc/jbidwatcher/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { unpackPhase = "true"; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index ec055f3055f..d8f44ba5cdb 100644 --- a/pkgs/applications/misc/roxterm/default.nix +++ b/pkgs/applications/misc/roxterm/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { "-I${dbus_libs.lib}/lib/dbus-1.0/include" ]; # Fix up python path so the lockfile library is on it. - PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [ + PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" pythonFull.sitePackages [ pythonPackages.curses pythonPackages.lockfile ]; diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix index 57ff213ae80..d9046c55e12 100644 --- a/pkgs/applications/misc/terminal-notifier/default.nix +++ b/pkgs/applications/misc/terminal-notifier/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p"; }; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p $out/Applications diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index b7883454b34..ac7f8111212 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -65,7 +65,7 @@ let patchPhase = let rpaths = [ stdenv.cc.cc ]; - mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}"; + mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; in '' for sofile in PepperFlash/libpepflashplayer.so \ libwidevinecdm.so libwidevinecdmadapter.so; do diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index bc3a0463fa8..3b653d9d871 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation { libheimdal libpulseaudio systemd - ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ + ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 37602a89cee..1550d359b34 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { tar xf data.tar.xz ''; - rpath = makeLibraryPath deps + ":" + makeSearchPathOutputs "lib64" ["lib"] deps; + rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; binpath = makeBinPath deps; installPhase = '' diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 325e855ec72..a00905cf937 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); preFixup = '' diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 2c6ba3f8929..107de678425 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.is64bit) - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); buildPhase = '' echo "Patching Vivaldi binaries" diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index b7b92315911..da6bf44ced1 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ldap-dir=${openldap}" "--with-libsasl2-dir=${cyrus_sasl}" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--disable-gconf" ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index bbb51c7c186..f974265aa6e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation { nspr nss pango - ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ + ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index ee03bfeedb0..77624c0d938 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--with-boost=${boost.dev}" (if guiSupport then "" else "--disable-gui") (if webuiSupport then "" else "--disable-webui") diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix index d8685da8d81..6f8ebb994c5 100644 --- a/pkgs/applications/networking/p2p/twister/default.nix +++ b/pkgs/applications/networking/p2p/twister/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { "--disable-deprecated-functions" "--enable-tests" "--enable-python-binding" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" ]; buildInputs = [ diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 450c15bb65e..c2ad0929f01 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "${if withHelp then "" else "--without-help"}" "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--with-beanshell-jar=${bsh}" "--with-vendor=NixOS" "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 0e4d2d79762..e6296bb045b 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { configureFlags = [ "${if withHelp then "" else "--without-help"}" "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--with-beanshell-jar=${bsh}" "--with-vendor=NixOS" "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar" diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 2a43cf5677f..07a20b4ebe0 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ldpath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index c2988331c4c..4de4a0c261d 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ldpath = stdenv.lib.makeLibraryPath buildInputs + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") - (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs); + (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs); phases = "unpackPhase installPhase fixupPhase"; diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix index 253b97aff1e..345b1341c0f 100644 --- a/pkgs/applications/search/recoll/default.nix +++ b/pkgs/applications/search/recoll/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison +{ stdenv, fetchurl, lib, bison , qt4, xapian, file, python, perl , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx , libwpd, unrtf, untex @@ -26,27 +26,27 @@ stdenv.mkDerivation rec { # the absolute path to the filtering command. postInstall = '' for f in $out/share/recoll/filters/* ; do - substituteInPlace $f --replace antiword ${antiword}/bin/antiword - substituteInPlace $f --replace awk ${gawk}/bin/awk - substituteInPlace $f --replace catppt ${catdoc}/bin/catppt - substituteInPlace $f --replace djvused ${djvulibre.bin}/bin/djvused - substituteInPlace $f --replace djvutxt ${djvulibre.bin}/bin/djvutxt - substituteInPlace $f --replace egrep ${gnugrep}/bin/egrep - substituteInPlace $f --replace groff ${groff}/bin/groff - substituteInPlace $f --replace gunzip ${gzip}/bin/gunzip - substituteInPlace $f --replace iconv ${libiconv.bin or libiconv}/bin/iconv - substituteInPlace $f --replace lyx ${lyx}/bin/lyx - substituteInPlace $f --replace pdftotext ${poppler_utils.out}/bin/pdftotext - substituteInPlace $f --replace pstotext ${ghostscript}/bin/ps2ascii - substituteInPlace $f --replace sed ${gnused}/bin/sed - substituteInPlace $f --replace tar ${gnutar}/bin/tar - substituteInPlace $f --replace unzip ${unzip}/bin/unzip - substituteInPlace $f --replace xls2csv ${catdoc}/bin/xls2csv - substituteInPlace $f --replace xsltproc ${libxslt.bin}/bin/xsltproc - substituteInPlace $f --replace unrtf ${unrtf}/bin/unrtf - substituteInPlace $f --replace untex ${untex}/bin/untex - substituteInPlace $f --replace wpd2html ${libwpd}/bin/wpd2html - substituteInPlace $f --replace /usr/bin/perl ${perl}/bin/perl + substituteInPlace $f --replace antiword ${lib.getBin antiword}/bin/antiword + substituteInPlace $f --replace awk ${lib.getBin gawk}/bin/awk + substituteInPlace $f --replace catppt ${lib.getBin catdoc}/bin/catppt + substituteInPlace $f --replace djvused ${lib.getBin djvulibre}/bin/djvused + substituteInPlace $f --replace djvutxt ${lib.getBin djvulibre}/bin/djvutxt + substituteInPlace $f --replace egrep ${lib.getBin gnugrep}/bin/egrep + substituteInPlace $f --replace groff ${lib.getBin groff}/bin/groff + substituteInPlace $f --replace gunzip ${lib.getBin gzip}/bin/gunzip + substituteInPlace $f --replace iconv ${lib.getBin libiconv}/bin/iconv + substituteInPlace $f --replace lyx ${lib.getBin lyx}/bin/lyx + substituteInPlace $f --replace pdftotext ${lib.getBin poppler_utils}/bin/pdftotext + substituteInPlace $f --replace pstotext ${lib.getBin ghostscript}/bin/ps2ascii + substituteInPlace $f --replace sed ${lib.getBin gnused}/bin/sed + substituteInPlace $f --replace tar ${lib.getBin gnutar}/bin/tar + substituteInPlace $f --replace unzip ${lib.getBin unzip}/bin/unzip + substituteInPlace $f --replace xls2csv ${lib.getBin catdoc}/bin/xls2csv + substituteInPlace $f --replace xsltproc ${lib.getBin libxslt}/bin/xsltproc + substituteInPlace $f --replace unrtf ${lib.getBin unrtf}/bin/unrtf + substituteInPlace $f --replace untex ${lib.getBin untex}/bin/untex + substituteInPlace $f --replace wpd2html ${lib.getBin libwpd}/bin/wpd2html + substituteInPlace $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl done ''; diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index 85749f978d1..952d9b7f21a 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [python makeWrapper]; - buildPhase = "true"; + dontBuild = true; installPhase = '' python ./setup.py install --prefix=$out for i in bzr svn git; do diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 5bd6995d204..ef681c9ba7d 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [mercurial.python mercurial makeWrapper subversion]; - buildPhase="true"; # skip svn for now + dontBuild = true; # skip svn for now # TODO also support svn stuff # moving .py files into lib directory so that you can't pick the wrong file from PATH. diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix index c735ef4506a..9a19b358c90 100644 --- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix @@ -13,22 +13,21 @@ stdenv.mkDerivation { buildInputs = [ ruby makeWrapper ]; - buildPhase = "true"; - - installPhase = - '' - mkdir -p $out - cp -r lib $out/ - - mkdir -p $out/bin - substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby - cp bin/svn2git $out/bin/ - chmod +x $out/bin/svn2git - - wrapProgram $out/bin/svn2git \ - --set RUBYLIB $out/lib \ - --prefix PATH : ${git}/bin - ''; + dontBuild = true; + + installPhase = '' + mkdir -p $out + cp -r lib $out/ + + mkdir -p $out/bin + substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby + cp bin/svn2git $out/bin/ + chmod +x $out/bin/svn2git + + wrapProgram $out/bin/svn2git \ + --set RUBYLIB $out/lib \ + --prefix PATH : ${git}/bin + ''; meta = { homepage = https://github.com/nirvdrum/svn2git; diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix index 60e0a794705..5e1feacd83d 100644 --- a/pkgs/applications/version-management/gitolite/default.nix +++ b/pkgs/applications/version-management/gitolite/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ git nettools perl ]; - buildPhase = "true"; + + dontBuild = true; patchPhase = '' substituteInPlace ./install --replace " 2>/dev/null" "" diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 82b3f7aed09..0e30f0239bf 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { boost glm ]; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; NIX_CFLAGS_COMPILE = "-fpermissive " + # fix build with newer gcc versions "-std=c++11"; # fix build with glm >= 0.9.6.0 diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix index 669151adbcc..55858034b1c 100644 --- a/pkgs/applications/version-management/reposurgeon/default.nix +++ b/pkgs/applications/version-management/reposurgeon/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { [ out git bazaar cvs darcs fossil mercurial monotone rcs src subversion cvs_fast_export ] ); - pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] ( + pythonpath = makeSearchPathOutput "lib" python27.sitePackages ( filter (x: x != null) [ python27Packages.readline or null python27Packages.hglib or null ] ); diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index a5c14d0888f..92a2f4fb634 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa - libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv + libass fftw ffms ffmpeg zlib icu boost boost.out libiconv ] ++ optional spellcheckSupport hunspell ++ optional automationSupport lua diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix index 1a621032125..971588901b4 100644 --- a/pkgs/applications/video/minitube/default.nix +++ b/pkgs/applications/video/minitube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4, qmake4Hook +{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook # "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com> , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "flaviotordini"; }; - buildInputs = [ phonon phonon_backend_vlc qt4 ]; + buildInputs = [ phonon phonon-backend-vlc qt4 ]; nativeBuildInputs = [ makeWrapper qmake4Hook ]; qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/minitube \ - --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins" + --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 05bd5ad980b..ca86906d3e1 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-magic" "--enable-optimization" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--disable-debug" "--disable-profiling" "--disable-precompiled-headers" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 6cdd0477244..da114fdb347 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -27,13 +27,13 @@ let ccVersion = (builtins.parseDrvName cc.name).version; ccName = (builtins.parseDrvName cc.name).name; - libc_bin = if nativeLibc then null else libc.bin or libc; - libc_dev = if nativeLibc then null else libc.dev or libc; - libc_lib = if nativeLibc then null else libc.out or libc; - cc_solib = cc.lib or cc; - binutils_bin = if nativeTools then "" else binutils.bin or binutils; + libc_bin = if nativeLibc then null else getBin libc; + libc_dev = if nativeLibc then null else getDev libc; + libc_lib = if nativeLibc then null else getLib libc; + cc_solib = getLib cc; + binutils_bin = if nativeTools then "" else getBin binutils; # The wrapper scripts use 'cat' and 'grep', so we may need coreutils. - coreutils_bin = if nativeTools then "" else coreutils.bin or coreutils; + coreutils_bin = if nativeTools then "" else getBin coreutils; in stdenv.mkDerivation { @@ -113,6 +113,7 @@ stdenv.mkDerivation { ccCFlags+=" -B${cc_solib}/lib64" fi ccLDFlags+=" -L${cc_solib}/lib" + ccCFlags+=" -B${cc_solib}/lib" ${optionalString cc.langVhdl or false '' ccLDFlags+=" -L${zlib.out}/lib" diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 9352757ea80..80544b74517 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -343,7 +343,7 @@ fi if test -n "$builder"; then test -n "$out" -a -n "$url" -a -n "$rev" || usage - mkdir $out + mkdir -p $out clone_user_rev "$out" "$url" "$rev" else if test -z "$hashType"; then @@ -368,7 +368,7 @@ else trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$(url_to_name "$url" "$rev")" - mkdir "$tmpFile" + mkdir -p "$tmpFile" # Perform the checkout. clone_user_rev "$tmpFile" "$url" "$rev" diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix index f44aaec5d9d..a87c726e0a8 100644 --- a/pkgs/build-support/gcc-wrapper-old/default.nix +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -5,7 +5,7 @@ # stdenv.mkDerivation provides a wrapper that sets up the right environment # variables so that the compiler and the linker just "work". -{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" +{ name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? "" , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" , zlib ? null }: @@ -41,13 +41,13 @@ stdenv.mkDerivation { addFlags = ./add-flags; inherit nativeTools nativeLibc nativePrefix gcc; - gcc_lib = gcc.lib or gcc; + gcc_lib = lib.getLib gcc; libc = if nativeLibc then null else libc; - libc_dev = if nativeLibc then null else libc.dev or libc; - libc_bin = if nativeLibc then null else libc.bin or libc; - binutils = if nativeTools then null else binutils; + libc_dev = if nativeLibc then null else lib.getDev libc; + libc_bin = if nativeLibc then null else lib.getBin libc; + binutils = if nativeTools then null else lib.getBin binutils; # The wrapper scripts use 'cat', so we may need coreutils - coreutils = if nativeTools then null else coreutils; + coreutils = if nativeTools then null else lib.getBin coreutils; langC = if nativeTools then true else gcc.langC; langCC = if nativeTools then true else gcc.langCC; diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index fb26894661d..1022b25c4c9 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -2,6 +2,7 @@ args: +# see the substituteAll in the nixpkgs documentation for usage and constaints stdenv.mkDerivation ({ name = if args ? name then args.name else baseNameOf (toString args.src); builder = ./substitute-all.sh; diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index f57f3de7f82..9941b4791b5 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; }; - buildPhase = "true"; + dontBuild = true; installPhase = '' fontDir=$out/share/fonts/opentype diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix index 8b607adaaae..fb1459831f6 100644 --- a/pkgs/data/fonts/bakoma-ttf/default.nix +++ b/pkgs/data/fonts/bakoma-ttf/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation { name = "bakoma-ttf"; - + src = fetchurl { url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2; sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km"; }; - - buildPhase = "true"; - installPhase = "mkdir -p $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype"; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp ttf/*.ttf $out/share/fonts/truetype + ''; meta = { description = "TrueType versions of the Computer Modern and AMS TeX Fonts"; diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix index 97fb0b82c74..decfaf63aef 100644 --- a/pkgs/data/fonts/dosemu-fonts/default.nix +++ b/pkgs/data/fonts/dosemu-fonts/default.nix @@ -9,8 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw"; }; - configurePhase = "true"; - buildPhase = "true"; + dontBuild = true; buildInputs = [bdftopcf mkfontdir mkfontscale]; diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix index 2e576cf6dc8..dbfb49f1bed 100644 --- a/pkgs/data/fonts/powerline-fonts/default.nix +++ b/pkgs/data/fonts/powerline-fonts/default.nix @@ -10,25 +10,24 @@ stdenv.mkDerivation { sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn"; }; - buildPhase = "true"; + dontBuild = true; - installPhase = - '' - mkdir -p $out/share/fonts/opentype - cp -v */*.otf $out/share/fonts/opentype + installPhase = '' + mkdir -p $out/share/fonts/opentype + cp -v */*.otf $out/share/fonts/opentype - mkdir -p $out/share/fonts/truetype - cp -v */*.ttf $out/share/fonts/truetype + mkdir -p $out/share/fonts/truetype + cp -v */*.ttf $out/share/fonts/truetype - mkdir -p $out/share/fonts/bdf - cp -v */BDF/*.bdf $out/share/fonts/bdf + mkdir -p $out/share/fonts/bdf + cp -v */BDF/*.bdf $out/share/fonts/bdf - mkdir -p $out/share/fonts/pcf - cp -v */PCF/*.pcf.gz $out/share/fonts/pcf + mkdir -p $out/share/fonts/pcf + cp -v */PCF/*.pcf.gz $out/share/fonts/pcf - mkdir -p $out/share/fonts/psf - cp -v */PSF/*.psf.gz $out/share/fonts/psf - ''; + mkdir -p $out/share/fonts/psf + cp -v */PSF/*.psf.gz $out/share/fonts/psf + ''; meta = with stdenv.lib; { homepage = https://github.com/powerline/fonts; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 10766d9fa78..d448aa558eb 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation { sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; }; - buildPhase = "true"; + dontBuild = true; - installPhase = " + installPhase = '' fontDir=$out/share/fonts/truetype mkdir -p $fontDir cp *.ttf $fontDir - "; + ''; } diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix index f3165b33cca..b2854b399f6 100644 --- a/pkgs/data/fonts/vista-fonts/default.nix +++ b/pkgs/data/fonts/vista-fonts/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "vista-fonts-1"; - + src = fetchurl { url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe; sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4"; @@ -10,14 +10,14 @@ stdenv.mkDerivation { buildInputs = [cabextract]; - unpackPhase = " + unpackPhase = '' cabextract --lowercase --filter ppviewer.cab $src cabextract --lowercase --filter '*.TTF' ppviewer.cab sourceRoot=. - "; - - buildPhase = "true"; - + ''; + + dontBuild = true; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix index 863f6044402..77cd666b8c6 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix @@ -10,19 +10,18 @@ let inherit sha256; }; - buildPhase = "true"; - - installPhase = - '' - dst=$out/share/xml/${pname} - mkdir -p $dst - rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp - mv * $dst/ - - # Backwards compatibility. Will remove eventually. - mkdir -p $out/xml/xsl - ln -s $dst $out/xml/xsl/docbook - ''; + dontBuild = true; + + installPhase = '' + dst=$out/share/xml/${pname} + mkdir -p $dst + rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp + mv * $dst/ + + # Backwards compatibility. Will remove eventually. + mkdir -p $out/xml/xsl + ln -s $dst $out/xml/xsl/docbook + ''; meta = { homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index db51a5f8962..30f92e4e054 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk"; }; - outputs = [ "out" "doc" ]; + outputs = [ "dev" "out" "doc" ]; buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ] # polkit requires pam, which requires shadow.h, which is not available on diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix index 754a3ce68f6..27233f4993c 100644 --- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix +++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix @@ -9,16 +9,22 @@ stdenv.mkDerivation rec { sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam"; }; + nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + + outputs = [ "dev" "out" ]; + preBuild = '' sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile ''; - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty; + preFixup = '' + moveToOutput "bin/orbit2-config" "$dev" + ''; meta = with stdenv.lib; { homepage = https://projects.gnome.org/ORBit2/; - description = "A a CORBA 2.4-compliant Object Request Broker"; + description = "A CORBA 2.4-compliant Object Request Broker"; platforms = platforms.unix; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index 69223393060..340c14e914f 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2"; }; + outputs = [ "dev" "out" ]; + buildInputs = [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia intltool gnome_mime_data avahi acl diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix index add013e64cd..af1960af36a 100644 --- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix +++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i"; }; + outputs = [ "dev" "out" ]; + preConfigure = # still using stuff deprecated in new glib versions "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in"; diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix index 5e5bae4d181..ce1da95762f 100644 --- a/pkgs/desktops/gnome-2/platform/libglade/default.nix +++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix @@ -2,12 +2,14 @@ stdenv.mkDerivation { name = "libglade-2.6.4"; - + src = fetchurl { url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2; sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4"; }; - + + outputs = [ "dev" "out" ]; + buildInputs = [ pkgconfig gtk python gettext ]; propagatedBuildInputs = [ libxml2 ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix index 4612e6aee6f..d0a4d1787c6 100644 --- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj"; }; + outputs = [ "dev" "out" ]; + patches = [ ./new-glib.patch ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix index 8c12754f112..5b5e7af5431 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5"; }; + outputs = [ "dev" "out" ]; + buildInputs = [ libglade ]; nativeBuildInputs = [ pkgconfig intltool ]; propagatedBuildInputs = [ libart_lgpl gtk ]; diff --git a/pkgs/desktops/kde-5/applications-15.12/kcolorchooser.nix b/pkgs/desktops/kde-5/applications-15.12/kcolorchooser.nix deleted file mode 100644 index e8eac273cb5..00000000000 --- a/pkgs/desktops/kde-5/applications-15.12/kcolorchooser.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ kdeApp, lib -, automoc4, cmake, kdelibs -}: - -kdeApp { - name = "kcolorchooser"; - - nativeBuildInputs = [ automoc4 cmake ]; - buildInputs = [ kdelibs ]; - - meta = { - license = with lib.licenses; [ mit ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/applications-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix deleted file mode 100644 index 7db99c26c3c..00000000000 --- a/pkgs/desktops/kde-5/applications-15.12/srcs.nix +++ /dev/null @@ -1,1933 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - akonadi = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/akonadi-15.12.3.tar.xz"; - sha256 = "17qzwsf8x95jm5swbxx5692i5yzwzqylnqrdbx2bflaaw7i2k3by"; - name = "akonadi-15.12.3.tar.xz"; - }; - }; - akonadi-calendar = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/akonadi-calendar-15.12.3.tar.xz"; - sha256 = "15algxz73wi143b93yps7dlbac0dp9isaxlf0h9xv1cia8s98a17"; - name = "akonadi-calendar-15.12.3.tar.xz"; - }; - }; - akonadi-search = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/akonadi-search-15.12.3.tar.xz"; - sha256 = "0dxr8rppaf0vnfmcys5hp6h936lim3s8f1ykhrygrvjr3va0fw3f"; - name = "akonadi-search-15.12.3.tar.xz"; - }; - }; - analitza = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/analitza-15.12.3.tar.xz"; - sha256 = "0hz59vfzh4kysrchafiaa3l8lw2zv0nky1dyi9ybzqwi5ilxcs9b"; - name = "analitza-15.12.3.tar.xz"; - }; - }; - ark = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ark-15.12.3.tar.xz"; - sha256 = "13pl4phk7zg19gc16x1faaycgipdd85xg2s7rj6silmvyxr47kzf"; - name = "ark-15.12.3.tar.xz"; - }; - }; - artikulate = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/artikulate-15.12.3.tar.xz"; - sha256 = "00dhgpkzjdqjag6k2m2d8l8pp40grzhqhvvivxzy6lcz67yr68m1"; - name = "artikulate-15.12.3.tar.xz"; - }; - }; - audiocd-kio = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/audiocd-kio-15.12.3.tar.xz"; - sha256 = "0ibasnpjqbfhxgkfar88pzmywcnnjpamkkd2arzwgdmrv311f4rj"; - name = "audiocd-kio-15.12.3.tar.xz"; - }; - }; - baloo-widgets = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/baloo-widgets-15.12.3.tar.xz"; - sha256 = "19yxc4njgnxyqd7izjkf93mml0wnnl23w58pv44w23a10jihydrg"; - name = "baloo-widgets-15.12.3.tar.xz"; - }; - }; - blinken = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/blinken-15.12.3.tar.xz"; - sha256 = "04jkf6gh676ghf6mhgn3pyv2vl6dypja3bxjc2np1j7j44575jx1"; - name = "blinken-15.12.3.tar.xz"; - }; - }; - bomber = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/bomber-15.12.3.tar.xz"; - sha256 = "03ydvhdcbgvalkn3ch512s7z7hn2ykamjilbs7iv6p9q21va6iws"; - name = "bomber-15.12.3.tar.xz"; - }; - }; - bovo = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/bovo-15.12.3.tar.xz"; - sha256 = "086nxgdl37jgmi5x759ln7ai4nxv6mahzhlkf3m8m3faa6hxm2af"; - name = "bovo-15.12.3.tar.xz"; - }; - }; - cantor = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/cantor-15.12.3.tar.xz"; - sha256 = "0fs2zsd8aq5q0l5d2p8343af6cbi4qvi603gvrcjyyyc728djrqc"; - name = "cantor-15.12.3.tar.xz"; - }; - }; - cervisia = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/cervisia-15.12.3.tar.xz"; - sha256 = "04gs4yjjdn0ndqfcpr7ww3qwn80929g4ylilznhpp6xp35gb5dsa"; - name = "cervisia-15.12.3.tar.xz"; - }; - }; - dolphin = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/dolphin-15.12.3.tar.xz"; - sha256 = "1pdxsf8n5kys7zwlhr71mwj4scwk8qglqml65cb3bijyysxlghr6"; - name = "dolphin-15.12.3.tar.xz"; - }; - }; - dolphin-plugins = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/dolphin-plugins-15.12.3.tar.xz"; - sha256 = "179c1k6xd1f1mjrdgx23jfhgn3y72qqwmpnx8pyw83gc8rcjgrzz"; - name = "dolphin-plugins-15.12.3.tar.xz"; - }; - }; - dragon = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/dragon-15.12.3.tar.xz"; - sha256 = "0hkm0w85w5bc1pfmbaz64kxcplpm9459ggpv9gfabgg3ydy3k8l7"; - name = "dragon-15.12.3.tar.xz"; - }; - }; - ffmpegthumbs = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ffmpegthumbs-15.12.3.tar.xz"; - sha256 = "1wkxz3xhmfafq52ws9i8401s0nacdh896xfin86ypfqb6dk94119"; - name = "ffmpegthumbs-15.12.3.tar.xz"; - }; - }; - filelight = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/filelight-15.12.3.tar.xz"; - sha256 = "1s31q8x2yywi2v8kql7zw5yz9r05v1509334kwlyyfz63zz54kgm"; - name = "filelight-15.12.3.tar.xz"; - }; - }; - gpgmepp = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/gpgmepp-15.12.3.tar.xz"; - sha256 = "1vrr3i5d9nfyvn5v1hn6rxi3hkw4gi1bj7plnd4fhbl3s4nfhlsp"; - name = "gpgmepp-15.12.3.tar.xz"; - }; - }; - granatier = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/granatier-15.12.3.tar.xz"; - sha256 = "1mjwgw4laxlkpy7zjd0jj7i2nq9mqpzzz048fw0swkndbh1ykrnc"; - name = "granatier-15.12.3.tar.xz"; - }; - }; - gwenview = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/gwenview-15.12.3.tar.xz"; - sha256 = "11wia3ljhwxfqbakiavi9b0h59fa2l5i1skgkbpnnglafj6j9dn9"; - name = "gwenview-15.12.3.tar.xz"; - }; - }; - jovie = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/jovie-15.12.3.tar.xz"; - sha256 = "07rmig3zfxhipf817gvphc68gm9zkliiwznw06z76zlpavcmmlgp"; - name = "jovie-15.12.3.tar.xz"; - }; - }; - juk = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/juk-15.12.3.tar.xz"; - sha256 = "1nbjv5vdxb3n5m213s7srfxh38y7bavvib9v4maabg84q84c4531"; - name = "juk-15.12.3.tar.xz"; - }; - }; - kaccessible = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kaccessible-15.12.3.tar.xz"; - sha256 = "0pg7jc7y6c8x246qyn0f9qdl38cg055bj4cfvnlp9bqkq69r4mw4"; - name = "kaccessible-15.12.3.tar.xz"; - }; - }; - kaccounts-integration = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kaccounts-integration-15.12.3.tar.xz"; - sha256 = "0l3x3fgj7wvhlzx73qi0qb8yhk305yw71jrv8x4vvaagw0ffmkb9"; - name = "kaccounts-integration-15.12.3.tar.xz"; - }; - }; - kaccounts-providers = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kaccounts-providers-15.12.3.tar.xz"; - sha256 = "0lmsv1296zgcrzlsidfwv4wlc6vdiaznbaw45xzfy6ki6yfldwc9"; - name = "kaccounts-providers-15.12.3.tar.xz"; - }; - }; - kajongg = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kajongg-15.12.3.tar.xz"; - sha256 = "13r7mgdmcv3ywn6ni7l1y9g021jrqga1lc9q4i4h4pi4ymc8vqn3"; - name = "kajongg-15.12.3.tar.xz"; - }; - }; - kalarmcal = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kalarmcal-15.12.3.tar.xz"; - sha256 = "15cby2615r420zzfx7h2fpb0vsmnrbrr1l62arx2vswpb694d0hi"; - name = "kalarmcal-15.12.3.tar.xz"; - }; - }; - kalgebra = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kalgebra-15.12.3.tar.xz"; - sha256 = "0da88b30yi0f5h2alysmd1z94bzb9006zbh7939sx1v4fwg8nvha"; - name = "kalgebra-15.12.3.tar.xz"; - }; - }; - kalzium = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kalzium-15.12.3.tar.xz"; - sha256 = "0lrca50kczjynhn7c9b2sls6pjr7f86k69yq7b7krf3xk59a1hm1"; - name = "kalzium-15.12.3.tar.xz"; - }; - }; - kamera = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kamera-15.12.3.tar.xz"; - sha256 = "1azzvdj0gmafjkq7w19ns1mxjm240p0yx7cpq9dqhz0hhyl63666"; - name = "kamera-15.12.3.tar.xz"; - }; - }; - kanagram = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kanagram-15.12.3.tar.xz"; - sha256 = "1adhc1f4hdrgc780v1yadhjpb1dbydwh1xzvgwpd953df7pfxzzj"; - name = "kanagram-15.12.3.tar.xz"; - }; - }; - kapman = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kapman-15.12.3.tar.xz"; - sha256 = "0iks3c18dqxds55fmf0fi93lbh14mfdhjh82xx4hc1fn9j8xhfw5"; - name = "kapman-15.12.3.tar.xz"; - }; - }; - kapptemplate = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kapptemplate-15.12.3.tar.xz"; - sha256 = "1d1z6j5w80cjs8ls6c44sn0wwa1z4nly9gkk6qr47j8265a1rqnx"; - name = "kapptemplate-15.12.3.tar.xz"; - }; - }; - kate = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kate-15.12.3.tar.xz"; - sha256 = "1yxqs6j41cpx4zws5hfs7j01gqn47b6inddifbwglrp5w9j33wpv"; - name = "kate-15.12.3.tar.xz"; - }; - }; - katomic = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/katomic-15.12.3.tar.xz"; - sha256 = "0ydflzaxfxbk4yb26j4yziywr72dijva5g3xi9car3b0hckvqpf0"; - name = "katomic-15.12.3.tar.xz"; - }; - }; - kblackbox = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kblackbox-15.12.3.tar.xz"; - sha256 = "1yzw61b62plad78wchids243x4lb5bzla3zrlmi3lv5q3g7imz0f"; - name = "kblackbox-15.12.3.tar.xz"; - }; - }; - kblocks = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kblocks-15.12.3.tar.xz"; - sha256 = "0hgmm4gyysn9k031im3xk7aiawavv4920y8xd44scxlcwxfid8cw"; - name = "kblocks-15.12.3.tar.xz"; - }; - }; - kblog = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kblog-15.12.3.tar.xz"; - sha256 = "01z3n0lzg9d6ygqn87yvi8wg6yyg5b8jhf96ywcmb5zzacamb2hq"; - name = "kblog-15.12.3.tar.xz"; - }; - }; - kbounce = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kbounce-15.12.3.tar.xz"; - sha256 = "1gbks7hyis7czvvvqb53qwfkbzmlwg85d51m5mg1m54qixq4blq9"; - name = "kbounce-15.12.3.tar.xz"; - }; - }; - kbreakout = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kbreakout-15.12.3.tar.xz"; - sha256 = "01d7i3ga4sdgvvyl4s77i9x15f80nbh3kcqmwmrj511icvynzkl8"; - name = "kbreakout-15.12.3.tar.xz"; - }; - }; - kbruch = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kbruch-15.12.3.tar.xz"; - sha256 = "1y4dipifj3dz78y6h7852840msg80iwix427l6wxb8ybyzhapmz1"; - name = "kbruch-15.12.3.tar.xz"; - }; - }; - kcachegrind = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcachegrind-15.12.3.tar.xz"; - sha256 = "0zprqhzqlhgvw3fyvqs4cdkmxgibw8l8i15ng6badnmdyi5dkz29"; - name = "kcachegrind-15.12.3.tar.xz"; - }; - }; - kcalc = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcalc-15.12.3.tar.xz"; - sha256 = "00138746j1j92dkc22c680wi9qqc891040d2b0i5fi1hp1a3z2r4"; - name = "kcalc-15.12.3.tar.xz"; - }; - }; - kcalcore = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcalcore-15.12.3.tar.xz"; - sha256 = "1zdkqxli6gr65947xgwsbyl84ar0px6flbky0zjy1i4h9jiysfan"; - name = "kcalcore-15.12.3.tar.xz"; - }; - }; - kcalutils = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcalutils-15.12.3.tar.xz"; - sha256 = "0l65bc71i734j700akkr1ksjv5q09f7v2dfqcnciabqiphchr5cd"; - name = "kcalutils-15.12.3.tar.xz"; - }; - }; - kcharselect = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcharselect-15.12.3.tar.xz"; - sha256 = "0ahk95k0vssk7kdsdddz1s1n3hzy4049s0dq4j5kiill3j5z47ba"; - name = "kcharselect-15.12.3.tar.xz"; - }; - }; - kcolorchooser = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcolorchooser-15.12.3.tar.xz"; - sha256 = "0paki5clb420w8fhx9y9cyxrf86nz1bp5w6jgkyk5fqdw69d77wk"; - name = "kcolorchooser-15.12.3.tar.xz"; - }; - }; - kcontacts = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcontacts-15.12.3.tar.xz"; - sha256 = "0xavlrf2zxvizv1w620w2wp46qx1267df7qilmws50qmyzdzd8pz"; - name = "kcontacts-15.12.3.tar.xz"; - }; - }; - kcron = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kcron-15.12.3.tar.xz"; - sha256 = "1dwcqng0128n2d9lk059b94vzyn98xm0yx34wp5qibqg8c7a2z0z"; - name = "kcron-15.12.3.tar.xz"; - }; - }; - kde-baseapps = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-baseapps-15.12.3.tar.xz"; - sha256 = "1rqdbv5lhy7k8i4csp1lqvril7df12lz9vvjqnq7ccbbn67yjcfk"; - name = "kde-baseapps-15.12.3.tar.xz"; - }; - }; - kdebugsettings = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdebugsettings-15.12.3.tar.xz"; - sha256 = "1ik2j2i9k3rcfznwia9fxbivsva2ngb31wzrdciircl6i55k4sdd"; - name = "kdebugsettings-15.12.3.tar.xz"; - }; - }; - kde-dev-scripts = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-dev-scripts-15.12.3.tar.xz"; - sha256 = "0cvcd2yv0xkk0q6zhpyqv0bjnpy6s09aw3kjjyyq5ddai5m5hp4q"; - name = "kde-dev-scripts-15.12.3.tar.xz"; - }; - }; - kde-dev-utils = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-dev-utils-15.12.3.tar.xz"; - sha256 = "1k0d7z7rm6dgzy56dggxjwzzhz9ar2wfmvjs257l6lbjxxxry2gc"; - name = "kde-dev-utils-15.12.3.tar.xz"; - }; - }; - kdeedu-data = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdeedu-data-15.12.3.tar.xz"; - sha256 = "18jssqnkjxxz98rmzd4gv0ix1zbb60qv22k150lqp32kckmgkn0y"; - name = "kdeedu-data-15.12.3.tar.xz"; - }; - }; - kdegraphics-mobipocket = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-mobipocket-15.12.3.tar.xz"; - sha256 = "05fhnh2qs1mgz1hfdvqb5dfd4h2vsz00hb2vl902qprnsjlpc6fb"; - name = "kdegraphics-mobipocket-15.12.3.tar.xz"; - }; - }; - kdegraphics-strigi-analyzer = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-strigi-analyzer-15.12.3.tar.xz"; - sha256 = "1bfxmv9pxxd5w2ppm673sdg459w04493p7lp8rwd3n7aa5dhw5fp"; - name = "kdegraphics-strigi-analyzer-15.12.3.tar.xz"; - }; - }; - kdegraphics-thumbnailers = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-thumbnailers-15.12.3.tar.xz"; - sha256 = "1limkjpdd8n8hcj3ysr3zwa0fyydfjb1m5rl9lwb9mb08bl5qg70"; - name = "kdegraphics-thumbnailers-15.12.3.tar.xz"; - }; - }; - kde-l10n-ar = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ar-15.12.3.tar.xz"; - sha256 = "1s1xi98zk277rkfiip568712yammb30ld828rspxrl51ysqaj6gs"; - name = "kde-l10n-ar-15.12.3.tar.xz"; - }; - }; - kde-l10n-bg = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bg-15.12.3.tar.xz"; - sha256 = "19yz3x4f2mkqfpa37gzgkqmmka1xs5fnr54w7w0lz7scmi3pfqyp"; - name = "kde-l10n-bg-15.12.3.tar.xz"; - }; - }; - kde-l10n-bs = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bs-15.12.3.tar.xz"; - sha256 = "1k8kawr0psvlg6cgryqwwjb59g209bz08n8h7jg5h6vkb784v3bb"; - name = "kde-l10n-bs-15.12.3.tar.xz"; - }; - }; - kde-l10n-ca = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca-15.12.3.tar.xz"; - sha256 = "0hf6cml2hw5mj5iwa5cbp56a6ns3qzy21c0c167p6yp2i6kshzcb"; - name = "kde-l10n-ca-15.12.3.tar.xz"; - }; - }; - kde-l10n-ca_valencia = { - version = "ca_valencia-15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca@valencia-15.12.3.tar.xz"; - sha256 = "0ibamck48cklkx6pjvcyw9bjfwnzib82822pagwrzgrr3g51djgf"; - name = "kde-l10n-ca_valencia-15.12.3.tar.xz"; - }; - }; - kde-l10n-cs = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-cs-15.12.3.tar.xz"; - sha256 = "1vp1aisfp0qw94w1kn66sxa79askj8yqn70adhf6q37rc8x3hz6z"; - name = "kde-l10n-cs-15.12.3.tar.xz"; - }; - }; - kde-l10n-da = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-da-15.12.3.tar.xz"; - sha256 = "0z7p992xinf0hw646mp5bgi93890kivs8kn407m1m4m0334m687c"; - name = "kde-l10n-da-15.12.3.tar.xz"; - }; - }; - kde-l10n-de = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-de-15.12.3.tar.xz"; - sha256 = "0f2z6qpv6qzajmh91skqbx6vn14ih74r3yzavj9xwzw940apiw34"; - name = "kde-l10n-de-15.12.3.tar.xz"; - }; - }; - kde-l10n-el = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-el-15.12.3.tar.xz"; - sha256 = "0pdx8zlv2vv33iq2581yl67c3ly37s7hhg3m9lnnlm3wnybj658r"; - name = "kde-l10n-el-15.12.3.tar.xz"; - }; - }; - kde-l10n-en_GB = { - version = "en_GB-15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-en_GB-15.12.3.tar.xz"; - sha256 = "041hwzh05ryqkzll6klva9cq7n0mcyqi8b7pgx0argkc68mn123y"; - name = "kde-l10n-en_GB-15.12.3.tar.xz"; - }; - }; - kde-l10n-eo = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eo-15.12.3.tar.xz"; - sha256 = "1nrrk5a9m15xyj97shpxwnw4vjnafmwh25mq8906z150mr8fy4na"; - name = "kde-l10n-eo-15.12.3.tar.xz"; - }; - }; - kde-l10n-es = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-es-15.12.3.tar.xz"; - sha256 = "0bhws59jd9vbfdy7kv8d7gpsg5a39z4jkypd3pyqk98v0ahxlj5p"; - name = "kde-l10n-es-15.12.3.tar.xz"; - }; - }; - kde-l10n-et = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-et-15.12.3.tar.xz"; - sha256 = "0lafw4b9qdfy091w5dvhp9idn29p7in05p8jlvpa39v2cxmp271q"; - name = "kde-l10n-et-15.12.3.tar.xz"; - }; - }; - kde-l10n-eu = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eu-15.12.3.tar.xz"; - sha256 = "0p7lrd3k3mjxnhk4mr1p6znjp8j14xr93lg83s3v90w4vd34frsz"; - name = "kde-l10n-eu-15.12.3.tar.xz"; - }; - }; - kde-l10n-fa = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fa-15.12.3.tar.xz"; - sha256 = "0gzx0bz9gv4kwd89ryny9qf4d7fjvicai54ryk3z3qibs3sy3g66"; - name = "kde-l10n-fa-15.12.3.tar.xz"; - }; - }; - kde-l10n-fi = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fi-15.12.3.tar.xz"; - sha256 = "1nh79mkcn5la6wnbpclcbcg6gia6srcv87462wax4sbhmz7b3gh8"; - name = "kde-l10n-fi-15.12.3.tar.xz"; - }; - }; - kde-l10n-fr = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fr-15.12.3.tar.xz"; - sha256 = "1gwwc596p6mqjbjlhcz57hkc30slb5r3qgmnm5x68jlp4glhyyfm"; - name = "kde-l10n-fr-15.12.3.tar.xz"; - }; - }; - kde-l10n-ga = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ga-15.12.3.tar.xz"; - sha256 = "134r2i4f6j2db24rlc2y50da98spjwv5crd3yw27k4m2whw28g1q"; - name = "kde-l10n-ga-15.12.3.tar.xz"; - }; - }; - kde-l10n-gl = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-gl-15.12.3.tar.xz"; - sha256 = "1bpki1gk1gc5rqrrwkhil44mxmh76v5fygwvvlglk7rwyxkm0bfn"; - name = "kde-l10n-gl-15.12.3.tar.xz"; - }; - }; - kde-l10n-he = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-he-15.12.3.tar.xz"; - sha256 = "12da700i3dbim64f5ybgfp5s8rky8s9828qklsnvrw6gj9i1qdh8"; - name = "kde-l10n-he-15.12.3.tar.xz"; - }; - }; - kde-l10n-hi = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hi-15.12.3.tar.xz"; - sha256 = "0r5z5652j52j16gdb08z1wnfa8vr871f7msip2xikmfm3kcgiwki"; - name = "kde-l10n-hi-15.12.3.tar.xz"; - }; - }; - kde-l10n-hr = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hr-15.12.3.tar.xz"; - sha256 = "1mz95pqd3pslg1f5cl1n8s35j19wijhhqpa64m6ahjm82p3dfqiz"; - name = "kde-l10n-hr-15.12.3.tar.xz"; - }; - }; - kde-l10n-hu = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hu-15.12.3.tar.xz"; - sha256 = "0gz3lvzpf58j0jdzmjg16nkz3078gjzlfwbanx5w6f4dfqp9ha4q"; - name = "kde-l10n-hu-15.12.3.tar.xz"; - }; - }; - kde-l10n-ia = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ia-15.12.3.tar.xz"; - sha256 = "0flv662j20sqfd0cgy2p6wr2fk41sq47sxf2gkbmhr7n7n6an1fr"; - name = "kde-l10n-ia-15.12.3.tar.xz"; - }; - }; - kde-l10n-id = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-id-15.12.3.tar.xz"; - sha256 = "07r4y1hnqz3xb649gvp818alwzyci8657fi4f3lpj8z54dngddx0"; - name = "kde-l10n-id-15.12.3.tar.xz"; - }; - }; - kde-l10n-is = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-is-15.12.3.tar.xz"; - sha256 = "14xs3n9468l4qgw5bpm57k4xmh37ixjr3sq370fbfmbrifrydrsb"; - name = "kde-l10n-is-15.12.3.tar.xz"; - }; - }; - kde-l10n-it = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-it-15.12.3.tar.xz"; - sha256 = "0arvj4ms0qc283i1xqdmh6x8qjgjfsld57y341xk55b1birq87dp"; - name = "kde-l10n-it-15.12.3.tar.xz"; - }; - }; - kde-l10n-ja = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ja-15.12.3.tar.xz"; - sha256 = "1fby4r9aam0f31xlp00lmnhi156wfb3rbvwffvhm9qwam3gnypv2"; - name = "kde-l10n-ja-15.12.3.tar.xz"; - }; - }; - kde-l10n-kk = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-kk-15.12.3.tar.xz"; - sha256 = "04yf8m84ywf6bzq3dfxxxcgz2syy4i72q5xjq3sba76p1w9wz8hf"; - name = "kde-l10n-kk-15.12.3.tar.xz"; - }; - }; - kde-l10n-km = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-km-15.12.3.tar.xz"; - sha256 = "0q70agf08ln5xfg4hc0rw39qiq4mn0jq418d8f53qkdjvrj07hs2"; - name = "kde-l10n-km-15.12.3.tar.xz"; - }; - }; - kde-l10n-ko = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ko-15.12.3.tar.xz"; - sha256 = "0545nv721g2xlljv1jbq42j9b6g2l19yclv0lmy07dp0fx0ms2kc"; - name = "kde-l10n-ko-15.12.3.tar.xz"; - }; - }; - kde-l10n-lt = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lt-15.12.3.tar.xz"; - sha256 = "0sc9g2iya3k4pzwmlcjlyvf25dag9z2ckbk2gz0fzzrwgvn61875"; - name = "kde-l10n-lt-15.12.3.tar.xz"; - }; - }; - kde-l10n-lv = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lv-15.12.3.tar.xz"; - sha256 = "0mllwxbcvfgvmxcv23azchkvirlamgh16hzi5575qd8mprxxayjx"; - name = "kde-l10n-lv-15.12.3.tar.xz"; - }; - }; - kde-l10n-mr = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-mr-15.12.3.tar.xz"; - sha256 = "1sg9s1d6yg6pjjqp986lixg5w8g3y9a0hi15iyv6iww2iwab821w"; - name = "kde-l10n-mr-15.12.3.tar.xz"; - }; - }; - kde-l10n-nb = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nb-15.12.3.tar.xz"; - sha256 = "0841zkw34afiq7kpl65mjxl66fvb7pbc2m5c7cbbpykb92hqy4gw"; - name = "kde-l10n-nb-15.12.3.tar.xz"; - }; - }; - kde-l10n-nds = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nds-15.12.3.tar.xz"; - sha256 = "1y0svbp1fgr6azfqpicvfxz1bbfkkn27l91rl8mhpaqz79zmdsjz"; - name = "kde-l10n-nds-15.12.3.tar.xz"; - }; - }; - kde-l10n-nl = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nl-15.12.3.tar.xz"; - sha256 = "0l2l0hypza8hrrz86pahvkn4qdwg1bzdsv4mk0w3f8anlfv5nlhy"; - name = "kde-l10n-nl-15.12.3.tar.xz"; - }; - }; - kde-l10n-nn = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nn-15.12.3.tar.xz"; - sha256 = "1ryqkbjrc9fam4wlpfx3af5mppajcpf4qj6ghh16y2vjpxmy6226"; - name = "kde-l10n-nn-15.12.3.tar.xz"; - }; - }; - kde-l10n-pa = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pa-15.12.3.tar.xz"; - sha256 = "0dq0sv7yh8xkk5g005q8mh6c5drzp2alday28lz2i4a2wi6m1pbn"; - name = "kde-l10n-pa-15.12.3.tar.xz"; - }; - }; - kde-l10n-pl = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pl-15.12.3.tar.xz"; - sha256 = "186lb0ydgcgwmpjasdjnj1i6cn43m1l26lvh7c97kqmh0k7ixwbl"; - name = "kde-l10n-pl-15.12.3.tar.xz"; - }; - }; - kde-l10n-pt = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt-15.12.3.tar.xz"; - sha256 = "1s71gn3xb98y5s6ly9qfjh51afk8w8ml3xqiri3vi1c7li3v6kas"; - name = "kde-l10n-pt-15.12.3.tar.xz"; - }; - }; - kde-l10n-pt_BR = { - version = "pt_BR-15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt_BR-15.12.3.tar.xz"; - sha256 = "1iq83ycsilracwa1cml7dliy6vsf7frk4k0rzawnprygnf89iavr"; - name = "kde-l10n-pt_BR-15.12.3.tar.xz"; - }; - }; - kde-l10n-ro = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ro-15.12.3.tar.xz"; - sha256 = "1i4kmxjc9mr8ybg4gnbhdanp7s5illknaxh0av8v45an7j051vjd"; - name = "kde-l10n-ro-15.12.3.tar.xz"; - }; - }; - kde-l10n-ru = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ru-15.12.3.tar.xz"; - sha256 = "1xbd5nvyf6ckdry0c5d52s3qrnqbnmndbnbxz7ayqllz6b61vmp0"; - name = "kde-l10n-ru-15.12.3.tar.xz"; - }; - }; - kde-l10n-sk = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sk-15.12.3.tar.xz"; - sha256 = "03i2ngldf35ix4pgyv6pjjzfg4i330dmyml9rd9v6cspm0vpq7r2"; - name = "kde-l10n-sk-15.12.3.tar.xz"; - }; - }; - kde-l10n-sl = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sl-15.12.3.tar.xz"; - sha256 = "08cp9dzvii5afjck3wx05q7mjwsd10g1yg2bsxw4qldjzad31xhq"; - name = "kde-l10n-sl-15.12.3.tar.xz"; - }; - }; - kde-l10n-sr = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sr-15.12.3.tar.xz"; - sha256 = "0j8gfj1qx10yllj5vq85h4pw2l8hq1kimgm315v4wwyr4jyf4vi7"; - name = "kde-l10n-sr-15.12.3.tar.xz"; - }; - }; - kde-l10n-sv = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sv-15.12.3.tar.xz"; - sha256 = "0ijyxzm7akcpkf5vwppay063vkbn6rz8irc4yi9flc5mm1rpmb64"; - name = "kde-l10n-sv-15.12.3.tar.xz"; - }; - }; - kde-l10n-tr = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-tr-15.12.3.tar.xz"; - sha256 = "1yyz8zf10jn8v5vz2h08m88l12gz95hsdvld4h8imbqc4b8ih9xh"; - name = "kde-l10n-tr-15.12.3.tar.xz"; - }; - }; - kde-l10n-ug = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ug-15.12.3.tar.xz"; - sha256 = "0db4pf7j6m376irsby31qz42z4d0m45i1zhqmn5mplrq8hi3sy5n"; - name = "kde-l10n-ug-15.12.3.tar.xz"; - }; - }; - kde-l10n-uk = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-uk-15.12.3.tar.xz"; - sha256 = "0xsn75g7dw8p0gxfmk2xkr6cix5wvglj2hhbbcqdzixm0bnshiwj"; - name = "kde-l10n-uk-15.12.3.tar.xz"; - }; - }; - kde-l10n-wa = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-wa-15.12.3.tar.xz"; - sha256 = "1zx5k0hnh17015c1jcf3hgbi3abnsrdr5zl9m06lvsccl32rcgla"; - name = "kde-l10n-wa-15.12.3.tar.xz"; - }; - }; - kde-l10n-zh_CN = { - version = "zh_CN-15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_CN-15.12.3.tar.xz"; - sha256 = "0lfm6q4xk5c5rywivhg6dbs5dczddixz4jjfdz5gb2xmnv5ns9z7"; - name = "kde-l10n-zh_CN-15.12.3.tar.xz"; - }; - }; - kde-l10n-zh_TW = { - version = "zh_TW-15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_TW-15.12.3.tar.xz"; - sha256 = "1s0gp678sq6zxk9gkzhmkx1c0nxzx0n08pszv737a76lnnzg0fb0"; - name = "kde-l10n-zh_TW-15.12.3.tar.xz"; - }; - }; - kdelibs = { - version = "4.14.18"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdelibs-4.14.18.tar.xz"; - sha256 = "0qyfsci3z4vm79c5xkdk45qlh63as1iyfdgk3iny6q9c5wwqd3kp"; - name = "kdelibs-4.14.18.tar.xz"; - }; - }; - kdenetwork-filesharing = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdenetwork-filesharing-15.12.3.tar.xz"; - sha256 = "0psln12gnyf7pp6r01p7bi5lygqpg5frfkc8hh1wn982i1vbkn8s"; - name = "kdenetwork-filesharing-15.12.3.tar.xz"; - }; - }; - kdenetwork-strigi-analyzers = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdenetwork-strigi-analyzers-15.12.3.tar.xz"; - sha256 = "0yisyhic3nmbj7a0csjafhl3mjcg3hqa8pwfrkwwm848b67n9qls"; - name = "kdenetwork-strigi-analyzers-15.12.3.tar.xz"; - }; - }; - kdenlive = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdenlive-15.12.3.tar.xz"; - sha256 = "0svw8dms0qha4mbnyldm0cwvy52ikly3x26b9q8psayjd0pbbb5p"; - name = "kdenlive-15.12.3.tar.xz"; - }; - }; - kdepim = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdepim-15.12.3.tar.xz"; - sha256 = "0niy2wfrarnrphwwi6jp2g0xj5dbvvcmdjgprdrw3zn7ni7kxa9q"; - name = "kdepim-15.12.3.tar.xz"; - }; - }; - kdepimlibs = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdepimlibs-15.12.3.tar.xz"; - sha256 = "17dn4yals62657dnx5adm9622z5bmwzl2nqgidcvflamvnvjj2b1"; - name = "kdepimlibs-15.12.3.tar.xz"; - }; - }; - kdepim-runtime = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdepim-runtime-15.12.3.tar.xz"; - sha256 = "1ljsn2b5ylzsr8mm48l4k84bgc9d6h9ilv46zgiciisgqs0xd4y3"; - name = "kdepim-runtime-15.12.3.tar.xz"; - }; - }; - kde-runtime = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kde-runtime-15.12.3.tar.xz"; - sha256 = "097h9kjqikr4qxj6swkh2r90havaw6zxs12kkic0qkmvbxxa6qdj"; - name = "kde-runtime-15.12.3.tar.xz"; - }; - }; - kdesdk-kioslaves = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdesdk-kioslaves-15.12.3.tar.xz"; - sha256 = "0605aldqng33cd44qap2bargsf99jlrclsw84pv2hh4m33qlxkhi"; - name = "kdesdk-kioslaves-15.12.3.tar.xz"; - }; - }; - kdesdk-strigi-analyzers = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdesdk-strigi-analyzers-15.12.3.tar.xz"; - sha256 = "0jc2dvnpmr6hw58nfmnw7lmys74zgl0m5vbmp27vkain95wab17c"; - name = "kdesdk-strigi-analyzers-15.12.3.tar.xz"; - }; - }; - kdesdk-thumbnailers = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdesdk-thumbnailers-15.12.3.tar.xz"; - sha256 = "0k67zx5c2qsrk3nnnrs5ir0z8c42lp4ig9l82brv35iw3frgfyr9"; - name = "kdesdk-thumbnailers-15.12.3.tar.xz"; - }; - }; - kdewebdev = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdewebdev-15.12.3.tar.xz"; - sha256 = "1hn0s72695mm7b3lqx45d2rbm639p3la1v95274il8nd6qnxfd1h"; - name = "kdewebdev-15.12.3.tar.xz"; - }; - }; - kdf = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdf-15.12.3.tar.xz"; - sha256 = "0h37405qiz5478fdm8k7h5hmpmznzrrb6a55grcc9jnp4qxqhdk7"; - name = "kdf-15.12.3.tar.xz"; - }; - }; - kdiamond = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kdiamond-15.12.3.tar.xz"; - sha256 = "1p5a26dw4sasfk0bmf79zwcp60s4wqk65169vn73nn51dkyplr0z"; - name = "kdiamond-15.12.3.tar.xz"; - }; - }; - kfloppy = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kfloppy-15.12.3.tar.xz"; - sha256 = "1dsnv89n48aj1pcx6r64ds9pkafb0d8gpmw8ps0mhiwyhzjik0af"; - name = "kfloppy-15.12.3.tar.xz"; - }; - }; - kfourinline = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kfourinline-15.12.3.tar.xz"; - sha256 = "1j0yhwwsr6kxynhyj8m9bwckz49rp33y8b7br8s4i186byjviw6f"; - name = "kfourinline-15.12.3.tar.xz"; - }; - }; - kgeography = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kgeography-15.12.3.tar.xz"; - sha256 = "19sqrgj08ilf43za4l1apz5whpnxhy9aafygxnklyl6xwkldfa56"; - name = "kgeography-15.12.3.tar.xz"; - }; - }; - kget = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kget-15.12.3.tar.xz"; - sha256 = "0ks210pxs4phrc0k05zaf0ip91yzg5xycfdac1rz4snn3wd5x8x5"; - name = "kget-15.12.3.tar.xz"; - }; - }; - kgoldrunner = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kgoldrunner-15.12.3.tar.xz"; - sha256 = "19pvabs8fbzq6j9l8v2bdvz8rbzhmav14hymxf0fndg3b5qi1v46"; - name = "kgoldrunner-15.12.3.tar.xz"; - }; - }; - kgpg = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kgpg-15.12.3.tar.xz"; - sha256 = "1fw74kpd8f2hm82l2sn8nvi4dzrw1i2xgd5dkfhj1c8frnp4akrn"; - name = "kgpg-15.12.3.tar.xz"; - }; - }; - khangman = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/khangman-15.12.3.tar.xz"; - sha256 = "1a0jbg0xfnjji1y946d8c1dmm8awdf6j4r3w226fmci2q764ap4l"; - name = "khangman-15.12.3.tar.xz"; - }; - }; - kholidays = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kholidays-15.12.3.tar.xz"; - sha256 = "1hr253vc5r3fq2vkrl175zql8z146h5zpikq6wlxabh86isri07b"; - name = "kholidays-15.12.3.tar.xz"; - }; - }; - kidentitymanagement = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kidentitymanagement-15.12.3.tar.xz"; - sha256 = "16v4ykbgiw06xdrd74gnjhwlvdjs926zdfmnn1gzhf2isyz0c4jp"; - name = "kidentitymanagement-15.12.3.tar.xz"; - }; - }; - kig = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kig-15.12.3.tar.xz"; - sha256 = "12wf10d9579jhygrch4avacnxkhrmiyp2ci3kccyvva09cjdahpb"; - name = "kig-15.12.3.tar.xz"; - }; - }; - kigo = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kigo-15.12.3.tar.xz"; - sha256 = "15n6chq4mjynh5b4g2mbk1qjmgxlfzln5fl19i6qi11xd5yanz50"; - name = "kigo-15.12.3.tar.xz"; - }; - }; - killbots = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/killbots-15.12.3.tar.xz"; - sha256 = "14mlmi958sz3nf5l1v2mq5ahfiqnb3m9a32hqfz2d5vzczrvarxv"; - name = "killbots-15.12.3.tar.xz"; - }; - }; - kimap = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kimap-15.12.3.tar.xz"; - sha256 = "1qk68zjw31hfxr577idn2rirmb8pwxxqcwz56jg9kc6mxff6k2sw"; - name = "kimap-15.12.3.tar.xz"; - }; - }; - kio-extras = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kio-extras-15.12.3.tar.xz"; - sha256 = "1lhg5g9fmfsg7yl0kzi779wilgcfdcx0zhzryqz307dhmvbffs87"; - name = "kio-extras-15.12.3.tar.xz"; - }; - }; - kiriki = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kiriki-15.12.3.tar.xz"; - sha256 = "0bff99yxlaqa46d5mgv6qnscyhidbi6kg0zb10b7jl4wr60d1gkm"; - name = "kiriki-15.12.3.tar.xz"; - }; - }; - kiten = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kiten-15.12.3.tar.xz"; - sha256 = "067lcpgp3kc4rl2zz4a8rrm0pdgwsm8fwvrzay4dpghwznkmr7s5"; - name = "kiten-15.12.3.tar.xz"; - }; - }; - kjumpingcube = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kjumpingcube-15.12.3.tar.xz"; - sha256 = "1b6bsp7vmnik1119yx7vgsgn55pz250mqd5fmqxi9khllz1alsh1"; - name = "kjumpingcube-15.12.3.tar.xz"; - }; - }; - kldap = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kldap-15.12.3.tar.xz"; - sha256 = "18rdad71x5h4710bq9b0207rsfnlb7jqriv5zp8qmiz3zf04jwvc"; - name = "kldap-15.12.3.tar.xz"; - }; - }; - klettres = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/klettres-15.12.3.tar.xz"; - sha256 = "1a89w5r1in86k101qjg40q32c5rcgp4fbcydysa40knawnryfd1c"; - name = "klettres-15.12.3.tar.xz"; - }; - }; - klickety = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/klickety-15.12.3.tar.xz"; - sha256 = "1sa3ilz14y1hd7m2czdqsrc5ih2a9gq8a26xh7wy1g4w32c59qp2"; - name = "klickety-15.12.3.tar.xz"; - }; - }; - klines = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/klines-15.12.3.tar.xz"; - sha256 = "1w8vni5m1j2ac6c72z5g6jdd6qml4jqn140a6i8sb5jkr6b8ccwb"; - name = "klines-15.12.3.tar.xz"; - }; - }; - kmag = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmag-15.12.3.tar.xz"; - sha256 = "0ng6rz93hxpzyk9gj91hjlpf7phpcg88wvn00d8f7ddfy0fydnaa"; - name = "kmag-15.12.3.tar.xz"; - }; - }; - kmahjongg = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmahjongg-15.12.3.tar.xz"; - sha256 = "0d6zcyf7l98albi7ikpb16wglvbvh4c2x0y4rpzwy6pbskkmvapd"; - name = "kmahjongg-15.12.3.tar.xz"; - }; - }; - kmailtransport = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmailtransport-15.12.3.tar.xz"; - sha256 = "1p5qkk8qz6072yr6f9gzhzpk05qny8zxaiyaghc9vgh0dq2zpsyq"; - name = "kmailtransport-15.12.3.tar.xz"; - }; - }; - kmbox = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmbox-15.12.3.tar.xz"; - sha256 = "0p2zbxd2my1z48i5xr2nb9fnzqjnvgpfc8m7klp2b443lgmnwg3v"; - name = "kmbox-15.12.3.tar.xz"; - }; - }; - kmime = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmime-15.12.3.tar.xz"; - sha256 = "1as3pql5gxqf9m36qxl78cfzcjxwf41l57b7w9wy4p5wi1izdmba"; - name = "kmime-15.12.3.tar.xz"; - }; - }; - kmines = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmines-15.12.3.tar.xz"; - sha256 = "01090mwigxx5lwrzywnq8qwxqflylrf807rfjqa0s4na9qx2v682"; - name = "kmines-15.12.3.tar.xz"; - }; - }; - kmix = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmix-15.12.3.tar.xz"; - sha256 = "16yrfgg3cvjbypmz6p8zqsvp2qdihlq4d68w46f0m9gnm4dmywf1"; - name = "kmix-15.12.3.tar.xz"; - }; - }; - kmousetool = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmousetool-15.12.3.tar.xz"; - sha256 = "171lcfwrkbfwhvdfi7y2xprv6fb6xn5yd6zi3ifyka1jgl0z3nr8"; - name = "kmousetool-15.12.3.tar.xz"; - }; - }; - kmouth = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmouth-15.12.3.tar.xz"; - sha256 = "1fdgrpv7nqpfcrq5p2d22ysanj3fmwxy1lb2hxy75k1f051jyzvr"; - name = "kmouth-15.12.3.tar.xz"; - }; - }; - kmplot = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kmplot-15.12.3.tar.xz"; - sha256 = "1wxw65chz8ibf0ad6262qpr1761kx8k7mdin5wmiczakwkkpn7r1"; - name = "kmplot-15.12.3.tar.xz"; - }; - }; - knavalbattle = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/knavalbattle-15.12.3.tar.xz"; - sha256 = "1ma4dvrprlb0rdfq2iy56cvgfv6skm32yv6lk5vbqnp3mw7amyjz"; - name = "knavalbattle-15.12.3.tar.xz"; - }; - }; - knetwalk = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/knetwalk-15.12.3.tar.xz"; - sha256 = "1iqvp9pmiav0w03p0xfri7l0dx0h97283pyz6xhfmffvi5vsr1zn"; - name = "knetwalk-15.12.3.tar.xz"; - }; - }; - kolf = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kolf-15.12.3.tar.xz"; - sha256 = "0ky9bn8kgirm2shg1vc98q91ab8rx14fm2i4ammx3hjh6qp043hb"; - name = "kolf-15.12.3.tar.xz"; - }; - }; - kollision = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kollision-15.12.3.tar.xz"; - sha256 = "0y2bmw2h2big65arfhg8vhppglvw8xf5acmgbx37mnds3pxwqaw1"; - name = "kollision-15.12.3.tar.xz"; - }; - }; - kolourpaint = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kolourpaint-15.12.3.tar.xz"; - sha256 = "15ws4hyyq2shygblyp9dvq7dln61dpi3g0frxbxwkk8p3iznwsbw"; - name = "kolourpaint-15.12.3.tar.xz"; - }; - }; - kompare = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kompare-15.12.3.tar.xz"; - sha256 = "0lvrhkmdhb74akby2js1hd6avmc5a5w7h2cbb7yw658zmg2xq0lq"; - name = "kompare-15.12.3.tar.xz"; - }; - }; - konquest = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/konquest-15.12.3.tar.xz"; - sha256 = "1vgcqmw84ybly4hv8r33jdj0x8dpnfzdl2n7rqxvmb9ma12lc2wy"; - name = "konquest-15.12.3.tar.xz"; - }; - }; - konsole = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/konsole-15.12.3.tar.xz"; - sha256 = "1n2zv07hj53yq7msgh2r824c6r9gbvki57njn4c7vpx5fzyiwmjk"; - name = "konsole-15.12.3.tar.xz"; - }; - }; - kontactinterface = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kontactinterface-15.12.3.tar.xz"; - sha256 = "0cgb79nmifajs3088pp5qvcbc970grx2irpfdy2nvh451g53jagf"; - name = "kontactinterface-15.12.3.tar.xz"; - }; - }; - kopete = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kopete-15.12.3.tar.xz"; - sha256 = "1r8v6l83avyygpw3yjni7bx01jhsnhq41c89c9g800qzl1zy67f8"; - name = "kopete-15.12.3.tar.xz"; - }; - }; - kpat = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kpat-15.12.3.tar.xz"; - sha256 = "028vx550fkzqnk4dmkkrmicpr8k8yx9alj6da04p2y8ans70v7q4"; - name = "kpat-15.12.3.tar.xz"; - }; - }; - kpimtextedit = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kpimtextedit-15.12.3.tar.xz"; - sha256 = "0jyiwjwz62dk746707z9fs3q0bw6xbz6kg2h92m85060db18vkl5"; - name = "kpimtextedit-15.12.3.tar.xz"; - }; - }; - kppp = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kppp-15.12.3.tar.xz"; - sha256 = "17609g9npn8y3wr6zfq00raifw61qmc6qqn0j6mvn47d4942c1zp"; - name = "kppp-15.12.3.tar.xz"; - }; - }; - kqtquickcharts = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kqtquickcharts-15.12.3.tar.xz"; - sha256 = "1lyx8m02xqjc8l65plwm12wdyqbspg5qr9hr1wlj6x711amjp7m4"; - name = "kqtquickcharts-15.12.3.tar.xz"; - }; - }; - krdc = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/krdc-15.12.3.tar.xz"; - sha256 = "0j05p5j99bbldcnzwd0dqshry7pgb5v2jp2jqg390vfmqmx438sd"; - name = "krdc-15.12.3.tar.xz"; - }; - }; - kremotecontrol = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kremotecontrol-15.12.3.tar.xz"; - sha256 = "1yjjb6agh1i3axj82g4zsaygm2x39x1bnq90aiplxn84gh98cnfd"; - name = "kremotecontrol-15.12.3.tar.xz"; - }; - }; - kreversi = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kreversi-15.12.3.tar.xz"; - sha256 = "09h1pi4kccy0k0m0zifdlys89j2ybsa9xwp8aqzyifbqi7s874cs"; - name = "kreversi-15.12.3.tar.xz"; - }; - }; - krfb = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/krfb-15.12.3.tar.xz"; - sha256 = "1a6ddsjr26lwk7d7isna8shnzciyqghad9nhzn5jgqc56v13hg1m"; - name = "krfb-15.12.3.tar.xz"; - }; - }; - kross-interpreters = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kross-interpreters-15.12.3.tar.xz"; - sha256 = "14g1mp0izqqllr75vlbi9yn6awn77zasb42zppqxq1rl11bwp2li"; - name = "kross-interpreters-15.12.3.tar.xz"; - }; - }; - kruler = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kruler-15.12.3.tar.xz"; - sha256 = "0i9f2ck55p87npk7xsqgi5zy0a9yiiv4razjdfj7fh8g78xj51yk"; - name = "kruler-15.12.3.tar.xz"; - }; - }; - ksaneplugin = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ksaneplugin-15.12.3.tar.xz"; - sha256 = "0834p0lfbf7l8lknxr0rz1w8j688dld36nyrz6pfk00h06an59h5"; - name = "ksaneplugin-15.12.3.tar.xz"; - }; - }; - kscd = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kscd-15.12.3.tar.xz"; - sha256 = "0d82di7sg9mypxk7s24yldjjgwymi2yxwjhai67337wn6ivvw338"; - name = "kscd-15.12.3.tar.xz"; - }; - }; - kshisen = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kshisen-15.12.3.tar.xz"; - sha256 = "0aqz8w1rps0g8kvccqpkpmy8g2m5k4bpydz9gdh1nhia5h9558fq"; - name = "kshisen-15.12.3.tar.xz"; - }; - }; - ksirk = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ksirk-15.12.3.tar.xz"; - sha256 = "1z43v25gfv6gzpsm87s84v34389fjvvgq41maa1yzv0p3lj14v86"; - name = "ksirk-15.12.3.tar.xz"; - }; - }; - ksnakeduel = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ksnakeduel-15.12.3.tar.xz"; - sha256 = "1bkbbfvbpihq19z0jvk3ix535y60b7fb943crcflbqyknpnnh038"; - name = "ksnakeduel-15.12.3.tar.xz"; - }; - }; - kspaceduel = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kspaceduel-15.12.3.tar.xz"; - sha256 = "0snjlvc56299frj89h41rs6ij85idyzcp8yv6rkc8kqjbdqm8hjj"; - name = "kspaceduel-15.12.3.tar.xz"; - }; - }; - ksquares = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ksquares-15.12.3.tar.xz"; - sha256 = "06ij62n2kbjbgijcw3ddkc3fyl27rgyrkbz3cl5f3ydfyrmsnmzv"; - name = "ksquares-15.12.3.tar.xz"; - }; - }; - kstars = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kstars-15.12.3.tar.xz"; - sha256 = "1ka31vbzwdxv16p4nh40g6c6yijczv73y3js1scrc195k6byni5r"; - name = "kstars-15.12.3.tar.xz"; - }; - }; - ksudoku = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ksudoku-15.12.3.tar.xz"; - sha256 = "1132551s0hdabm42jxnbd9q9yiwh40lgfnzm4ccznv02l1g0fp8k"; - name = "ksudoku-15.12.3.tar.xz"; - }; - }; - ksystemlog = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ksystemlog-15.12.3.tar.xz"; - sha256 = "0yiq0kajqjbb3s8ljp11kb83xha4n20v17fk8rnjn9dymvlkmw1j"; - name = "ksystemlog-15.12.3.tar.xz"; - }; - }; - kteatime = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kteatime-15.12.3.tar.xz"; - sha256 = "0chf0cbghmf0aj0l0zxinhfpwpr40af3b4r7axkj77lrkkyl1acq"; - name = "kteatime-15.12.3.tar.xz"; - }; - }; - ktimer = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktimer-15.12.3.tar.xz"; - sha256 = "1sghh5983bzn3qlfm7fs74v6f5djmbixppfw09j8nn9rsmsah30a"; - name = "ktimer-15.12.3.tar.xz"; - }; - }; - ktnef = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktnef-15.12.3.tar.xz"; - sha256 = "043im3rcw210w90spyxap3pjqfk5dmgk57p2pqkxir6mcsfz9hm8"; - name = "ktnef-15.12.3.tar.xz"; - }; - }; - ktouch = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktouch-15.12.3.tar.xz"; - sha256 = "1zmzm52pxi3hs7r12qsfmmqf8x7q1aapss2drlmx3r4lfi3hwzsp"; - name = "ktouch-15.12.3.tar.xz"; - }; - }; - ktp-accounts-kcm = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-accounts-kcm-15.12.3.tar.xz"; - sha256 = "1zyprpzwbpvj22wsl6bc75r38bm7rshhl7llyk47rl0v02p8gd7s"; - name = "ktp-accounts-kcm-15.12.3.tar.xz"; - }; - }; - ktp-approver = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-approver-15.12.3.tar.xz"; - sha256 = "01ppnmi7fah8yq4yvhsrz6kask9f1fxhzcvjmjr5igv2d9hfsppw"; - name = "ktp-approver-15.12.3.tar.xz"; - }; - }; - ktp-auth-handler = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-auth-handler-15.12.3.tar.xz"; - sha256 = "1hkc7gkh38vw7l3b8ygywifv60g1chm3xcgklj94dsm3x9j8xbwa"; - name = "ktp-auth-handler-15.12.3.tar.xz"; - }; - }; - ktp-common-internals = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-common-internals-15.12.3.tar.xz"; - sha256 = "13wp73k52nrqml17x9papdi9jymbymrkszag6rmmzmw5rq5kikb6"; - name = "ktp-common-internals-15.12.3.tar.xz"; - }; - }; - ktp-contact-list = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-contact-list-15.12.3.tar.xz"; - sha256 = "1b9ql2435wq410gfxw5ybvlm68pilx8rp8dxbxrs1cw4wrc88mf3"; - name = "ktp-contact-list-15.12.3.tar.xz"; - }; - }; - ktp-contact-runner = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-contact-runner-15.12.3.tar.xz"; - sha256 = "0hnkrnq2kr3jan0pmy82hndji5jvjxpr9sn90s8swwksdv8f2gc9"; - name = "ktp-contact-runner-15.12.3.tar.xz"; - }; - }; - ktp-desktop-applets = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-desktop-applets-15.12.3.tar.xz"; - sha256 = "0pcync77gh55wn9701mviwmnm2ahxqs1rfzw7cxsjvgk4324arzq"; - name = "ktp-desktop-applets-15.12.3.tar.xz"; - }; - }; - ktp-filetransfer-handler = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-filetransfer-handler-15.12.3.tar.xz"; - sha256 = "0ykvly1giqn5nn4vwa7xcdz0q6mrni6raay9krvajk97qcdc5af8"; - name = "ktp-filetransfer-handler-15.12.3.tar.xz"; - }; - }; - ktp-kded-module = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-kded-module-15.12.3.tar.xz"; - sha256 = "0x42cgjiwy4yawial483ilb0sxncnip40ilma0kxzli0nzlbjfq8"; - name = "ktp-kded-module-15.12.3.tar.xz"; - }; - }; - ktp-send-file = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-send-file-15.12.3.tar.xz"; - sha256 = "0bx30sbwbxjgnylx9xzhq5vkisn34xxzqryalvg1lzhqnh338iri"; - name = "ktp-send-file-15.12.3.tar.xz"; - }; - }; - ktp-text-ui = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktp-text-ui-15.12.3.tar.xz"; - sha256 = "044pfam4i3qs43xgp2q0lsvrfjvbvbywclw4wx22m0i02580llga"; - name = "ktp-text-ui-15.12.3.tar.xz"; - }; - }; - ktuberling = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/ktuberling-15.12.3.tar.xz"; - sha256 = "0x73hppzchi5k4y9xd520qllkhn5mhrrmaapnacybb2pbpv58d17"; - name = "ktuberling-15.12.3.tar.xz"; - }; - }; - kturtle = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kturtle-15.12.3.tar.xz"; - sha256 = "12x86v658d7by5x1axwchn53fd23yrfavfxn5yy700vbqa6jd8qn"; - name = "kturtle-15.12.3.tar.xz"; - }; - }; - kubrick = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kubrick-15.12.3.tar.xz"; - sha256 = "0az5vcg5a565cmzmavzww5sl7wiz6gi2p0h61xl3di1pc8gk8wkp"; - name = "kubrick-15.12.3.tar.xz"; - }; - }; - kuser = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kuser-15.12.3.tar.xz"; - sha256 = "0aggk24z6fmsqimj7c3zi0vaq508m3g1956v0kfxd2k5wipb9cfz"; - name = "kuser-15.12.3.tar.xz"; - }; - }; - kwalletmanager = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kwalletmanager-15.12.3.tar.xz"; - sha256 = "1qyms04w0xmhxxd4kb9zsdkr50gxbjhs3hjq5vhvbagb05ya8g4m"; - name = "kwalletmanager-15.12.3.tar.xz"; - }; - }; - kwordquiz = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/kwordquiz-15.12.3.tar.xz"; - sha256 = "1vhxdng5i9hzx57mj9jfsdc63wbk9xyjhr6f1hq035z0cz4j59r6"; - name = "kwordquiz-15.12.3.tar.xz"; - }; - }; - libkcddb = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkcddb-15.12.3.tar.xz"; - sha256 = "1m3r5d4jy4n8l29ncm3wnmmnfilr64qn987brm4y16bcbxidigcz"; - name = "libkcddb-15.12.3.tar.xz"; - }; - }; - libkcompactdisc = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkcompactdisc-15.12.3.tar.xz"; - sha256 = "0cb50346c4jv35125kaz65m8n1bw0rn8wynig6iygp8b2xam9303"; - name = "libkcompactdisc-15.12.3.tar.xz"; - }; - }; - libkdcraw = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkdcraw-15.12.3.tar.xz"; - sha256 = "1d2l6nk25vj0h0a7slnz6dnlpfr4wyc6rh188vsdm24nz8q89hqf"; - name = "libkdcraw-15.12.3.tar.xz"; - }; - }; - libkdeedu = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkdeedu-15.12.3.tar.xz"; - sha256 = "1imk40ygm9jndj95hkz1grjrsh9r0adjz41sarkjyfglxw3xwm0c"; - name = "libkdeedu-15.12.3.tar.xz"; - }; - }; - libkdegames = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkdegames-15.12.3.tar.xz"; - sha256 = "1v3zmg8zb9cnfw3inba68c4v6iv1mqinskvsa61rkzzdhjf1cjj4"; - name = "libkdegames-15.12.3.tar.xz"; - }; - }; - libkeduvocdocument = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkeduvocdocument-15.12.3.tar.xz"; - sha256 = "1i4s3v9pdn0jrgbdidq1rg9zka9m06h1c1yxrs0j0zscwmnalzlc"; - name = "libkeduvocdocument-15.12.3.tar.xz"; - }; - }; - libkexiv2 = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkexiv2-15.12.3.tar.xz"; - sha256 = "196sxzhirc1l33jj1zjl6h57w9fyqa0kik0mmwj9w3jbjbsdmazv"; - name = "libkexiv2-15.12.3.tar.xz"; - }; - }; - libkface = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkface-15.12.3.tar.xz"; - sha256 = "0rsy3xqfj7mbnhwb8gknv0cz20m2nv1zzs9jl39dna381gjh7sw0"; - name = "libkface-15.12.3.tar.xz"; - }; - }; - libkgeomap = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkgeomap-15.12.3.tar.xz"; - sha256 = "0mm46if7jrf31s9sxn2vpaq6bk4bansbkgjb166anbfb6ywfs30d"; - name = "libkgeomap-15.12.3.tar.xz"; - }; - }; - libkipi = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkipi-15.12.3.tar.xz"; - sha256 = "0lz8b792gpdgy6nlw50n62jn7fj2bj8znqsln2s2vmibgjscvl55"; - name = "libkipi-15.12.3.tar.xz"; - }; - }; - libkmahjongg = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkmahjongg-15.12.3.tar.xz"; - sha256 = "0vjzdicqwgz49vykb698b2vgj1vmsxhn2ad8fjw863dqds9979v7"; - name = "libkmahjongg-15.12.3.tar.xz"; - }; - }; - libkomparediff2 = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libkomparediff2-15.12.3.tar.xz"; - sha256 = "1iw60r4rnijsh22mslrcsgrhqndqndvqsin20g0gx8zl6qs680kn"; - name = "libkomparediff2-15.12.3.tar.xz"; - }; - }; - libksane = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/libksane-15.12.3.tar.xz"; - sha256 = "0r4v20l6bpv5j0gk0vcm90ag4cd410mllfw03f4v683wsda1phcj"; - name = "libksane-15.12.3.tar.xz"; - }; - }; - lokalize = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/lokalize-15.12.3.tar.xz"; - sha256 = "1qnhhvgpigss0ngca7yqwqlwixm2221cynp94nw0csfx72mkbpyl"; - name = "lokalize-15.12.3.tar.xz"; - }; - }; - lskat = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/lskat-15.12.3.tar.xz"; - sha256 = "05d40mc8bs4f45jy1sh64chp0ffb0631660wwd4p60d7x0j5as98"; - name = "lskat-15.12.3.tar.xz"; - }; - }; - marble = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/marble-15.12.3.tar.xz"; - sha256 = "1gz7nj0jaqg7pbird2rv3cngfifpm9g1dnmx9rykdripv9m4g9am"; - name = "marble-15.12.3.tar.xz"; - }; - }; - mplayerthumbs = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/mplayerthumbs-15.12.3.tar.xz"; - sha256 = "0r2v4b1kxrc1rpk771xry1swirf66z9lbrg7qs0an5vgp9wmghzw"; - name = "mplayerthumbs-15.12.3.tar.xz"; - }; - }; - okteta = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/okteta-15.12.3.tar.xz"; - sha256 = "1qhrddir85z5c91xrqzndnd3n30vsfw6rafsk55zxwyhkws2jks0"; - name = "okteta-15.12.3.tar.xz"; - }; - }; - okular = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/okular-15.12.3.tar.xz"; - sha256 = "1xrw0rvzw2i7289fv2maff3zb7f3vqv50fb88dbx67n9mzib794v"; - name = "okular-15.12.3.tar.xz"; - }; - }; - palapeli = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/palapeli-15.12.3.tar.xz"; - sha256 = "08sj1zjd3smfcdgnmj57q9yz3bsd7k654zyh3sqar29yd4ja1b8l"; - name = "palapeli-15.12.3.tar.xz"; - }; - }; - parley = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/parley-15.12.3.tar.xz"; - sha256 = "00h83mpkz52ybav8d3c3gv6y53xcz3d5abq11daa6hc171bm35qy"; - name = "parley-15.12.3.tar.xz"; - }; - }; - picmi = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/picmi-15.12.3.tar.xz"; - sha256 = "0x952gpdz415pr691bv8x98pnvs1xajgsgk6rm6kx9crm1qm0qfa"; - name = "picmi-15.12.3.tar.xz"; - }; - }; - poxml = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/poxml-15.12.3.tar.xz"; - sha256 = "1w3mgz5ayryra844pn5jrhnxnhbz8d8kjg74a9xnw98j81qqjz1y"; - name = "poxml-15.12.3.tar.xz"; - }; - }; - print-manager = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/print-manager-15.12.3.tar.xz"; - sha256 = "1xranm7l9bgg9dnpj91d9nmzmbgj52zgzsvvsnp9ygxgcs5bzlhc"; - name = "print-manager-15.12.3.tar.xz"; - }; - }; - rocs = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/rocs-15.12.3.tar.xz"; - sha256 = "0pl3ildg2rgnq7ax28ba5ninv8lw7mm5c4zwj63fwz3ds1d4rysq"; - name = "rocs-15.12.3.tar.xz"; - }; - }; - signon-kwallet-extension = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/signon-kwallet-extension-15.12.3.tar.xz"; - sha256 = "05y6c4pd833zwxx6fndidxr39w3qxga6nkcjds8ywxrr0968mfi7"; - name = "signon-kwallet-extension-15.12.3.tar.xz"; - }; - }; - spectacle = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/spectacle-15.12.3.tar.xz"; - sha256 = "0qyyc30pgybx205a45vj0yqv03csi0dihx012iz3hlnhgr2g586n"; - name = "spectacle-15.12.3.tar.xz"; - }; - }; - step = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/step-15.12.3.tar.xz"; - sha256 = "0473n43wqiwsrajy06mr024qnfr2nhhjxwsv1arg2gv7xvzhbgq1"; - name = "step-15.12.3.tar.xz"; - }; - }; - svgpart = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/svgpart-15.12.3.tar.xz"; - sha256 = "1lhhjmf2ay9v6p64693kf5rk3jywyyyd18xq9lgqlng0b27acsac"; - name = "svgpart-15.12.3.tar.xz"; - }; - }; - sweeper = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/sweeper-15.12.3.tar.xz"; - sha256 = "0wnk6zmf24mpnacsp6wi8c617jl4znk1pbm9jl38ckmg5z56ghz0"; - name = "sweeper-15.12.3.tar.xz"; - }; - }; - syndication = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/syndication-15.12.3.tar.xz"; - sha256 = "07xnjxjdf11k0fkpf9xdfvfh176pimx3v4h5y6f7bswsgnld7h38"; - name = "syndication-15.12.3.tar.xz"; - }; - }; - umbrello = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/umbrello-15.12.3.tar.xz"; - sha256 = "072nqqjq2cfxwi098kh7m24cvs6f6nss62wxdskvzdkbcd7gfh26"; - name = "umbrello-15.12.3.tar.xz"; - }; - }; - zeroconf-ioslave = { - version = "15.12.3"; - src = fetchurl { - url = "${mirror}/stable/applications/15.12.3/src/zeroconf-ioslave-15.12.3.tar.xz"; - sha256 = "1iv4l58v7wg4kjmp7723za84rpns4dm6av6b6cybmj8dzw3jixxf"; - name = "zeroconf-ioslave-15.12.3.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/kde-5/applications-15.12/ark.nix b/pkgs/desktops/kde-5/applications-16.04/ark.nix index 9e6f414db9e..331c8c647ca 100644 --- a/pkgs/desktops/kde-5/applications-15.12/ark.nix +++ b/pkgs/desktops/kde-5/applications-16.04/ark.nix @@ -31,21 +31,9 @@ kdeApp { extra-cmake-modules kdoctools ]; - buildInputs = [ - karchive - kconfig - kcrash - kdbusaddons - kiconthemes - kservice - kpty - kwidgetsaddons - libarchive - ]; propagatedBuildInputs = [ - khtml - ki18n - kio + khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice + kpty kwidgetsaddons libarchive ]; postInstall = '' wrapQtProgram "$out/bin/ark" \ diff --git a/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix index a24928160df..fc91c92dbe6 100644 --- a/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix +++ b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix @@ -13,23 +13,15 @@ kdeApp { name = "baloo-widgets"; + meta = { + license = [ lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kconfig - kservice - ]; propagatedBuildInputs = [ - baloo - kdelibs4support - kfilemetadata - ki18n - kio + baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio ]; - meta = { - license = [ lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix index f9d65ac6d87..f9d65ac6d87 100644 --- a/pkgs/desktops/kde-5/applications-15.12/default.nix +++ b/pkgs/desktops/kde-5/applications-16.04/default.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix index 72a08c73261..962dd2ba720 100644 --- a/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix +++ b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix @@ -11,21 +11,15 @@ kdeApp { name = "dolphin-plugins"; + meta = { + license = [ lib.licenses.gpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kxmlgui - dolphin - ]; propagatedBuildInputs = [ - kdelibs4support - ki18n - kio + kdelibs4support ki18n kio kxmlgui dolphin ]; - meta = { - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix index 3218146f510..168854383fa 100644 --- a/pkgs/desktops/kde-5/applications-15.12/dolphin.nix +++ b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix @@ -29,42 +29,22 @@ kdeApp { name = "dolphin"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kinit - kcmutils - kcoreaddons - knewstuff - kdbusaddons - kbookmarks - kconfig - kparts - solid - kiconthemes - kcompletion - knotifications - phonon - baloo-widgets - ]; propagatedBuildInputs = [ - baloo - kactivities - kdelibs4support - kfilemetadata - ki18n - kio - ktexteditor + kinit kcmutils kcoreaddons knewstuff kdbusaddons kbookmarks kconfig kparts + solid kiconthemes kcompletion knotifications phonon baloo-widgets baloo + kactivities kdelibs4support kfilemetadata ki18n kio ktexteditor kwindowsystem ]; postInstall = '' wrapQtProgram "$out/bin/dolphin" ''; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh index ff118a53e3a..2b130c7e3af 100755 --- a/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh +++ b/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -WGET_ARGS='http://download.kde.org/stable/applications/15.12.3/ -A *.tar.xz' +WGET_ARGS='http://download.kde.org/stable/applications/16.04.0/ -A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix index 53e9d807d64..feacf7e437e 100644 --- a/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix +++ b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix @@ -7,15 +7,15 @@ kdeApp { name = "ffmpegthumbs"; + meta = { + license = with lib.licenses; [ gpl2 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ + propagatedBuildInputs = [ ffmpeg kio ]; - meta = { - license = with lib.licenses; [ gpl2 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/filelight.nix b/pkgs/desktops/kde-5/applications-16.04/filelight.nix index df5e097a540..5ac101fa501 100644 --- a/pkgs/desktops/kde-5/applications-15.12/filelight.nix +++ b/pkgs/desktops/kde-5/applications-16.04/filelight.nix @@ -12,24 +12,19 @@ kdeApp { name = "filelight"; + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = with lib.maintainers; [ fridh vcunat ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kio - kparts - qtscript - solid - kxmlgui + propagatedBuildInputs = [ + kio kparts qtscript solid kxmlgui ]; - postInstall = '' wrapQtProgram "$out/bin/filelight" ''; - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = with lib.maintainers; [ fridh vcunat ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix index ac14573dcaa..8d6f11879d3 100644 --- a/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix +++ b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix @@ -7,15 +7,14 @@ kdeApp { name = "gpgmepp"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - boost - gpgme - ]; meta = { license = with lib.licenses; [ lgpl21 bsd3 ]; maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + propagatedBuildInputs = [ + boost gpgme + ]; } diff --git a/pkgs/desktops/kde-5/applications-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix index 732ac11e96d..20fc554d01a 100644 --- a/pkgs/desktops/kde-5/applications-15.12/gwenview.nix +++ b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix @@ -16,29 +16,19 @@ kdeApp { name = "gwenview"; + meta = { + license = with lib.licenses; [ gpl2 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - exiv2 - lcms2 - phonon - qtsvg - ]; propagatedBuildInputs = [ - baloo - kactivities - kdelibs4support - kio - qtx11extras + baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg ]; postInstall = '' wrapQtProgram "$out/bin/gwenview" ''; - meta = { - license = with lib.licenses; [ gpl2 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/kate.nix b/pkgs/desktops/kde-5/applications-16.04/kate.nix index 91eeb2314a4..e368483771f 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kate.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kate.nix @@ -28,42 +28,22 @@ kdeApp { name = "kate"; + meta = { + license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - qtscript - kconfig - kcrash - kguiaddons - kiconthemes - kinit - kjobwidgets - kparts - kxmlgui - kdbusaddons - kwallet - kitemmodels - knotifications - threadweaver - knewstuff - libgit2 - ]; propagatedBuildInputs = [ - kactivities - ki18n - kio - ktexteditor - kwindowsystem - plasma-framework + kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript + kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui + kdbusaddons kwallet kitemmodels knotifications threadweaver knewstuff + libgit2 ]; postInstall = '' wrapQtProgram "$out/bin/kate" wrapQtProgram "$out/bin/kwrite" ''; - meta = { - license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix index e4c8e9d6925..ce9cf46d489 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix @@ -13,27 +13,18 @@ kdeApp { name = "kcalc"; - + meta = { + license = with lib.licenses; [ gpl2 ]; + maintainers = [ lib.maintainers.fridh ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - - buildInputs = [ - gmp - kconfig - kconfigwidgets - kguiaddons - kinit - knotifications + propagatedBuildInputs = [ + gmp kconfig kconfigwidgets kguiaddons kinit knotifications ]; - postInstall = '' wrapQtProgram "$out/bin/kcalc" ''; - - meta = { - license = with lib.licenses; [ gpl2 ]; - maintainers = [ lib.maintainers.fridh ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix new file mode 100644 index 00000000000..8726f6870ca --- /dev/null +++ b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix @@ -0,0 +1,14 @@ +{ kdeApp, lib +, extra-cmake-modules +, ki18n, kwidgetsaddons, kxmlgui +}: + +kdeApp { + name = "kcolorchooser"; + meta = { + license = with lib.licenses; [ mit ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ]; +} diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-16.04/kde-app.nix index 2f1fdc1d643..2f1fdc1d643 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kde-app.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kde-app.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-16.04/kde-locale-4.nix index e83794c60d8..e83794c60d8 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kde-locale-4.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-16.04/kde-locale-5.nix index 772ebe37e44..772ebe37e44 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kde-locale-5.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix index 520bad0d066..cddf064e47b 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix @@ -8,16 +8,14 @@ kdeApp { name = "kdegraphics-thumbnailers"; - nativeBuildInputs = [ - extra-cmake-modules - ]; - buildInputs = [ - kio - libkexiv2 - libkdcraw - ]; meta = { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + propagatedBuildInputs = [ + kio libkexiv2 libkdcraw + ]; } diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0001-old-kde4-cmake-policies.patch index b7d7300e9a8..b7d7300e9a8 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch +++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0001-old-kde4-cmake-policies.patch diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0002-polkit-install-path.patch index ff0306ea148..ff0306ea148 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch +++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0002-polkit-install-path.patch diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0003-remove_xdg_impurities.patch index a79d7b2b7d1..a79d7b2b7d1 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch +++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0003-remove_xdg_impurities.patch diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-16.04/kdelibs/default.nix index 389362deecc..389362deecc 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/default.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-16.04/kdelibs/setup-hook.sh index e0a75dc8acd..e0a75dc8acd 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh +++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/setup-hook.sh diff --git a/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix index 4e99a43b391..2190ab8ea64 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix @@ -11,19 +11,15 @@ kdeApp { name = "kdenetwork-filesharing"; + meta = { + license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcoreaddons - ki18n - kio - kwidgetsaddons - samba + propagatedBuildInputs = [ + kcoreaddons ki18n kio kwidgetsaddons samba ]; - meta = { - license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/kgpg.nix b/pkgs/desktops/kde-5/applications-16.04/kgpg.nix index 3ee92519718..3ee92519718 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kgpg.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kgpg.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix index 77b42f1fc58..9d28066cae9 100644 --- a/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix +++ b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix @@ -2,7 +2,7 @@ , extra-cmake-modules, kdoctools , shared_mime_info , exiv2 -, karchive +, kactivities, karchive , kbookmarks , kconfig, kconfigwidgets , kcoreaddons, kdbusaddons, kguiaddons @@ -15,7 +15,7 @@ , kpty , libmtp , libssh -, openexr +, openexr, ilmbase , openslp , phonon , qtsvg @@ -25,34 +25,18 @@ kdeApp { name = "kio-extras"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules kdoctools shared_mime_info ]; - buildInputs = [ - exiv2 - karchive - kbookmarks - kconfig kconfigwidgets - kcoreaddons kdbusaddons kguiaddons - kdnssd - kiconthemes - ki18n - kio - khtml - kdelibs4support - kpty - libmtp - libssh - openexr - openslp - phonon - qtsvg - samba - solid + propagatedBuildInputs = [ + exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons + kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support + kpty libmtp libssh openexr openslp phonon qtsvg samba solid ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; + NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev or ilmbase}/include/OpenEXR" ]; } diff --git a/pkgs/desktops/kde-5/applications-15.12/konsole.nix b/pkgs/desktops/kde-5/applications-16.04/konsole.nix index 4b4cba2a377..2042611f61b 100644 --- a/pkgs/desktops/kde-5/applications-15.12/konsole.nix +++ b/pkgs/desktops/kde-5/applications-16.04/konsole.nix @@ -28,41 +28,19 @@ kdeApp { name = "konsole"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper - ]; - buildInputs = [ - qtscript - kbookmarks - kcompletion - kconfig - kconfigwidgets - kcoreaddons - kguiaddons - kiconthemes - kinit - kio - knotifications - knotifyconfig - kparts - kpty - kservice - ktextwidgets - kwidgetsaddons - kxmlgui + extra-cmake-modules kdoctools makeQtWrapper ]; propagatedBuildInputs = [ - kdelibs4support - ki18n - kwindowsystem + kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig + kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications + knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kxmlgui ]; postInstall = '' wrapQtProgram "$out/bin/konsole" ''; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/l10n.nix b/pkgs/desktops/kde-5/applications-16.04/l10n.nix index 9b211faf444..9b211faf444 100644 --- a/pkgs/desktops/kde-5/applications-15.12/l10n.nix +++ b/pkgs/desktops/kde-5/applications-16.04/l10n.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix index 319c7fc6583..1c1ef7dc996 100644 --- a/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix +++ b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix @@ -6,14 +6,14 @@ kdeApp { name = "libkdcraw"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ + propagatedBuildInputs = [ libraw ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix index afb1ac83653..5a46912a109 100644 --- a/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix +++ b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix @@ -6,14 +6,14 @@ kdeApp { name = "libkexiv2"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ + propagatedBuildInputs = [ exiv2 ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/libkipi.nix b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix index c23cd8578fb..33903463714 100644 --- a/pkgs/desktops/kde-5/applications-15.12/libkipi.nix +++ b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix @@ -9,14 +9,14 @@ kdeApp { name = "libkipi"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ + propagatedBuildInputs = [ kconfig ki18n kservice kxmlgui ]; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 bsd3 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/okular.nix b/pkgs/desktops/kde-5/applications-16.04/okular.nix index 0691325d7a5..0691325d7a5 100644 --- a/pkgs/desktops/kde-5/applications-15.12/okular.nix +++ b/pkgs/desktops/kde-5/applications-16.04/okular.nix diff --git a/pkgs/desktops/kde-5/applications-15.12/print-manager.nix b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix index b4eab372789..cf0703b7d2c 100644 --- a/pkgs/desktops/kde-5/applications-15.12/print-manager.nix +++ b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix @@ -19,29 +19,16 @@ kdeApp { name = "print-manager"; + meta = { + license = [ lib.licenses.gpl2 ]; + maintainers = [ lib.maintainers.ttuegel ]; + }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - cups - kconfig - kconfigwidgets - kdbusaddons - kiconthemes - kcmutils - knotifications - kwidgetsaddons - kitemviews - ]; propagatedBuildInputs = [ - ki18n - kio - kwindowsystem - plasma-framework + cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications + kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework qtdeclarative ]; - meta = { - license = [ lib.licenses.gpl2 ]; - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-15.12/spectacle.nix b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix index 849334fb736..7e324f2b3fc 100644 --- a/pkgs/desktops/kde-5/applications-15.12/spectacle.nix +++ b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix @@ -5,6 +5,7 @@ , kconfig , kcoreaddons , kdbusaddons +, kdeclarative , ki18n , kio , knotifications @@ -18,29 +19,17 @@ kdeApp { name = "spectacle"; + meta = with lib; { + maintainers = with maintainers; [ ttuegel ]; + }; nativeBuildInputs = [ - extra-cmake-modules - kdoctools - makeQtWrapper + extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kconfig - kcoreaddons - kdbusaddons - ki18n - kio - knotifications - kscreen - kwidgetsaddons - kwindowsystem - kxmlgui - libkipi - xcb-util-cursor + propagatedBuildInputs = [ + kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications + kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor ]; postFixup = '' wrapQtProgram "$out/bin/spectacle" ''; - meta = with lib; { - maintainers = with maintainers; [ ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/applications-16.04/srcs.nix b/pkgs/desktops/kde-5/applications-16.04/srcs.nix new file mode 100644 index 00000000000..0185465e156 --- /dev/null +++ b/pkgs/desktops/kde-5/applications-16.04/srcs.nix @@ -0,0 +1,2093 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + akonadi = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/akonadi-16.04.0.tar.xz"; + sha256 = "01m032iwy3yylxxfmznhn0aly20yc07h8z0ppzgx9gz8smn8351k"; + name = "akonadi-16.04.0.tar.xz"; + }; + }; + akonadi-calendar = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/akonadi-calendar-16.04.0.tar.xz"; + sha256 = "1n06d0m2m553agn95b75sgqaijaaxdrdb6gnv4zizwjxr37cgnwm"; + name = "akonadi-calendar-16.04.0.tar.xz"; + }; + }; + akonadi-search = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/akonadi-search-16.04.0.tar.xz"; + sha256 = "101cbms0mlv86g8ld027ras5bkzfil9avbpvfh2rnlfpm2yp3jgq"; + name = "akonadi-search-16.04.0.tar.xz"; + }; + }; + analitza = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/analitza-16.04.0.tar.xz"; + sha256 = "0ir7siwxp6fi9gwri9ynp497ppg72vrbqnwaq3fk3rf9i4brib3s"; + name = "analitza-16.04.0.tar.xz"; + }; + }; + ark = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ark-16.04.0.tar.xz"; + sha256 = "07zvnslnxjz0rq90cvba6lh7gcym4z7817fdz56pjdffpcd0j9xa"; + name = "ark-16.04.0.tar.xz"; + }; + }; + artikulate = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/artikulate-16.04.0.tar.xz"; + sha256 = "00y47nzlqlhrv3xx0g0h9is2v7v2vch9vk0hmjb4sgmmri21r47i"; + name = "artikulate-16.04.0.tar.xz"; + }; + }; + audiocd-kio = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/audiocd-kio-16.04.0.tar.xz"; + sha256 = "1r1x1igihd4bvvjjf8c5xi341y7jn43ba0jh724x82ljhwjjivnh"; + name = "audiocd-kio-16.04.0.tar.xz"; + }; + }; + baloo-widgets = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/baloo-widgets-16.04.0.tar.xz"; + sha256 = "0j8l34q0nmprw0y7hcsy5rxisv19zjf757dhy7rwlbvs72a8fyn2"; + name = "baloo-widgets-16.04.0.tar.xz"; + }; + }; + blinken = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/blinken-16.04.0.tar.xz"; + sha256 = "1fi0vnxc31nd2hk7yx4gbxlmwsxsrw7yidblv3ly6j3q65ra4cgp"; + name = "blinken-16.04.0.tar.xz"; + }; + }; + bomber = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/bomber-16.04.0.tar.xz"; + sha256 = "0rv2mfn8l78zfb0apxpgqfw2zp0zvgrjx5fdqn7mhah6w2wr421i"; + name = "bomber-16.04.0.tar.xz"; + }; + }; + bovo = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/bovo-16.04.0.tar.xz"; + sha256 = "1z0wkmlvx052drdjkc3scmbqd299vq26l15qdykf7k7i69abpa91"; + name = "bovo-16.04.0.tar.xz"; + }; + }; + calendarsupport = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/calendarsupport-16.04.0.tar.xz"; + sha256 = "1l4hr59r5ns5lhvr4622i8lm99933j72v6fhjv4hmw1yvy0d97kf"; + name = "calendarsupport-16.04.0.tar.xz"; + }; + }; + cantor = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/cantor-16.04.0.tar.xz"; + sha256 = "195b974swl1aw9g9l2d4si7zvhb6jahrvkkgjyyzqrkgqj10qjgh"; + name = "cantor-16.04.0.tar.xz"; + }; + }; + cervisia = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/cervisia-16.04.0.tar.xz"; + sha256 = "049df86n0mj0jcxlwi64cf1ijm5bilgq0dn0b1av3ivb53c2k8c1"; + name = "cervisia-16.04.0.tar.xz"; + }; + }; + dolphin = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/dolphin-16.04.0.tar.xz"; + sha256 = "1cnvlcn5cgy1paxrcv9x8dnjvnivn86pr93gmscwl83p9dg3ly37"; + name = "dolphin-16.04.0.tar.xz"; + }; + }; + dolphin-plugins = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/dolphin-plugins-16.04.0.tar.xz"; + sha256 = "0r58i2w7jiznh190jqvdb7rdgyk3rnwb34hxbid02w042hsf06gp"; + name = "dolphin-plugins-16.04.0.tar.xz"; + }; + }; + dragon = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/dragon-16.04.0.tar.xz"; + sha256 = "0b81wfpxzx4wnawvkhsj16ijvdajq528m24iswxdss1ya7hcszm2"; + name = "dragon-16.04.0.tar.xz"; + }; + }; + eventviews = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/eventviews-16.04.0.tar.xz"; + sha256 = "1gyslz02y0i9fcrxg7xxcag7h7qd1g9amn2ry2rygpxcl98bzcz7"; + name = "eventviews-16.04.0.tar.xz"; + }; + }; + ffmpegthumbs = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ffmpegthumbs-16.04.0.tar.xz"; + sha256 = "0jjq5gm4avi2lli3r6zd1m4v6nzc4dxd2msm6lr35nkhadamihjj"; + name = "ffmpegthumbs-16.04.0.tar.xz"; + }; + }; + filelight = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/filelight-16.04.0.tar.xz"; + sha256 = "07k1fkb5nangzzxl00jkz9jqrlzi8g9dvp1qm8s5vbpfww6gaq4a"; + name = "filelight-16.04.0.tar.xz"; + }; + }; + gpgmepp = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/gpgmepp-16.04.0.tar.xz"; + sha256 = "0k5wawmqmpsjg3q4wcg54xvs0rlkv26398gkvfhvw5kixcd71kys"; + name = "gpgmepp-16.04.0.tar.xz"; + }; + }; + granatier = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/granatier-16.04.0.tar.xz"; + sha256 = "1j5jzhyfp7jy3nzj6y2s8gy4hm1q8z3vwlx7cd7j936vk27r4vw2"; + name = "granatier-16.04.0.tar.xz"; + }; + }; + grantleetheme = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/grantleetheme-16.04.0.tar.xz"; + sha256 = "0dccrqa8nsjjljwi9z9yfx71cr6ds74k8kzkyc2bgw4zdcmw62kg"; + name = "grantleetheme-16.04.0.tar.xz"; + }; + }; + gwenview = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/gwenview-16.04.0.tar.xz"; + sha256 = "16viz9z4r3mllc4yfw7rirq9hjaxsbfv0vgckrc4mvwbpjhhbl88"; + name = "gwenview-16.04.0.tar.xz"; + }; + }; + incidenceeditor = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/incidenceeditor-16.04.0.tar.xz"; + sha256 = "08fvqpr12295dinarcfrh2m95591h1hiqyllc36asc8pwzisfb9f"; + name = "incidenceeditor-16.04.0.tar.xz"; + }; + }; + jovie = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/jovie-16.04.0.tar.xz"; + sha256 = "0xvwgpqzh7h2vl2dpzninz4r93z18giwwij4yffl8740k4fk5id5"; + name = "jovie-16.04.0.tar.xz"; + }; + }; + juk = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/juk-16.04.0.tar.xz"; + sha256 = "0y4bfq6qza84s0nk6fajwg1bmn0kzjnjj2zjglas322fh8vbdz4n"; + name = "juk-16.04.0.tar.xz"; + }; + }; + kaccessible = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kaccessible-16.04.0.tar.xz"; + sha256 = "1glwmqaafvcm6gjvs2m0d2iaglqz3y1mj3g0jqips4sx32zbsgxf"; + name = "kaccessible-16.04.0.tar.xz"; + }; + }; + kaccounts-integration = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kaccounts-integration-16.04.0.tar.xz"; + sha256 = "0h84nbibzzlxs0vpklij0yczs2c53gqwdx5yvfhnipbi285wy7km"; + name = "kaccounts-integration-16.04.0.tar.xz"; + }; + }; + kaccounts-providers = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kaccounts-providers-16.04.0.tar.xz"; + sha256 = "1bmc5kycmw7r84jy7si0dap6lq011lbq050ldhba6ix5dnx0nsws"; + name = "kaccounts-providers-16.04.0.tar.xz"; + }; + }; + kajongg = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kajongg-16.04.0.tar.xz"; + sha256 = "0fasvm8x3cgw0gv1ac38xp12ncms2nf9b5r8hprjxmb5485p7mh6"; + name = "kajongg-16.04.0.tar.xz"; + }; + }; + kalarmcal = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kalarmcal-16.04.0.tar.xz"; + sha256 = "03ylk2kaidqi54zmz84alqhzkiq87kw5a0f7qfj76r8mf7lmnlki"; + name = "kalarmcal-16.04.0.tar.xz"; + }; + }; + kalgebra = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kalgebra-16.04.0.tar.xz"; + sha256 = "0clcgq89wh451dj7nib7pbbppncslnzkn3532hyw347ckisphyvc"; + name = "kalgebra-16.04.0.tar.xz"; + }; + }; + kalzium = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kalzium-16.04.0.tar.xz"; + sha256 = "1cqkgkc5m8fz7l18x0ybh85ldif15mc9gzdak8g2mdjcacxsm9nz"; + name = "kalzium-16.04.0.tar.xz"; + }; + }; + kamera = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kamera-16.04.0.tar.xz"; + sha256 = "0n6h7z9dzv2fhwmk41smzv6l1db61334drcgivjmkblmglbdi473"; + name = "kamera-16.04.0.tar.xz"; + }; + }; + kanagram = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kanagram-16.04.0.tar.xz"; + sha256 = "0g2d7zcb76a01hgbk0aid64xp8qym64a76k3vixwqzjdwf3jbcfr"; + name = "kanagram-16.04.0.tar.xz"; + }; + }; + kapman = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kapman-16.04.0.tar.xz"; + sha256 = "1arb6jiy1ikn96rsvmd87fj35kxnpdq7s0nxn747psc3wvms43wr"; + name = "kapman-16.04.0.tar.xz"; + }; + }; + kapptemplate = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kapptemplate-16.04.0.tar.xz"; + sha256 = "0bqrhzl0w499m8370idv76yz1f8n5wv418y82abd2f9qip0xk1sc"; + name = "kapptemplate-16.04.0.tar.xz"; + }; + }; + kate = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kate-16.04.0.tar.xz"; + sha256 = "13v8a4p3fnymgi682kfhfvd2h71xmhb5i1739cbf9baixsggcbnh"; + name = "kate-16.04.0.tar.xz"; + }; + }; + katomic = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/katomic-16.04.0.tar.xz"; + sha256 = "1g47gxxxy52mdf3lra98fibg93s302vavp0fi73gdy09wvm4nfk1"; + name = "katomic-16.04.0.tar.xz"; + }; + }; + kblackbox = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kblackbox-16.04.0.tar.xz"; + sha256 = "0jjyffs1aijvqan9cva6d9cfnskqp4ynvpqkx1rw2mqnvadm59g3"; + name = "kblackbox-16.04.0.tar.xz"; + }; + }; + kblocks = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kblocks-16.04.0.tar.xz"; + sha256 = "1c16s7lq4j6ixq8rvqf5cadag8cabzjgyw9hiwqix9k3csbnh5br"; + name = "kblocks-16.04.0.tar.xz"; + }; + }; + kblog = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kblog-16.04.0.tar.xz"; + sha256 = "1hhh2f8rj0nfzm1imckhk3iczzda6q1nxnd3v6bp0dnxh14yanwk"; + name = "kblog-16.04.0.tar.xz"; + }; + }; + kbounce = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kbounce-16.04.0.tar.xz"; + sha256 = "0sfrlyqkig089kn1d8fvfhl18hwrc3jygbl9sx0r87wg25w8niv7"; + name = "kbounce-16.04.0.tar.xz"; + }; + }; + kbreakout = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kbreakout-16.04.0.tar.xz"; + sha256 = "05rbxhifx8nwma1nm0ji28d3jyg6kadgb90ma573xj9i4b97ak74"; + name = "kbreakout-16.04.0.tar.xz"; + }; + }; + kbruch = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kbruch-16.04.0.tar.xz"; + sha256 = "1ncfcdcdvxd992q1brqqfq107x8q2y0235dx7z2hxvclf94npigj"; + name = "kbruch-16.04.0.tar.xz"; + }; + }; + kcachegrind = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcachegrind-16.04.0.tar.xz"; + sha256 = "0jks1gc03s2qc6x9klc6x2j8jcx05n13qn0l5qp4sny93mxxyxlv"; + name = "kcachegrind-16.04.0.tar.xz"; + }; + }; + kcalc = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcalc-16.04.0.tar.xz"; + sha256 = "15w0856jqh7vrg3a88b1mcqw63gmady3sdl1zish719jg5hjgw9i"; + name = "kcalc-16.04.0.tar.xz"; + }; + }; + kcalcore = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcalcore-16.04.0.tar.xz"; + sha256 = "1cnp93sgh13aiycwfw9zayzhk6wcxawa8cnvliyfn05809cjffwq"; + name = "kcalcore-16.04.0.tar.xz"; + }; + }; + kcalutils = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcalutils-16.04.0.tar.xz"; + sha256 = "0gz83k11idib66n9m02kql6blfv6h39slmqsx6fkbd6vlajz9wn7"; + name = "kcalutils-16.04.0.tar.xz"; + }; + }; + kcharselect = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcharselect-16.04.0.tar.xz"; + sha256 = "07gnsdnxm84whi2syyj2h2n6sq99mhjx53dndcm3y8c1ry4d2qp5"; + name = "kcharselect-16.04.0.tar.xz"; + }; + }; + kcolorchooser = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcolorchooser-16.04.0.tar.xz"; + sha256 = "0l2ahmqzrl1s3vsiwbgb05rsazqcg5zk8h5n2lg00q30glly24x3"; + name = "kcolorchooser-16.04.0.tar.xz"; + }; + }; + kcontacts = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcontacts-16.04.0.tar.xz"; + sha256 = "1ysism44p2ql95q0fkypa3w1r0fps720yj539a61g60fvdij2nsn"; + name = "kcontacts-16.04.0.tar.xz"; + }; + }; + kcron = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kcron-16.04.0.tar.xz"; + sha256 = "0dkrb4h5fnzh81c1i38j62ik5lqfai0hhyjs3zrh9av6ylzmb9yc"; + name = "kcron-16.04.0.tar.xz"; + }; + }; + kde-baseapps = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-baseapps-16.04.0.tar.xz"; + sha256 = "1py7j2j2nnxih0cyyyv27g6svrga80v4hqsi5gafk843zln5v836"; + name = "kde-baseapps-16.04.0.tar.xz"; + }; + }; + kdebugsettings = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdebugsettings-16.04.0.tar.xz"; + sha256 = "0madfi735qas20dpfx92jfcl6mcl2sfr0z5wxby5k1p1xc0rmm32"; + name = "kdebugsettings-16.04.0.tar.xz"; + }; + }; + kde-dev-scripts = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-dev-scripts-16.04.0.tar.xz"; + sha256 = "1p4aklykn463f0h6kn0brhm81lli5rl5sh4d5fgaj6r3b5s0l2gf"; + name = "kde-dev-scripts-16.04.0.tar.xz"; + }; + }; + kde-dev-utils = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-dev-utils-16.04.0.tar.xz"; + sha256 = "0ldmmww497q2lmlj16jm6k2p89931bgn841rvaj7rb6pclms1l49"; + name = "kde-dev-utils-16.04.0.tar.xz"; + }; + }; + kdeedu-data = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdeedu-data-16.04.0.tar.xz"; + sha256 = "01ps6iqdc685q3xpyjfcjy98hz29max0gl9kfppzq4nzx3hiykj9"; + name = "kdeedu-data-16.04.0.tar.xz"; + }; + }; + kdegraphics-mobipocket = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-mobipocket-16.04.0.tar.xz"; + sha256 = "0lzj4xyjs91404k7h0mcbg8vc2jd5h2r83w83iq76b4cy2gmqhhd"; + name = "kdegraphics-mobipocket-16.04.0.tar.xz"; + }; + }; + kdegraphics-strigi-analyzer = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-strigi-analyzer-16.04.0.tar.xz"; + sha256 = "0ibkbr7z5lz42cz65hwx0j4sjqy7k8rzj304d8ra2732mazamapj"; + name = "kdegraphics-strigi-analyzer-16.04.0.tar.xz"; + }; + }; + kdegraphics-thumbnailers = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-thumbnailers-16.04.0.tar.xz"; + sha256 = "0qw0bq9gkasrkd4mxh30k15k50d28jkl7sc88akys91id1wn8mcb"; + name = "kdegraphics-thumbnailers-16.04.0.tar.xz"; + }; + }; + kde-l10n-ar = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ar-16.04.0.tar.xz"; + sha256 = "1rb8vqq06f83w5q81d1r5qf76yzr85kf826a0a47hfly2plaw3lc"; + name = "kde-l10n-ar-16.04.0.tar.xz"; + }; + }; + kde-l10n-ast = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ast-16.04.0.tar.xz"; + sha256 = "1lzlwyxyi9dgds8sgghzjlhkbd18w9plbli4yqrglfbxl8yc60xl"; + name = "kde-l10n-ast-16.04.0.tar.xz"; + }; + }; + kde-l10n-bg = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-bg-16.04.0.tar.xz"; + sha256 = "026apn9qz3k29dvk1pvylh9ha1m637gjhnpjmj6i03frh2ai7fqs"; + name = "kde-l10n-bg-16.04.0.tar.xz"; + }; + }; + kde-l10n-bs = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-bs-16.04.0.tar.xz"; + sha256 = "0j1i6794rvdpzzqmjqcig6wh1ljrnvygwm6zr0yin4didadm78xm"; + name = "kde-l10n-bs-16.04.0.tar.xz"; + }; + }; + kde-l10n-ca = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ca-16.04.0.tar.xz"; + sha256 = "08wrdlrdqp0w7dg2ygk9pi78ynj6ipzlyxx2mqyplnj1hx2jgrw4"; + name = "kde-l10n-ca-16.04.0.tar.xz"; + }; + }; + kde-l10n-ca_valencia = { + version = "ca_valencia-16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ca@valencia-16.04.0.tar.xz"; + sha256 = "0a9dyvqng3gbn5kljq0av93b6wd7l04i57gmac0vz3qja9fyw7px"; + name = "kde-l10n-ca_valencia-16.04.0.tar.xz"; + }; + }; + kde-l10n-cs = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-cs-16.04.0.tar.xz"; + sha256 = "1ai2p9hg7l7s77k45gmxdn3lqnv4mh8gdsxhbjdpqcmwxyc2zgwf"; + name = "kde-l10n-cs-16.04.0.tar.xz"; + }; + }; + kde-l10n-da = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-da-16.04.0.tar.xz"; + sha256 = "05ncpim4fpyiv2cca4dvn7d8sd031xjc4f85p1yf9inwbsj4nf5x"; + name = "kde-l10n-da-16.04.0.tar.xz"; + }; + }; + kde-l10n-de = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-de-16.04.0.tar.xz"; + sha256 = "17cbibk6lqiabyyinnj9by0jjhqzlkn09zr8m0h967704fkhnzjc"; + name = "kde-l10n-de-16.04.0.tar.xz"; + }; + }; + kde-l10n-el = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-el-16.04.0.tar.xz"; + sha256 = "15raxjj0cnnrqwr8cfdww5a93k7c17lakb88z65lpafvhnyf6mry"; + name = "kde-l10n-el-16.04.0.tar.xz"; + }; + }; + kde-l10n-en_GB = { + version = "en_GB-16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-en_GB-16.04.0.tar.xz"; + sha256 = "17dbbwmwm5mqxc0wbc27ys9izfh8jkjbvc2vnw8gd1kxqgfqy49l"; + name = "kde-l10n-en_GB-16.04.0.tar.xz"; + }; + }; + kde-l10n-eo = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-eo-16.04.0.tar.xz"; + sha256 = "03bz9hpm36lmh1g2560r2xy8fais0f7wdqj58z82kvxb2lqwr2jg"; + name = "kde-l10n-eo-16.04.0.tar.xz"; + }; + }; + kde-l10n-es = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-es-16.04.0.tar.xz"; + sha256 = "0kqvw2a7lgp9qy3ph6f6kxl3mvqlq19r99821w0hbv7qk2p9frbs"; + name = "kde-l10n-es-16.04.0.tar.xz"; + }; + }; + kde-l10n-et = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-et-16.04.0.tar.xz"; + sha256 = "1x483l2a39da9kbhh8k20s84x6zjy27f760i7y9mmkah5ryxbn68"; + name = "kde-l10n-et-16.04.0.tar.xz"; + }; + }; + kde-l10n-eu = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-eu-16.04.0.tar.xz"; + sha256 = "0z0bqnywx9crk829vdixg5kswf208qmcicvi72fiz2cwjwcqhbyg"; + name = "kde-l10n-eu-16.04.0.tar.xz"; + }; + }; + kde-l10n-fa = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fa-16.04.0.tar.xz"; + sha256 = "1m4vdmzy94jg3rky8d8rbqrkyja6rv6jybfh1q0ydpihz9k5p5hk"; + name = "kde-l10n-fa-16.04.0.tar.xz"; + }; + }; + kde-l10n-fi = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fi-16.04.0.tar.xz"; + sha256 = "1bcblmd3dsx6slvia5x9ammw4054wsyjk6mdzgcabyi86xmm1xj8"; + name = "kde-l10n-fi-16.04.0.tar.xz"; + }; + }; + kde-l10n-fr = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fr-16.04.0.tar.xz"; + sha256 = "1311ymksp37l1yfz8921zvbrcd4g2pygfhilmmjrww0chizxjdjf"; + name = "kde-l10n-fr-16.04.0.tar.xz"; + }; + }; + kde-l10n-ga = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ga-16.04.0.tar.xz"; + sha256 = "0iml1y2xdwchn2gqgbvcvs2fbq78drh2r6068jlrc3hixbf76wsy"; + name = "kde-l10n-ga-16.04.0.tar.xz"; + }; + }; + kde-l10n-gl = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-gl-16.04.0.tar.xz"; + sha256 = "1v1hq61fwj2x8iiqjm9fwabzgc7m044narb1108cijl7d76lsn4m"; + name = "kde-l10n-gl-16.04.0.tar.xz"; + }; + }; + kde-l10n-he = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-he-16.04.0.tar.xz"; + sha256 = "0q1gj3gffin7l0r7xlp395zj5kdil8bnrl6apk2jslg7pz929dhb"; + name = "kde-l10n-he-16.04.0.tar.xz"; + }; + }; + kde-l10n-hi = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hi-16.04.0.tar.xz"; + sha256 = "19czqc6l4jn321zwygk7b46wgsimcbf8zvl30a0rkdvspwyvaqc5"; + name = "kde-l10n-hi-16.04.0.tar.xz"; + }; + }; + kde-l10n-hr = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hr-16.04.0.tar.xz"; + sha256 = "0bbcjrxgm5yqjz1y4ngm133hcvrp3c2z8lrycpg76g7j50w3fsi5"; + name = "kde-l10n-hr-16.04.0.tar.xz"; + }; + }; + kde-l10n-hu = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hu-16.04.0.tar.xz"; + sha256 = "0iww0m45gdlmf0j1jw8qljqar0dsmax4sxkr6yd3kswwr6m75v2i"; + name = "kde-l10n-hu-16.04.0.tar.xz"; + }; + }; + kde-l10n-ia = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ia-16.04.0.tar.xz"; + sha256 = "0ivgp1gjxshxq1fvn254k4gni30svyqfnlfz7d8niqp3msnfmc2b"; + name = "kde-l10n-ia-16.04.0.tar.xz"; + }; + }; + kde-l10n-id = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-id-16.04.0.tar.xz"; + sha256 = "15fnm4isigmgpxsgpqhj6gbvcrlhi51491a6fnxiwa3xmrc2pva8"; + name = "kde-l10n-id-16.04.0.tar.xz"; + }; + }; + kde-l10n-is = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-is-16.04.0.tar.xz"; + sha256 = "14bl3j2kqwg6cln84k5kpm400mnm4r81xhgmjpfb3xy92ms3sycr"; + name = "kde-l10n-is-16.04.0.tar.xz"; + }; + }; + kde-l10n-it = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-it-16.04.0.tar.xz"; + sha256 = "06akl5x2x0j50gyzw3m1yavxxw3jszyfyychsihn74fk8hslzp6m"; + name = "kde-l10n-it-16.04.0.tar.xz"; + }; + }; + kde-l10n-ja = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ja-16.04.0.tar.xz"; + sha256 = "1kcmryifsjripsxwa7qa7m3ky0wxaipz9smrfhhrnw41i62sfp9a"; + name = "kde-l10n-ja-16.04.0.tar.xz"; + }; + }; + kde-l10n-kk = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-kk-16.04.0.tar.xz"; + sha256 = "05c100727ydimn55jlvyynlgxzxncig2y4i4b53aslfi6h17fn0i"; + name = "kde-l10n-kk-16.04.0.tar.xz"; + }; + }; + kde-l10n-km = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-km-16.04.0.tar.xz"; + sha256 = "1shbg5vbzbgx07lbgi6ddhphh5b2bm9qd1gavls8alcgpbqj221c"; + name = "kde-l10n-km-16.04.0.tar.xz"; + }; + }; + kde-l10n-ko = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ko-16.04.0.tar.xz"; + sha256 = "1fjavkaivv6zspagqcbdhy7gdkmv38z20bv7fs45qf4470ffmwz5"; + name = "kde-l10n-ko-16.04.0.tar.xz"; + }; + }; + kde-l10n-lt = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-lt-16.04.0.tar.xz"; + sha256 = "09n4yc9grd7g3yqkgxj9x6hkygcqbx6dxi0jj6v98a5p50b78a5d"; + name = "kde-l10n-lt-16.04.0.tar.xz"; + }; + }; + kde-l10n-lv = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-lv-16.04.0.tar.xz"; + sha256 = "1c86bhsq0j0r2bmc6524g4sxc0bsw5sx6d4fxs6sxzx3bpdml5bq"; + name = "kde-l10n-lv-16.04.0.tar.xz"; + }; + }; + kde-l10n-mr = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-mr-16.04.0.tar.xz"; + sha256 = "1xp3fb99crsvf1xl45iy9q31nbs2735hxai1wlfn5h0q9scz2nin"; + name = "kde-l10n-mr-16.04.0.tar.xz"; + }; + }; + kde-l10n-nb = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nb-16.04.0.tar.xz"; + sha256 = "1dkfwqvbh6dxfxg4gznchpkwscc4g6rgwndxzjj53lvfz69611dj"; + name = "kde-l10n-nb-16.04.0.tar.xz"; + }; + }; + kde-l10n-nds = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nds-16.04.0.tar.xz"; + sha256 = "1pma4pn7h1r9y6dxs86xqh0ahvl04rhw8qad3cbyil2r1s7j80ac"; + name = "kde-l10n-nds-16.04.0.tar.xz"; + }; + }; + kde-l10n-nl = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nl-16.04.0.tar.xz"; + sha256 = "0bd49aylsklgp9rqs6nk72n0za9kcp7fjzr5myfavcxliwv8lhqp"; + name = "kde-l10n-nl-16.04.0.tar.xz"; + }; + }; + kde-l10n-nn = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nn-16.04.0.tar.xz"; + sha256 = "14acr8pchds4ib246fz6ml65qjkiifcxfs6r5hqh99l72im30hx1"; + name = "kde-l10n-nn-16.04.0.tar.xz"; + }; + }; + kde-l10n-pa = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pa-16.04.0.tar.xz"; + sha256 = "116dssrchp0yf173m3n8hkcfyr0k02bjlda24ikknjbh50y5kqfk"; + name = "kde-l10n-pa-16.04.0.tar.xz"; + }; + }; + kde-l10n-pl = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pl-16.04.0.tar.xz"; + sha256 = "1gibqcmgqvq9f1573jfchh7nhkd8czdi183n2smld4irsd750la8"; + name = "kde-l10n-pl-16.04.0.tar.xz"; + }; + }; + kde-l10n-pt = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pt-16.04.0.tar.xz"; + sha256 = "1yrjhqcl93fdch9nvzc2yk30rbzxsrya3xsj54xgxv2anggbr3wr"; + name = "kde-l10n-pt-16.04.0.tar.xz"; + }; + }; + kde-l10n-pt_BR = { + version = "pt_BR-16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pt_BR-16.04.0.tar.xz"; + sha256 = "0sbg767ddcknzs4k4v76ys00jxgqlxlggf5i9fw3dvaggs78azj7"; + name = "kde-l10n-pt_BR-16.04.0.tar.xz"; + }; + }; + kde-l10n-ro = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ro-16.04.0.tar.xz"; + sha256 = "0bz25pg9xj2n4vl2aadaj02p0jx37j3i37p7bvafsb499qpgprk2"; + name = "kde-l10n-ro-16.04.0.tar.xz"; + }; + }; + kde-l10n-ru = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ru-16.04.0.tar.xz"; + sha256 = "0jkljdc5i3hq7kkkq4gl7rh92ia4vv6m2vd74bsilibgxgb1kmah"; + name = "kde-l10n-ru-16.04.0.tar.xz"; + }; + }; + kde-l10n-sk = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sk-16.04.0.tar.xz"; + sha256 = "06lnlky47xq6fcjj70msc28q97cymsh0g4z06pbc0cyyby85521m"; + name = "kde-l10n-sk-16.04.0.tar.xz"; + }; + }; + kde-l10n-sl = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sl-16.04.0.tar.xz"; + sha256 = "0z2d8jx117prr35malcp0ca93ipbjj55s4dm3iad2iy2q728hkmv"; + name = "kde-l10n-sl-16.04.0.tar.xz"; + }; + }; + kde-l10n-sr = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sr-16.04.0.tar.xz"; + sha256 = "0w24mrb48qyc7diw40hwzplxb2rqlrrymvwnxbdy2d6x35hha0j4"; + name = "kde-l10n-sr-16.04.0.tar.xz"; + }; + }; + kde-l10n-sv = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sv-16.04.0.tar.xz"; + sha256 = "039q4d2y3vwxnpz6rwgf9s1ivhrlz26gp5kx3y9cz8fhcsa4jk8j"; + name = "kde-l10n-sv-16.04.0.tar.xz"; + }; + }; + kde-l10n-tr = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-tr-16.04.0.tar.xz"; + sha256 = "1sr5xxxzs29sah0azfc71w01nbm5njhgygpzll3lfx3padsvfz49"; + name = "kde-l10n-tr-16.04.0.tar.xz"; + }; + }; + kde-l10n-ug = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ug-16.04.0.tar.xz"; + sha256 = "16jpax5k3z8anhsf61wsi93n8ail8ybjpi31dnk859g0y50a4nr5"; + name = "kde-l10n-ug-16.04.0.tar.xz"; + }; + }; + kde-l10n-uk = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-uk-16.04.0.tar.xz"; + sha256 = "1275347grzcdm0jd9mzm1ww8dsh3g2ws5ppfxs3ip7jdsxgmcqh0"; + name = "kde-l10n-uk-16.04.0.tar.xz"; + }; + }; + kde-l10n-wa = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-wa-16.04.0.tar.xz"; + sha256 = "1gz918hj908308fd49pdbw1z8252shjbng5qgfzmdgfp9nvfhc14"; + name = "kde-l10n-wa-16.04.0.tar.xz"; + }; + }; + kde-l10n-zh_CN = { + version = "zh_CN-16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-zh_CN-16.04.0.tar.xz"; + sha256 = "1kyakzig301vylmib9wjb46llllw0jjiq18wys017hzjxykx170f"; + name = "kde-l10n-zh_CN-16.04.0.tar.xz"; + }; + }; + kde-l10n-zh_TW = { + version = "zh_TW-16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-zh_TW-16.04.0.tar.xz"; + sha256 = "0s2m1f4ylm6l3vp67h6v41n06pmk6762lk32wqy0l2fgg4zxrrzl"; + name = "kde-l10n-zh_TW-16.04.0.tar.xz"; + }; + }; + kdelibs = { + version = "4.14.19"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdelibs-4.14.19.tar.xz"; + sha256 = "0dfmhivd41y8c9pnag496rc8qlj78dg62liap5zdphgvi2baf8p6"; + name = "kdelibs-4.14.19.tar.xz"; + }; + }; + kdenetwork-filesharing = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdenetwork-filesharing-16.04.0.tar.xz"; + sha256 = "08rlg7ppqbi2xvq6ixjjw1xdr17n7bhzi2ymssxv8q1fmznfqhvp"; + name = "kdenetwork-filesharing-16.04.0.tar.xz"; + }; + }; + kdenetwork-strigi-analyzers = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdenetwork-strigi-analyzers-16.04.0.tar.xz"; + sha256 = "0i08niv87jn6bh6c1fknpqr7mkbg5csd8lgm39bwq551zgn7n6sw"; + name = "kdenetwork-strigi-analyzers-16.04.0.tar.xz"; + }; + }; + kdenlive = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdenlive-16.04.0.tar.xz"; + sha256 = "0ks30as7cnr9jcacj97c720pf2dn1wv8xg9mgxsin7c2lhbz8i5f"; + name = "kdenlive-16.04.0.tar.xz"; + }; + }; + kdepim = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdepim-16.04.0.tar.xz"; + sha256 = "0cd39hgr7gvv78mf5rypj7yjpfrnapd1pxad1aanlsr6ms5qdzyg"; + name = "kdepim-16.04.0.tar.xz"; + }; + }; + kdepim-addons = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdepim-addons-16.04.0.tar.xz"; + sha256 = "1dfvl0pd9269ghpjwydyws40flvw7clq2hq830m4jk6myqjccd4i"; + name = "kdepim-addons-16.04.0.tar.xz"; + }; + }; + kdepim-apps-libs = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdepim-apps-libs-16.04.0.tar.xz"; + sha256 = "1slnsssd242wzk0pga4l6i8q83gdca1vgmqixz82x4pvfj62bw7w"; + name = "kdepim-apps-libs-16.04.0.tar.xz"; + }; + }; + kdepimlibs = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdepimlibs-16.04.0.tar.xz"; + sha256 = "1mk8rjf918c5dfglv1sdrs6wjyf31dry4070ip3fx6kdph2x5akr"; + name = "kdepimlibs-16.04.0.tar.xz"; + }; + }; + kdepim-runtime = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdepim-runtime-16.04.0.tar.xz"; + sha256 = "0siwplwdbrsaikzfxbz9w00wk3xfg4a6y124nlwqx7588ni8brs3"; + name = "kdepim-runtime-16.04.0.tar.xz"; + }; + }; + kde-runtime = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kde-runtime-16.04.0.tar.xz"; + sha256 = "0sr06v4z6lbkacqgk8a35m3ldal1fcpvp6n2s8bfa226yck8sdq6"; + name = "kde-runtime-16.04.0.tar.xz"; + }; + }; + kdesdk-kioslaves = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdesdk-kioslaves-16.04.0.tar.xz"; + sha256 = "0lwdy4l48id0p3vkpk92n3ja6ymzxx9zl7iwwszb1rxbr48q4v7l"; + name = "kdesdk-kioslaves-16.04.0.tar.xz"; + }; + }; + kdesdk-strigi-analyzers = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdesdk-strigi-analyzers-16.04.0.tar.xz"; + sha256 = "1bn12pqqq9bgr6y916wd54i0dsw30ab9xhz99mqyjw2fcxpz4mf8"; + name = "kdesdk-strigi-analyzers-16.04.0.tar.xz"; + }; + }; + kdesdk-thumbnailers = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdesdk-thumbnailers-16.04.0.tar.xz"; + sha256 = "1wqlrkgix2nnpvlqqqdja4j5iws4vjglds94ra5s0wmyfk0y9yc2"; + name = "kdesdk-thumbnailers-16.04.0.tar.xz"; + }; + }; + kdewebdev = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdewebdev-16.04.0.tar.xz"; + sha256 = "1xmibm0hi0mdwsvp8h48qph4mjwb1k3q58i9y8s1c7vqczl1q09n"; + name = "kdewebdev-16.04.0.tar.xz"; + }; + }; + kdf = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdf-16.04.0.tar.xz"; + sha256 = "12bcvy6x8wkizjykrc3wmd3lbsj2zmiizxknic5jiwin6zqjrzh4"; + name = "kdf-16.04.0.tar.xz"; + }; + }; + kdgantt2 = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdgantt2-16.04.0.tar.xz"; + sha256 = "0j9b2f5zkvasv5w4paazyc47iph27nqd4l4nrwr3plvdirivdidf"; + name = "kdgantt2-16.04.0.tar.xz"; + }; + }; + kdiamond = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kdiamond-16.04.0.tar.xz"; + sha256 = "1alb6hv95whdy15kmc0kzx4758wjni6q2k3dxxpdhw0hq657v508"; + name = "kdiamond-16.04.0.tar.xz"; + }; + }; + kfloppy = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kfloppy-16.04.0.tar.xz"; + sha256 = "09jwqbfs0ayswlzih90bq439c8ljhay12jfv73gdnkvf23qiq5vw"; + name = "kfloppy-16.04.0.tar.xz"; + }; + }; + kfourinline = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kfourinline-16.04.0.tar.xz"; + sha256 = "13hgwn3gzyhvh4xw7ym80vsbnqbvhlvn3jwzjrxlj377q9q1h6i6"; + name = "kfourinline-16.04.0.tar.xz"; + }; + }; + kgeography = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kgeography-16.04.0.tar.xz"; + sha256 = "1pk76akkd5ykh9p1l757cqj8niwwavxdxwinkz51w0dz0n62zb4x"; + name = "kgeography-16.04.0.tar.xz"; + }; + }; + kget = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kget-16.04.0.tar.xz"; + sha256 = "17z2n0bgj1dm4d4abprnx8crw30flxxk95w8sv3483zqbk0k3p4i"; + name = "kget-16.04.0.tar.xz"; + }; + }; + kgoldrunner = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kgoldrunner-16.04.0.tar.xz"; + sha256 = "019dk1nq1jmk7w3lklxlsy667m7vahspjd0w5rrpas54czl975w8"; + name = "kgoldrunner-16.04.0.tar.xz"; + }; + }; + kgpg = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kgpg-16.04.0.tar.xz"; + sha256 = "0qrijbwnrg61kwmv7l5k6796lbr9ry4grmk9jc38cq2g7bi64wz2"; + name = "kgpg-16.04.0.tar.xz"; + }; + }; + khangman = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/khangman-16.04.0.tar.xz"; + sha256 = "0ljrap9ybccmwymkay7760rgmpp51cssnvn4lwmd3mig5cfqlavs"; + name = "khangman-16.04.0.tar.xz"; + }; + }; + khelpcenter = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/khelpcenter-16.04.0.tar.xz"; + sha256 = "1r6aysdnc0qdg9lbzy1zb6pirfyfah3sbjsqkmrnf63kqsyjvapy"; + name = "khelpcenter-16.04.0.tar.xz"; + }; + }; + kholidays = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kholidays-16.04.0.tar.xz"; + sha256 = "04gfy3f5fip79ra08m3f098cbgp0k7v76lam3513r0zvl0h53gad"; + name = "kholidays-16.04.0.tar.xz"; + }; + }; + kidentitymanagement = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kidentitymanagement-16.04.0.tar.xz"; + sha256 = "0dhpjgmz7ndbk77syp1zvk5g7sn991wjx5cllk6dx0q9ylfl1895"; + name = "kidentitymanagement-16.04.0.tar.xz"; + }; + }; + kig = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kig-16.04.0.tar.xz"; + sha256 = "0rlx7cm41z8zm4v4rdwmwicam2g2ibd0gmzlsnh77s4cv8xhmd7y"; + name = "kig-16.04.0.tar.xz"; + }; + }; + kigo = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kigo-16.04.0.tar.xz"; + sha256 = "1cw8hyhayn650j73kqr8aqzj6wd6bq21l5c4ibl2qm90p1byj6zz"; + name = "kigo-16.04.0.tar.xz"; + }; + }; + killbots = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/killbots-16.04.0.tar.xz"; + sha256 = "1qnrwj1shy7ah2x0nh03r0zf3h8535qxxg62wgyg675n80ndl6wh"; + name = "killbots-16.04.0.tar.xz"; + }; + }; + kimap = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kimap-16.04.0.tar.xz"; + sha256 = "028xpqdxgylab6sznzxdd7pyfm7l27mzj13zzxhd7lc7fqd3xgx9"; + name = "kimap-16.04.0.tar.xz"; + }; + }; + kio-extras = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kio-extras-16.04.0.tar.xz"; + sha256 = "0iims3vk5mqz8lnpimwc3kjlvkmfh10287zy4sm5p8kxxfgz88fj"; + name = "kio-extras-16.04.0.tar.xz"; + }; + }; + kiriki = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kiriki-16.04.0.tar.xz"; + sha256 = "0bywgx8j1kx5x5j4h5bv8zrf73pkdzd96wharrgia0x55kmnzgn2"; + name = "kiriki-16.04.0.tar.xz"; + }; + }; + kiten = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kiten-16.04.0.tar.xz"; + sha256 = "12d0p468439llj5jyxyd7qhr2zavdkbl8s87qcfhw7lngsnssq34"; + name = "kiten-16.04.0.tar.xz"; + }; + }; + kjumpingcube = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kjumpingcube-16.04.0.tar.xz"; + sha256 = "1grrcfblnfr2p6a72n38r6awkfm662brnv1r2k4kqbiz0qmwmvyd"; + name = "kjumpingcube-16.04.0.tar.xz"; + }; + }; + kldap = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kldap-16.04.0.tar.xz"; + sha256 = "1gbm7rgf2llxdnckzlnsjii9jd8s59hym96hf9v87svbphbm1738"; + name = "kldap-16.04.0.tar.xz"; + }; + }; + kleopatra = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kleopatra-16.04.0.tar.xz"; + sha256 = "0rmzsqvp0xwyjr25d2vnslgg6cvni9km8hkijyhz8zrmnmpdm97z"; + name = "kleopatra-16.04.0.tar.xz"; + }; + }; + klettres = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/klettres-16.04.0.tar.xz"; + sha256 = "17m30hkjjrk5h4a5z1c96sgl8i0729537q11v9ndj8kh1699sfxs"; + name = "klettres-16.04.0.tar.xz"; + }; + }; + klickety = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/klickety-16.04.0.tar.xz"; + sha256 = "0ggj585vki81ds94k9i7b1sawzxz24k582zm5d3lngipcb1x808l"; + name = "klickety-16.04.0.tar.xz"; + }; + }; + klines = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/klines-16.04.0.tar.xz"; + sha256 = "1000j5n9hzr3ffpi7mj5aicflr5gvbbd02s4l2qy9ghgxf5ghfzw"; + name = "klines-16.04.0.tar.xz"; + }; + }; + kmag = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmag-16.04.0.tar.xz"; + sha256 = "0z9jrd9a9xmxsbk6xckiqvidd6f9dcj1lfav818fm1wf5jr04v40"; + name = "kmag-16.04.0.tar.xz"; + }; + }; + kmahjongg = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmahjongg-16.04.0.tar.xz"; + sha256 = "0wl7mv20zal3nx3y1cdc8xq0vhkvb8rb8sag8kb66a1ch8zdzw9s"; + name = "kmahjongg-16.04.0.tar.xz"; + }; + }; + kmailtransport = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmailtransport-16.04.0.tar.xz"; + sha256 = "0imw47nlfnd1qq2c91ig7cmwrcm1c9jcqfxvi1svllbwy9bgab3i"; + name = "kmailtransport-16.04.0.tar.xz"; + }; + }; + kmbox = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmbox-16.04.0.tar.xz"; + sha256 = "1w2y6nda7p5wfl76rmirpglgar8qxhyynx66k5qnvfpvk8xa02wk"; + name = "kmbox-16.04.0.tar.xz"; + }; + }; + kmime = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmime-16.04.0.tar.xz"; + sha256 = "04hqdl1kbqv3xm0qvdsrvjs1fnsymqfw2yn286rh7ynlix4p09zz"; + name = "kmime-16.04.0.tar.xz"; + }; + }; + kmines = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmines-16.04.0.tar.xz"; + sha256 = "0q8jqycwsjadi10a1ycxn09507j85lh0zwxq1b374cdb01m7ajzw"; + name = "kmines-16.04.0.tar.xz"; + }; + }; + kmix = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmix-16.04.0.tar.xz"; + sha256 = "0nmfjrxdxpkvxrsp06w6ddcyhfasmzvn8hk44n4wd9v86vgi29cz"; + name = "kmix-16.04.0.tar.xz"; + }; + }; + kmousetool = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmousetool-16.04.0.tar.xz"; + sha256 = "1g2lgmimkq9yb8s1lypwh4cz5zxih4fppcqcjlgwcpg0n4ia2hh7"; + name = "kmousetool-16.04.0.tar.xz"; + }; + }; + kmouth = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmouth-16.04.0.tar.xz"; + sha256 = "0bqqjs2khdhqgd3apk7bd8sayb9dg6mwc8f211z7zb03xvgb95nd"; + name = "kmouth-16.04.0.tar.xz"; + }; + }; + kmplot = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kmplot-16.04.0.tar.xz"; + sha256 = "1q76bl3604qcp67w754qsncsg0mw5vm9c5jp8hj6i9vksdl8i3n8"; + name = "kmplot-16.04.0.tar.xz"; + }; + }; + knavalbattle = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/knavalbattle-16.04.0.tar.xz"; + sha256 = "0q0k37dvw8pajxcmsv25if726ml9mzdm6am2q22x64hblsgmva0h"; + name = "knavalbattle-16.04.0.tar.xz"; + }; + }; + knetwalk = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/knetwalk-16.04.0.tar.xz"; + sha256 = "0i00lnw31jb7lb18r6r8k4k61syjak7pglwxwbah96wxrrmdnvpk"; + name = "knetwalk-16.04.0.tar.xz"; + }; + }; + kolf = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kolf-16.04.0.tar.xz"; + sha256 = "1b0247wpnzm9lz82d5v3wv28cacj3b7r5rirdg8plri5y2gks8ql"; + name = "kolf-16.04.0.tar.xz"; + }; + }; + kollision = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kollision-16.04.0.tar.xz"; + sha256 = "1hmgw5410xznjddv1x2jg6v1rv6hkksr281ylhdb2ca8zh2wdwqi"; + name = "kollision-16.04.0.tar.xz"; + }; + }; + kolourpaint = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kolourpaint-16.04.0.tar.xz"; + sha256 = "13x7r8k60q0nnip37xadqdypm88c2zrfk2nhlllhqb41d23hbbsw"; + name = "kolourpaint-16.04.0.tar.xz"; + }; + }; + kompare = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kompare-16.04.0.tar.xz"; + sha256 = "1yd06ykjbi5kvas9vrnhy9svpsvlk4y8xvs963vvi0jdw7x5ylzj"; + name = "kompare-16.04.0.tar.xz"; + }; + }; + konquest = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/konquest-16.04.0.tar.xz"; + sha256 = "198s495slqi7fffmsnn6pj90mi51bjw3grkr033l4z0lmxhqljmb"; + name = "konquest-16.04.0.tar.xz"; + }; + }; + konsole = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/konsole-16.04.0.tar.xz"; + sha256 = "06c3d01h658g00yi4vhc8rk6ndxs4ha0pj6y0w4d10g78zcnjmd4"; + name = "konsole-16.04.0.tar.xz"; + }; + }; + kontactinterface = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kontactinterface-16.04.0.tar.xz"; + sha256 = "1plhya2xpvvsx2japbiq8v5a2c1rbw77jf3q278kqwracrkgsiax"; + name = "kontactinterface-16.04.0.tar.xz"; + }; + }; + kopete = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kopete-16.04.0.tar.xz"; + sha256 = "1xcaz0f6cmjxy7sifxhlm7jvndj238azx59xg4glrk4mhrnac5m7"; + name = "kopete-16.04.0.tar.xz"; + }; + }; + kpat = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kpat-16.04.0.tar.xz"; + sha256 = "06xsisy0sv8rldpc2fw3hc4dr66wmxbw006x3p9gi1xxwqlp8j3w"; + name = "kpat-16.04.0.tar.xz"; + }; + }; + kpimtextedit = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kpimtextedit-16.04.0.tar.xz"; + sha256 = "0wkxqqyifvgd1h2i2q3958diwybff8m2wc7g9grl6wagj0rbr6y8"; + name = "kpimtextedit-16.04.0.tar.xz"; + }; + }; + kppp = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kppp-16.04.0.tar.xz"; + sha256 = "0z53n7cppr79z7k8siaadrspl1134gw5a7wx02jigl0kihm9sykf"; + name = "kppp-16.04.0.tar.xz"; + }; + }; + kqtquickcharts = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kqtquickcharts-16.04.0.tar.xz"; + sha256 = "12x3mgxba4bfi7imli22a8m3af3hkq3fkx192ij3wx8ils7b6in7"; + name = "kqtquickcharts-16.04.0.tar.xz"; + }; + }; + krdc = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/krdc-16.04.0.tar.xz"; + sha256 = "0azlvqai97ki33dc448zw76hqbsqzd6a5k7gj9fsj8pg11m06kn4"; + name = "krdc-16.04.0.tar.xz"; + }; + }; + kremotecontrol = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kremotecontrol-16.04.0.tar.xz"; + sha256 = "027ljqfxl9gsn6q5rld0azqzg3a1ky96045i809dzhdwknrz014a"; + name = "kremotecontrol-16.04.0.tar.xz"; + }; + }; + kreversi = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kreversi-16.04.0.tar.xz"; + sha256 = "193vj6qdshh0k7jn7ca63yfkb99sbb0xn3fhyd65iimwcyziz6yj"; + name = "kreversi-16.04.0.tar.xz"; + }; + }; + krfb = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/krfb-16.04.0.tar.xz"; + sha256 = "1xcnvs9l2w5awfkxzq2yi0chpljip8nkc3zqlzlqnchkzpxy568j"; + name = "krfb-16.04.0.tar.xz"; + }; + }; + kross-interpreters = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kross-interpreters-16.04.0.tar.xz"; + sha256 = "18sc600x5yki1rngxa9ng6zrw5yam824sf05filwa6m22kxi91y8"; + name = "kross-interpreters-16.04.0.tar.xz"; + }; + }; + kruler = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kruler-16.04.0.tar.xz"; + sha256 = "07p85apr7rvgwphnd7vwpmyn8i26m1px4ssq54wk9kindxcs2awg"; + name = "kruler-16.04.0.tar.xz"; + }; + }; + ksaneplugin = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ksaneplugin-16.04.0.tar.xz"; + sha256 = "0ldgj3pna0y7ayyw8nz2ybj8g6i1i7axd96sgpgx11708jqphy91"; + name = "ksaneplugin-16.04.0.tar.xz"; + }; + }; + kscd = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kscd-16.04.0.tar.xz"; + sha256 = "0k1dxi6gimy41d8mjcb371fkv8z64cdjhyisdgsyfqq6klhy93ss"; + name = "kscd-16.04.0.tar.xz"; + }; + }; + kshisen = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kshisen-16.04.0.tar.xz"; + sha256 = "1k75l3y89hv0gs08kfczb1avy5i5h964xf4b976hslzhpvwi8w1q"; + name = "kshisen-16.04.0.tar.xz"; + }; + }; + ksirk = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ksirk-16.04.0.tar.xz"; + sha256 = "0hswi5f0r10yjm9rdiffaw96d5wwjwcnv2g07hh7lc1w6irmq7v7"; + name = "ksirk-16.04.0.tar.xz"; + }; + }; + ksnakeduel = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ksnakeduel-16.04.0.tar.xz"; + sha256 = "1666k9q065xrij07fbwv1b1xa23p02qk3b366cfhd38kf1shp9fg"; + name = "ksnakeduel-16.04.0.tar.xz"; + }; + }; + kspaceduel = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kspaceduel-16.04.0.tar.xz"; + sha256 = "03jqb8yn5jgdc9pd92bpbkvr8vwr91cpvmzgmmrqi4llj3cjpp9x"; + name = "kspaceduel-16.04.0.tar.xz"; + }; + }; + ksquares = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ksquares-16.04.0.tar.xz"; + sha256 = "11fqvpkghvy54zrvyvwk9kasx3i1clw8rj4bjphif2nr6sc5wdi7"; + name = "ksquares-16.04.0.tar.xz"; + }; + }; + kstars = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kstars-16.04.0.tar.xz"; + sha256 = "0h648mnp6l5msv56pmwrm5197hdx20jmw2wzdflx09lj3iir6d1y"; + name = "kstars-16.04.0.tar.xz"; + }; + }; + ksudoku = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ksudoku-16.04.0.tar.xz"; + sha256 = "1d6mwhcsa09yrrd43a842xzyf87hpqwlhp1x82f9kx31hkq1hs6m"; + name = "ksudoku-16.04.0.tar.xz"; + }; + }; + ksystemlog = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ksystemlog-16.04.0.tar.xz"; + sha256 = "0qcycfyj1wk730hcnzjn75wf6vcxd6svmvqz6q3q85rrjjs3am6s"; + name = "ksystemlog-16.04.0.tar.xz"; + }; + }; + kteatime = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kteatime-16.04.0.tar.xz"; + sha256 = "0yhldn2d2kz0kf5s1s8wkmmg73v620mf2h5prf59hqygkdzmxq1n"; + name = "kteatime-16.04.0.tar.xz"; + }; + }; + ktimer = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktimer-16.04.0.tar.xz"; + sha256 = "0p925v4h944vsp8br581wdlnfvp51yq92kf8xfsgc8d7r85h28w4"; + name = "ktimer-16.04.0.tar.xz"; + }; + }; + ktnef = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktnef-16.04.0.tar.xz"; + sha256 = "1n1hi22l1cgjq989dhglm1m47f8bg3zdpsyh506qa3j7fg2y3rs6"; + name = "ktnef-16.04.0.tar.xz"; + }; + }; + ktouch = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktouch-16.04.0.tar.xz"; + sha256 = "19n33p2yirxh21i7ij2bncqksz1i2k57c2cwrzzq40a3b9dndimc"; + name = "ktouch-16.04.0.tar.xz"; + }; + }; + ktp-accounts-kcm = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-accounts-kcm-16.04.0.tar.xz"; + sha256 = "1mr7f481dcgg3gyyzycs92n7s2ap5kyv7xy2dmf7rypz1xkp2sya"; + name = "ktp-accounts-kcm-16.04.0.tar.xz"; + }; + }; + ktp-approver = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-approver-16.04.0.tar.xz"; + sha256 = "1mqbvb797mms4mwk5v5xkh2z67fkh1ayhkjq0hgj0wi3a2x65zx8"; + name = "ktp-approver-16.04.0.tar.xz"; + }; + }; + ktp-auth-handler = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-auth-handler-16.04.0.tar.xz"; + sha256 = "1l7rlqiaaffcdpplznkbhhrn41q7f1vx4ripjizj0q8a62fivbr6"; + name = "ktp-auth-handler-16.04.0.tar.xz"; + }; + }; + ktp-call-ui = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-call-ui-16.04.0.tar.xz"; + sha256 = "0ndknp2c3qyd894cavxbp7kfc8rxgz7pcd3gvsrwdgk31k4jajyx"; + name = "ktp-call-ui-16.04.0.tar.xz"; + }; + }; + ktp-common-internals = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-common-internals-16.04.0.tar.xz"; + sha256 = "1q0bwnsna9h7lj8pva1kzmn8qnlgyynbvldgcr85g713jr2lnmr8"; + name = "ktp-common-internals-16.04.0.tar.xz"; + }; + }; + ktp-contact-list = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-contact-list-16.04.0.tar.xz"; + sha256 = "07ffzrzm5y8kgz6cxjsj8kkgsnvprrjkl4ck8y0san47gk2p5rb7"; + name = "ktp-contact-list-16.04.0.tar.xz"; + }; + }; + ktp-contact-runner = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-contact-runner-16.04.0.tar.xz"; + sha256 = "0rcpci13hz9xdc51p364rvyi50vkjjgmf74wkwmaxc57sclf5bwi"; + name = "ktp-contact-runner-16.04.0.tar.xz"; + }; + }; + ktp-desktop-applets = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-desktop-applets-16.04.0.tar.xz"; + sha256 = "01w3cdbrii14211wgn9vl3l108za5bw22f39pyznf1bqjimdz4nh"; + name = "ktp-desktop-applets-16.04.0.tar.xz"; + }; + }; + ktp-filetransfer-handler = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-filetransfer-handler-16.04.0.tar.xz"; + sha256 = "1sf7xg317dgcdvnj2j9hq63633d6iyl7rgn22xryawpq2iw3wz9n"; + name = "ktp-filetransfer-handler-16.04.0.tar.xz"; + }; + }; + ktp-kded-module = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-kded-module-16.04.0.tar.xz"; + sha256 = "13zsgzipmkn15h83ziwa3wg1dcin4lqawmhapkhlf4xxs8wm1mb6"; + name = "ktp-kded-module-16.04.0.tar.xz"; + }; + }; + ktp-send-file = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-send-file-16.04.0.tar.xz"; + sha256 = "0sdwrj644n80xnx8syycpiwwn432ww2i3vvx1v6sj696gcrkv7i4"; + name = "ktp-send-file-16.04.0.tar.xz"; + }; + }; + ktp-text-ui = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktp-text-ui-16.04.0.tar.xz"; + sha256 = "1pgz1hzrkmx6k88cghgacgjykmkbjvvm1hhyr377hgvdhrfc6scy"; + name = "ktp-text-ui-16.04.0.tar.xz"; + }; + }; + ktuberling = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/ktuberling-16.04.0.tar.xz"; + sha256 = "1w7qv0iacjhr9yphm3kxxiwh2c17x6ky4i2yzb178nb5sh6dgdig"; + name = "ktuberling-16.04.0.tar.xz"; + }; + }; + kturtle = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kturtle-16.04.0.tar.xz"; + sha256 = "1as62h92dx4f1n1fb1lhsyvx90msl2392b595hfsgkhgqb4spn3y"; + name = "kturtle-16.04.0.tar.xz"; + }; + }; + kubrick = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kubrick-16.04.0.tar.xz"; + sha256 = "1vvh3yzpcri1yyc3z4djkr8sjs03pbrwinrz0f4iwah8diyrdpy0"; + name = "kubrick-16.04.0.tar.xz"; + }; + }; + kuser = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kuser-16.04.0.tar.xz"; + sha256 = "11fradjslci2znglh24wcljhpld4zp206r0wrp392hjc4i6ck069"; + name = "kuser-16.04.0.tar.xz"; + }; + }; + kwalletmanager = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kwalletmanager-16.04.0.tar.xz"; + sha256 = "1wqdhwvkxky0c4lnm9b3akjvb2ydx3qx3hr08959za7kkk976nmb"; + name = "kwalletmanager-16.04.0.tar.xz"; + }; + }; + kwordquiz = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/kwordquiz-16.04.0.tar.xz"; + sha256 = "0yk95l6gl57hs62l8xvi9xfrzmkcch0v3ijasqhg20i4w33309z0"; + name = "kwordquiz-16.04.0.tar.xz"; + }; + }; + libgravatar = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libgravatar-16.04.0.tar.xz"; + sha256 = "0kbvy90r5x1s1s3h680cqiqj221gicvy8j0pwid5vr2pxjkdih0l"; + name = "libgravatar-16.04.0.tar.xz"; + }; + }; + libkcddb = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkcddb-16.04.0.tar.xz"; + sha256 = "1wylsqij5l3w4pvw3g2jkypqpn3a8fg72x7q5dp22l0n9ihrhn8j"; + name = "libkcddb-16.04.0.tar.xz"; + }; + }; + libkcompactdisc = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkcompactdisc-16.04.0.tar.xz"; + sha256 = "0zf3bry65jak3z4kjhnszjy05h4pvnzzz7nh954cmigv369iwsz8"; + name = "libkcompactdisc-16.04.0.tar.xz"; + }; + }; + libkdcraw = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkdcraw-16.04.0.tar.xz"; + sha256 = "0l6aa2458apxbz1hm300w3s32ywxjhy80vnm3sxnk3313ba38cml"; + name = "libkdcraw-16.04.0.tar.xz"; + }; + }; + libkdeedu = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkdeedu-16.04.0.tar.xz"; + sha256 = "16aabzc57qjjzmfmsnb4rjw28w4014l66dsy528rfj5i0wyw40vy"; + name = "libkdeedu-16.04.0.tar.xz"; + }; + }; + libkdegames = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkdegames-16.04.0.tar.xz"; + sha256 = "0nr3z1plcinx0hw9q1gac32czgy6079q36v57qk76l6531cssk73"; + name = "libkdegames-16.04.0.tar.xz"; + }; + }; + libkdepim = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkdepim-16.04.0.tar.xz"; + sha256 = "0197r1hdx6cpakmvcp1195bm1vn71y8sprbx23n4m9ak92ak9z6x"; + name = "libkdepim-16.04.0.tar.xz"; + }; + }; + libkeduvocdocument = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkeduvocdocument-16.04.0.tar.xz"; + sha256 = "0j92kjhj143z4g9702ir4xs0hdpkk74ydi9347cvb1vh8mq7wqn0"; + name = "libkeduvocdocument-16.04.0.tar.xz"; + }; + }; + libkexiv2 = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkexiv2-16.04.0.tar.xz"; + sha256 = "1n3bhzlw729vka1lc00sw75m7cfg5ibqh2lliv6lv9g9aqb7xk0z"; + name = "libkexiv2-16.04.0.tar.xz"; + }; + }; + libkface = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkface-16.04.0.tar.xz"; + sha256 = "1vykpj8yws1sd4x3zcpjlrlq9ygybia4wi34qcakx5016fym2qxb"; + name = "libkface-16.04.0.tar.xz"; + }; + }; + libkgeomap = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkgeomap-16.04.0.tar.xz"; + sha256 = "0kl2wzxmy25398amk3631vql0vh66vd2j9qdxzjb9lvlw7gvn55s"; + name = "libkgeomap-16.04.0.tar.xz"; + }; + }; + libkipi = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkipi-16.04.0.tar.xz"; + sha256 = "0ffa57f1p86sdqq1spf5bvzh2vfa9wfhm8lrhs6mfrr0nr65v85x"; + name = "libkipi-16.04.0.tar.xz"; + }; + }; + libkleo = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkleo-16.04.0.tar.xz"; + sha256 = "0yw36vxscwh10bnn20lbas06j1pcwdgd08qhd8hfdl9yajg9jg0w"; + name = "libkleo-16.04.0.tar.xz"; + }; + }; + libkmahjongg = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkmahjongg-16.04.0.tar.xz"; + sha256 = "08vh9mpxy4i9lnd8a57i443lr77b5am50w4xnpssi0jfy0jjsxkr"; + name = "libkmahjongg-16.04.0.tar.xz"; + }; + }; + libkomparediff2 = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libkomparediff2-16.04.0.tar.xz"; + sha256 = "137p3c07f7ni5khwbnb9fm9i8vprn0y0wzqmlfa2rhc78bn0czsl"; + name = "libkomparediff2-16.04.0.tar.xz"; + }; + }; + libksane = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libksane-16.04.0.tar.xz"; + sha256 = "07944vywdm13swqh5psw6jv36f6hdxqhrb718wicjlr57lbg65mb"; + name = "libksane-16.04.0.tar.xz"; + }; + }; + libksieve = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/libksieve-16.04.0.tar.xz"; + sha256 = "15gwg02sand97khvdl22zhqq734n4xdbndldzla0jh2jxixa2ihn"; + name = "libksieve-16.04.0.tar.xz"; + }; + }; + lokalize = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/lokalize-16.04.0.tar.xz"; + sha256 = "1r77pmy2dxnbxh1dgcmrpz2d6kpnj6z31yan1lkr8wf0fgh7355i"; + name = "lokalize-16.04.0.tar.xz"; + }; + }; + lskat = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/lskat-16.04.0.tar.xz"; + sha256 = "1px4wv9kxqqvrdmk9v4bw212mdjwl0v7qbh8mmyq8j06axf3a6jm"; + name = "lskat-16.04.0.tar.xz"; + }; + }; + mailcommon = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/mailcommon-16.04.0.tar.xz"; + sha256 = "0s62kzjas1zs9cm06lfk37d3nx4h0h0m75i3wlj87spd7hg8p2i1"; + name = "mailcommon-16.04.0.tar.xz"; + }; + }; + mailimporter = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/mailimporter-16.04.0.tar.xz"; + sha256 = "0ij07frw0bf3h8hlkdacdv8a2czsaipkjqwlscbsl5vcplfxpsxv"; + name = "mailimporter-16.04.0.tar.xz"; + }; + }; + marble = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/marble-16.04.0.tar.xz"; + sha256 = "05idh1011njasxr24r2cd16i07720af1qqvba3anfx20nav1sxgr"; + name = "marble-16.04.0.tar.xz"; + }; + }; + messagelib = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/messagelib-16.04.0.tar.xz"; + sha256 = "0zh4fxs33yvvn9wgfs47d016bhzss1mr7qjyq023mrlmsl7jnpr8"; + name = "messagelib-16.04.0.tar.xz"; + }; + }; + minuet = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/minuet-16.04.0.tar.xz"; + sha256 = "0jyrl2rxl1dllv2d99vrga7jn3dqqkrkvhg3bv7a80w766j9hq8g"; + name = "minuet-16.04.0.tar.xz"; + }; + }; + mplayerthumbs = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/mplayerthumbs-16.04.0.tar.xz"; + sha256 = "0mkgnxli1pysrzqbcxky6hsmcvjww7zly82ya2p4nsjr71g8laid"; + name = "mplayerthumbs-16.04.0.tar.xz"; + }; + }; + okteta = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/okteta-16.04.0.tar.xz"; + sha256 = "01p4sqd1j75nyg3aax15b5z3dnppnzc27ci61yzsa3jhd0470n3c"; + name = "okteta-16.04.0.tar.xz"; + }; + }; + okular = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/okular-16.04.0.tar.xz"; + sha256 = "0dn9vm22hc30v1fhly52fmbvjd6my2zxvl08f44jwimbh7wh9rw0"; + name = "okular-16.04.0.tar.xz"; + }; + }; + palapeli = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/palapeli-16.04.0.tar.xz"; + sha256 = "1yrph8a07jm69cg5gj0rgc4mgqfvqg024wald724yyydbcx5i8br"; + name = "palapeli-16.04.0.tar.xz"; + }; + }; + parley = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/parley-16.04.0.tar.xz"; + sha256 = "17lwb2vy36hrpgz3f9hrfikp7kz36xq013ym4cijh26xysha2gsx"; + name = "parley-16.04.0.tar.xz"; + }; + }; + picmi = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/picmi-16.04.0.tar.xz"; + sha256 = "0w2x9c0bd26b34ckmyzcfn980kbsq0y5zw3kfw3dsh5q8n0c627f"; + name = "picmi-16.04.0.tar.xz"; + }; + }; + pimcommon = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/pimcommon-16.04.0.tar.xz"; + sha256 = "0c0xkg2vd5jps0nfy661z2np17gygpyvkdc6cp5ir41b5sk2fz4h"; + name = "pimcommon-16.04.0.tar.xz"; + }; + }; + poxml = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/poxml-16.04.0.tar.xz"; + sha256 = "1zwg7b4j5ijs9sry8hl7fnnli8hsw3gy685cdgpairgj46yyryx8"; + name = "poxml-16.04.0.tar.xz"; + }; + }; + print-manager = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/print-manager-16.04.0.tar.xz"; + sha256 = "1kl68fz52zjwfs9kprihar0i6n6sg6s40slblfhvi60s1g5krf4m"; + name = "print-manager-16.04.0.tar.xz"; + }; + }; + rocs = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/rocs-16.04.0.tar.xz"; + sha256 = "05wc9b93csf7bsbmy99jcnml7n0mgfql1rvrs3z8jcz17jnfcx9s"; + name = "rocs-16.04.0.tar.xz"; + }; + }; + signon-kwallet-extension = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/signon-kwallet-extension-16.04.0.tar.xz"; + sha256 = "0a36gklixkkwgnhs3w3z3l14p6x6r0xgzcqw344g36v1x3imvspf"; + name = "signon-kwallet-extension-16.04.0.tar.xz"; + }; + }; + spectacle = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/spectacle-16.04.0.tar.xz"; + sha256 = "0c0qmgjd32iam0zd4n08kmajfqpfsa0zphxvgq2rh7plxw3npfga"; + name = "spectacle-16.04.0.tar.xz"; + }; + }; + step = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/step-16.04.0.tar.xz"; + sha256 = "18imzm9v2gbf64f3p08a3l7r7axyjsmi2xvbqvg0ir2ly3pabrx0"; + name = "step-16.04.0.tar.xz"; + }; + }; + svgpart = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/svgpart-16.04.0.tar.xz"; + sha256 = "11793djb9v499b11kwr1312p9j9hhrjk7i67035s64lblrnbb9yw"; + name = "svgpart-16.04.0.tar.xz"; + }; + }; + sweeper = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/sweeper-16.04.0.tar.xz"; + sha256 = "0hahwmiziiwraahssxzsxfzvyli4lmj7fdskqnv9q7b39hai88j7"; + name = "sweeper-16.04.0.tar.xz"; + }; + }; + syndication = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/syndication-16.04.0.tar.xz"; + sha256 = "0m8dacbqdg9vya2c8gknckx8xjp6m9s93vxd4j6a78jz28j6yvcc"; + name = "syndication-16.04.0.tar.xz"; + }; + }; + umbrello = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/umbrello-16.04.0.tar.xz"; + sha256 = "11b7a7bg9v2gdl4hjpfz06k5ks2v36ai70iri6rcp0lw9bcspig2"; + name = "umbrello-16.04.0.tar.xz"; + }; + }; + zeroconf-ioslave = { + version = "16.04.0"; + src = fetchurl { + url = "${mirror}/stable/applications/16.04.0/src/zeroconf-ioslave-16.04.0.tar.xz"; + sha256 = "0ablccfi3kq18rcx79jwn9z317qyflb05ck9kalqpr7f8xnmhzn3"; + name = "zeroconf-ioslave-16.04.0.tar.xz"; + }; + }; +} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix deleted file mode 100644 index 3225098f439..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig -, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n -, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative -}: - -kdeFramework { - name = "kactivities"; - nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - boost kcmutils kconfig kcoreaddons kdbusaddons kservice - kxmlgui - ]; - propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative - ]; - postInstall = '' - wrapQtProgram "$out/bin/kactivitymanagerd" - ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix deleted file mode 100644 index be99c58d550..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2 -, ffmpeg, karchive, ki18n, poppler, qtbase, taglib -}: - -kdeFramework { - name = "kfilemetadata"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; - propagatedBuildInputs = [ qtbase ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.19/kinit/kinit-libpath.patch deleted file mode 100644 index 52c5563ea58..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/kinit/kinit-libpath.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: kinit-5.19.0/src/kdeinit/kinit.cpp -=================================================================== ---- kinit-5.19.0.orig/src/kdeinit/kinit.cpp -+++ kinit-5.19.0/src/kdeinit/kinit.cpp -@@ -658,15 +658,17 @@ static pid_t launch(int argc, const char - if (!libpath.isEmpty()) { - if (!l.load()) { - if (libpath_relative) { -- // NB: Because Qt makes the actual dlopen() call, the -- // RUNPATH of kdeinit is *not* respected - see -- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 -- // - so we try hacking it in ourselves -- QString install_lib_dir = QFile::decodeName( -- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); -- libpath = install_lib_dir + libpath; -- l.setFileName(libpath); -- l.load(); -+ // Try to load the library relative to the active profiles. -+ QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); -+ // Reverse the profile list. -+ std::reverse(profiles.begin(), profiles.end()); -+ const QString libdir = QString::fromLatin1("/lib/"); -+ Q_FOREACH (const QByteArray &profile, profiles) { -+ if (!profile.isEmpty()) { -+ l.setFileName(QFile::decodeName(profile) + libdir + libpath); -+ if (l.load()) break; -+ } -+ } - } - } - if (!l.isLoaded()) { diff --git a/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix deleted file mode 100644 index 7e301dd0f26..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ kdeFramework, lib -, extra-cmake-modules -, kcodecs -, kconfig -, kcoreaddons -, kwindowsystem -, phonon -, qtx11extras -}: - -kdeFramework { - name = "knotifications"; - nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs kconfig kcoreaddons phonon - ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 3d8397d8ee2..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:28:57 -0500 -Subject: [PATCH 1/2] qdiriterator follow symlinks - ---- - src/sycoca/kbuildsycoca.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp -index 1deae14..250baa8 100644 ---- a/src/sycoca/kbuildsycoca.cpp -+++ b/src/sycoca/kbuildsycoca.cpp -@@ -208,7 +208,7 @@ bool KBuildSycoca::build() - QStringList relFiles; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); - Q_FOREACH (const QString &dir, dirs) { -- QDirIterator it(dir, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString filePath = it.next(); - Q_ASSERT(filePath.startsWith(dir)); // due to the line below... --- -2.5.2 - diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch deleted file mode 100644 index 685c6852611..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Wed, 14 Oct 2015 06:31:29 -0500 -Subject: [PATCH 2/2] no canonicalize path - ---- - src/sycoca/vfolder_menu.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp -index d3e31c3..d15d743 100644 ---- a/src/sycoca/vfolder_menu.cpp -+++ b/src/sycoca/vfolder_menu.cpp -@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR - } - - if (!relative) { -- QString resolved = QDir(dir).canonicalPath(); -+ QString resolved = QDir::cleanPath(dir); - if (!resolved.isEmpty()) { - dir = resolved; - } --- -2.5.2 - diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix deleted file mode 100644 index 3a27d85b916..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons -, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem -}: - -kdeFramework { - name = "kservice"; - propagatedNativeBuildInputs = [ extra-cmake-modules ]; - nativeBuildInputs = [ kdoctools ]; - buildInputs = [ kcrash kdbusaddons ]; - propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ]; - patches = [ - ./0001-qdiriterator-follow-symlinks.patch - ./0002-no-canonicalize-path.patch - ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix deleted file mode 100644 index b86c0b71224..00000000000 --- a/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix +++ /dev/null @@ -1,565 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - attica = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz"; - sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv"; - name = "attica-5.19.0.tar.xz"; - }; - }; - baloo = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz"; - sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg"; - name = "baloo-5.19.0.tar.xz"; - }; - }; - bluez-qt = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz"; - sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv"; - name = "bluez-qt-5.19.0.tar.xz"; - }; - }; - breeze-icons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz"; - sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0"; - name = "breeze-icons-5.19.0.tar.xz"; - }; - }; - extra-cmake-modules = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz"; - sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63"; - name = "extra-cmake-modules-5.19.0.tar.xz"; - }; - }; - frameworkintegration = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz"; - sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3"; - name = "frameworkintegration-5.19.0.tar.xz"; - }; - }; - kactivities = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz"; - sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3"; - name = "kactivities-5.19.0.tar.xz"; - }; - }; - kapidox = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz"; - sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz"; - name = "kapidox-5.19.0.tar.xz"; - }; - }; - karchive = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz"; - sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv"; - name = "karchive-5.19.0.tar.xz"; - }; - }; - kauth = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz"; - sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss"; - name = "kauth-5.19.0.tar.xz"; - }; - }; - kbookmarks = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz"; - sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd"; - name = "kbookmarks-5.19.0.tar.xz"; - }; - }; - kcmutils = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz"; - sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8"; - name = "kcmutils-5.19.0.tar.xz"; - }; - }; - kcodecs = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz"; - sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66"; - name = "kcodecs-5.19.0.tar.xz"; - }; - }; - kcompletion = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz"; - sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd"; - name = "kcompletion-5.19.0.tar.xz"; - }; - }; - kconfig = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz"; - sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm"; - name = "kconfig-5.19.0.tar.xz"; - }; - }; - kconfigwidgets = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz"; - sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv"; - name = "kconfigwidgets-5.19.0.tar.xz"; - }; - }; - kcoreaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz"; - sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw"; - name = "kcoreaddons-5.19.0.tar.xz"; - }; - }; - kcrash = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz"; - sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl"; - name = "kcrash-5.19.0.tar.xz"; - }; - }; - kdbusaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz"; - sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28"; - name = "kdbusaddons-5.19.0.tar.xz"; - }; - }; - kdeclarative = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz"; - sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g"; - name = "kdeclarative-5.19.0.tar.xz"; - }; - }; - kded = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz"; - sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz"; - name = "kded-5.19.0.tar.xz"; - }; - }; - kdelibs4support = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz"; - sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn"; - name = "kdelibs4support-5.19.0.tar.xz"; - }; - }; - kdesignerplugin = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz"; - sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5"; - name = "kdesignerplugin-5.19.0.tar.xz"; - }; - }; - kdesu = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz"; - sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz"; - name = "kdesu-5.19.0.tar.xz"; - }; - }; - kdewebkit = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz"; - sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj"; - name = "kdewebkit-5.19.0.tar.xz"; - }; - }; - kdnssd = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz"; - sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314"; - name = "kdnssd-5.19.0.tar.xz"; - }; - }; - kdoctools = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz"; - sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn"; - name = "kdoctools-5.19.0.tar.xz"; - }; - }; - kemoticons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz"; - sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5"; - name = "kemoticons-5.19.0.tar.xz"; - }; - }; - kfilemetadata = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz"; - sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr"; - name = "kfilemetadata-5.19.0.tar.xz"; - }; - }; - kglobalaccel = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz"; - sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d"; - name = "kglobalaccel-5.19.0.tar.xz"; - }; - }; - kguiaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz"; - sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy"; - name = "kguiaddons-5.19.0.tar.xz"; - }; - }; - khtml = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz"; - sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145"; - name = "khtml-5.19.0.tar.xz"; - }; - }; - ki18n = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz"; - sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05"; - name = "ki18n-5.19.0.tar.xz"; - }; - }; - kiconthemes = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz"; - sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n"; - name = "kiconthemes-5.19.0.tar.xz"; - }; - }; - kidletime = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz"; - sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6"; - name = "kidletime-5.19.0.tar.xz"; - }; - }; - kimageformats = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz"; - sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5"; - name = "kimageformats-5.19.0.tar.xz"; - }; - }; - kinit = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz"; - sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm"; - name = "kinit-5.19.0.tar.xz"; - }; - }; - kio = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz"; - sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv"; - name = "kio-5.19.0.tar.xz"; - }; - }; - kitemmodels = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz"; - sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7"; - name = "kitemmodels-5.19.0.tar.xz"; - }; - }; - kitemviews = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz"; - sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn"; - name = "kitemviews-5.19.0.tar.xz"; - }; - }; - kjobwidgets = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz"; - sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji"; - name = "kjobwidgets-5.19.0.tar.xz"; - }; - }; - kjs = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz"; - sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf"; - name = "kjs-5.19.0.tar.xz"; - }; - }; - kjsembed = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz"; - sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48"; - name = "kjsembed-5.19.0.tar.xz"; - }; - }; - kmediaplayer = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz"; - sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay"; - name = "kmediaplayer-5.19.0.tar.xz"; - }; - }; - knewstuff = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz"; - sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4"; - name = "knewstuff-5.19.0.tar.xz"; - }; - }; - knotifications = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz"; - sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av"; - name = "knotifications-5.19.0.tar.xz"; - }; - }; - knotifyconfig = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz"; - sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj"; - name = "knotifyconfig-5.19.0.tar.xz"; - }; - }; - kpackage = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz"; - sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv"; - name = "kpackage-5.19.0.tar.xz"; - }; - }; - kparts = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz"; - sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l"; - name = "kparts-5.19.0.tar.xz"; - }; - }; - kpeople = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz"; - sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98"; - name = "kpeople-5.19.0.tar.xz"; - }; - }; - kplotting = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz"; - sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq"; - name = "kplotting-5.19.0.tar.xz"; - }; - }; - kpty = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz"; - sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03"; - name = "kpty-5.19.0.tar.xz"; - }; - }; - kross = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz"; - sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p"; - name = "kross-5.19.0.tar.xz"; - }; - }; - krunner = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz"; - sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx"; - name = "krunner-5.19.0.tar.xz"; - }; - }; - kservice = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz"; - sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm"; - name = "kservice-5.19.0.tar.xz"; - }; - }; - ktexteditor = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz"; - sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp"; - name = "ktexteditor-5.19.0.tar.xz"; - }; - }; - ktextwidgets = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz"; - sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp"; - name = "ktextwidgets-5.19.0.tar.xz"; - }; - }; - kunitconversion = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz"; - sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb"; - name = "kunitconversion-5.19.0.tar.xz"; - }; - }; - kwallet = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz"; - sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm"; - name = "kwallet-5.19.0.tar.xz"; - }; - }; - kwidgetsaddons = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz"; - sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm"; - name = "kwidgetsaddons-5.19.0.tar.xz"; - }; - }; - kwindowsystem = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz"; - sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch"; - name = "kwindowsystem-5.19.0.tar.xz"; - }; - }; - kxmlgui = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz"; - sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah"; - name = "kxmlgui-5.19.0.tar.xz"; - }; - }; - kxmlrpcclient = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz"; - sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g"; - name = "kxmlrpcclient-5.19.0.tar.xz"; - }; - }; - modemmanager-qt = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz"; - sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w"; - name = "modemmanager-qt-5.19.0.tar.xz"; - }; - }; - networkmanager-qt = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz"; - sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13"; - name = "networkmanager-qt-5.19.0.tar.xz"; - }; - }; - oxygen-icons5 = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz"; - sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0"; - name = "oxygen-icons5-5.19.0.tar.xz"; - }; - }; - plasma-framework = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz"; - sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497"; - name = "plasma-framework-5.19.0.tar.xz"; - }; - }; - solid = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz"; - sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz"; - name = "solid-5.19.0.tar.xz"; - }; - }; - sonnet = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz"; - sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7"; - name = "sonnet-5.19.0.tar.xz"; - }; - }; - threadweaver = { - version = "5.19.0"; - src = fetchurl { - url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz"; - sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw"; - name = "threadweaver-5.19.0.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/attica.nix b/pkgs/desktops/kde-5/frameworks-5.21/attica.nix index 98721876c12..98721876c12 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/attica.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/attica.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix index 38c41d9271d..a4fdf9bb665 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix @@ -6,11 +6,9 @@ kdeFramework { name = "baloo"; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - kconfig kcrash kdbusaddons lmdb qtquick1 solid - ]; propagatedBuildInputs = [ - kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase + kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio + kidletime lmdb qtbase qtquick1 solid ]; postInstall = '' wrapQtProgram "$out/bin/baloo_file" diff --git a/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix index f981b0516f7..26490167dbd 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix @@ -6,7 +6,7 @@ kdeFramework { name = "bluez-qt"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; preConfigure = '' substituteInPlace CMakeLists.txt \ --replace /lib/udev/rules.d "$out/lib/udev/rules.d" diff --git a/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix index 44cc99daf26..773261638c9 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix @@ -5,6 +5,7 @@ kdeFramework { name = "breeze-icons"; + outputs = [ "out" ]; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtsvg ]; + propagatedBuildInputs = [ qtsvg ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/default.nix index 2c15f31a9c9..f7c43f73e9f 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/default.nix @@ -52,6 +52,7 @@ let extra-cmake-modules = callPackage ./extra-cmake-modules {}; frameworkintegration = callPackage ./frameworkintegration.nix {}; kactivities = callPackage ./kactivities.nix {}; + kactivities-stats = callPackage ./kactivities-stats.nix {}; kapidox = callPackage ./kapidox.nix {}; karchive = callPackage ./karchive.nix {}; kauth = callPackage ./kauth {}; @@ -68,8 +69,8 @@ let kded = callPackage ./kded.nix {}; kdelibs4support = callPackage ./kdelibs4support {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdewebkit = callPackage ./kdewebkit.nix {}; kdesu = callPackage ./kdesu.nix {}; + kdewebkit = callPackage ./kdewebkit.nix {}; kdnssd = callPackage ./kdnssd.nix {}; kdoctools = callPackage ./kdoctools {}; kemoticons = callPackage ./kemoticons.nix {}; @@ -111,7 +112,7 @@ let modemmanager-qt = callPackage ./modemmanager-qt.nix {}; networkmanager-qt = callPackage ./networkmanager-qt.nix {}; oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; - plasma-framework = callPackage ./plasma-framework {}; + plasma-framework = callPackage ./plasma-framework.nix {}; solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; threadweaver = callPackage ./threadweaver.nix {}; diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix index 1c2ea70442d..1c2ea70442d 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch index a74340a6dc9..a74340a6dc9 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series index b4569e50a5f..b4569e50a5f 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh index 193cb048949..49ac5d0c8b5 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh +++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh @@ -10,12 +10,7 @@ _ecmPropagateSharedData() { "kconf_update" \ "kservices5" \ "kservicetypes5" \ - "kxmlgui5" \ "knotifications5" \ - "icons" \ - "sounds" \ - "templates" \ - "wallpapers" \ "applications" \ "desktop-directories" \ "mime" \ @@ -26,7 +21,6 @@ _ecmPropagateSharedData() { for dir in ${sharedPaths[@]}; do if [ -d "$1/share/$dir" ]; then addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share" - propagateOnce propagatedBuildInputs "$1" propagateOnce propagatedUserEnvPkgs "$1" break fi diff --git a/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh index 7937e6f8bed..dde749b218c 100755 --- a/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh +++ b/pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/" +RELEASE_URL="http://download.kde.org/stable/frameworks/5.21/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix index 26987c385ad..ee1b188d407 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix @@ -5,13 +5,10 @@ kdeFramework { name = "frameworkintegration"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kbookmarks kcompletion kconfig knotifications kwidgetsaddons - libXcursor + propagatedBuildInputs = [ + kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio + kiconthemes kwidgetsaddons libXcursor qtx11extras ]; - propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix new file mode 100644 index 00000000000..0080c5c3164 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix @@ -0,0 +1,9 @@ +{ kdeFramework, lib, extra-cmake-modules +, boost, kactivities, kconfig }: + +kdeFramework { + name = "kactivities-stats"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ boost kactivities kconfig ]; +} diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix new file mode 100644 index 00000000000..167c3f15bbd --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix @@ -0,0 +1,14 @@ +{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig +, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n +, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative +}: + +kdeFramework { + name = "kactivities"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ + boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel + ki18n kio kservice kwindowsystem kxmlgui qtdeclarative + ]; +} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix index 647be8f052c..f78a5ea08a4 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix @@ -5,8 +5,6 @@ kdeFramework { name = "kapidox"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix index a8d9a0003c3..bec44a6d687 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix @@ -4,8 +4,6 @@ kdeFramework { name = "karchive"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch index c66f5ecd008..c66f5ecd008 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix index 1352d8c5821..4bdba88bc3b 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix @@ -6,11 +6,8 @@ kdeFramework { name = "kauth"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ polkit-qt ]; - propagatedBuildInputs = [ kcoreaddons ]; + propagatedBuildInputs = [ kcoreaddons polkit-qt ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch index 340155256f2..340155256f2 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/series b/pkgs/desktops/kde-5/frameworks-5.21/kauth/series index d2689425c38..d2689425c38 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix index 1a469ab4db6..7348e591d9c 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix @@ -10,16 +10,9 @@ kdeFramework { name = "kbookmarks"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcodecs - kconfig - kconfigwidgets - kcoreaddons - kiconthemes - kxmlgui + propagatedBuildInputs = [ + kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch index 0d861fa9501..0d861fa9501 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix index dbbb783ac61..fdf55174548 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix @@ -5,13 +5,11 @@ kdeFramework { name = "kcmutils"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons kiconthemes kitemviews kpackage kxmlgui + propagatedBuildInputs = [ + kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews + kpackage kservice kxmlgui ]; - propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix index 53a69a69b69..53a69a69b69 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix index e393774f16a..8c45bed2585 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix @@ -6,9 +6,7 @@ kdeFramework { name = "kcompletion"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kwidgetsaddons ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ kconfig kwidgetsaddons ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix index e132afe5988..e132afe5988 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee9053..7a6c0ee9053 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix index 3b3bd27cce0..1e6976113de 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix @@ -4,15 +4,12 @@ kdeFramework { name = "kconfigwidgets"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ kguiaddons ]; - propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ]; + propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; postInstall = '' moveToOutput "bin/preparetips5" "$dev" wrapQtProgram "$dev/bin/preparetips5" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix index f3a1db7bd48..846b187c866 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix @@ -5,12 +5,10 @@ kdeFramework { name = "kcoreaddons"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ shared_mime_info ]; + propagatedBuildInputs = [ shared_mime_info ]; postInstall = '' wrapQtProgram "$out/bin/desktoptojson" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix index bbab78ccb40..133a81c60c1 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix @@ -7,10 +7,7 @@ kdeFramework { name = "kcrash"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix index d2ceab31d14..d2ceab31d14 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix index 74d107466cf..af9a009b82e 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix @@ -6,17 +6,13 @@ kdeFramework { name = "kdeclarative"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - epoxy kguiaddons kiconthemes kwidgetsaddons - ]; propagatedBuildInputs = [ - kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative + epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage + kwidgetsaddons kwindowsystem qtdeclarative ]; postInstall = '' wrapQtProgram "$out/bin/kpackagelauncherqml" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kded.nix b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix index 47ae2d68c68..fd286accb9f 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kded.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix @@ -11,9 +11,7 @@ kdeFramework { name = "kded"; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix index 843db83a99b..1765ffa9a39 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix @@ -12,25 +12,20 @@ kdeFramework { name = "kdelibs4support"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; outputs = [ "dev" "out" ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); setupHook = ./setup-hook.sh; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcompletion kconfig kded kservice kwidgetsaddons - kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM - ]; propagatedBuildInputs = [ - kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons - kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio - kiconthemes kitemmodels kinit knotifications kparts ktextwidgets - kunitconversion kwindowsystem + kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash + kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n + kio kiconthemes kitemmodels kinit knotifications kparts kservice + ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui + networkmanager qtsvg qtx11extras xlibs.libSM ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXML4_DTD_VERSION=4.5" ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch index eabb7025448..eabb7025448 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series index 9b08ab20877..9b08ab20877 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh index 21ac2e83b5d..21ac2e83b5d 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix index cbc114ccca0..d6e03e17472 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix @@ -18,17 +18,13 @@ kdeFramework { name = "kdesignerplugin"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit - kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons - kxmlgui + propagatedBuildInputs = [ + kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kio + kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet ]; - propagatedBuildInputs = [ kio sonnet ]; postInstall = '' wrapQtProgram "$out/bin/kgendesignerplugin" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix index 364fbd6a720..fcccea9161f 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix @@ -4,10 +4,7 @@ kdeFramework { name = "kdesu"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kservice ]; - propagatedBuildInputs = [ ki18n kpty ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix index d361313d1d4..3c0e4ba3f56 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix @@ -4,10 +4,9 @@ kdeFramework { name = "kdewebkit"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ]; - propagatedBuildInputs = [ ki18n kio qtwebkit ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ + kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet qtwebkit + ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix index f00432b0c9c..8fda4e63e3a 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix @@ -5,9 +5,7 @@ kdeFramework { name = "kdnssd"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ avahi ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ avahi ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix index f67c19f4239..0ed249da9a4 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix @@ -4,16 +4,13 @@ kdeFramework { name = "kdoctools"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ karchive ki18n ]; propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ]; cmakeFlags = [ "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook" "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook" ]; patches = [ ./kdoctools-no-find-docbook-xml.patch ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch index 4e3a33efab3..4e3a33efab3 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh index 5cfffbd622d..5cfffbd622d 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh +++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix index d165f84e3a2..1e31277172d 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix @@ -8,10 +8,7 @@ kdeFramework { name = "kemoticons"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ karchive kconfig kcoreaddons ]; - propagatedBuildInputs = [ kservice ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch index 732f7b69c82..732f7b69c82 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix index 9bb4831cf8d..bc7349e7453 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix @@ -4,11 +4,10 @@ kdeFramework { name = "kfilemetadata"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ]; - propagatedBuildInputs = [ qtbase ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ + attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib + ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series index d2689425c38..d2689425c38 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix index c535b3590a3..79db990f191 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix @@ -11,13 +11,12 @@ kdeFramework { name = "kglobalaccel"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ]; - propagatedBuildInputs = [ kwindowsystem qtx11extras ]; + propagatedBuildInputs = [ + kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras + ]; postInstall = '' wrapQtProgram "$out/bin/kglobalaccel5" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix index bc4e9ab1184..6ebfd1104f7 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix @@ -5,9 +5,7 @@ kdeFramework { name = "kguiaddons"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix index d40df466ebb..99f6fe31e0d 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix @@ -6,16 +6,11 @@ kdeFramework { name = "khtml"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules perl ]; - buildInputs = [ - giflib karchive kiconthemes knotifications kwallet kwidgetsaddons - kxmlgui phonon - ]; propagatedBuildInputs = [ - kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets - kwindowsystem qtx11extras sonnet + giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs + knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem + kxmlgui phonon qtx11extras sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix index 268006512e7..2698a97fd33 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix @@ -8,10 +8,8 @@ kdeFramework { name = "ki18n"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtdeclarative qtscript ]; + propagatedBuildInputs = [ qtdeclarative qtscript ]; propagatedNativeBuildInputs = [ gettext python ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch index 5b3b15d5d5b..5b3b15d5d5b 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix index b78b25582be..4e868480636 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix @@ -5,14 +5,11 @@ kdeFramework { name = "kiconthemes"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ kconfigwidgets kitemviews qtsvg ]; - propagatedBuildInputs = [ breeze-icons ki18n ]; + propagatedBuildInputs = [ breeze-icons kconfigwidgets ki18n kitemviews qtsvg ]; postInstall = '' wrapQtProgram "$out/bin/kiconfinder5" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series index ab5cc8a3edb..ab5cc8a3edb 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix index fc086560023..758260517e7 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix @@ -6,10 +6,7 @@ kdeFramework { name = "kidletime"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - propagatedBuildInputs = [ qtbase ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ qtbase qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix index 49d66bbcc2c..fbc8d092f86 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix @@ -5,9 +5,7 @@ kdeFramework { name = "kimageformats"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix index 64210ca7605..454e3977c3a 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix @@ -3,15 +3,12 @@ , libcap_progs }: -# TODO: setuid wrapper - kdeFramework { name = "kinit"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ]; - buildInputs = [ kconfig kcrash kservice libcap ]; - propagatedBuildInputs = [ ki18n kio kwindowsystem ]; + propagatedBuildInputs = [ + kconfig kcrash ki18n kio kservice kwindowsystem libcap + ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch new file mode 100644 index 00000000000..47538fbe456 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch @@ -0,0 +1,34 @@ +Index: kinit-5.21.0/src/kdeinit/kinit.cpp +=================================================================== +--- kinit-5.21.0.orig/src/kdeinit/kinit.cpp ++++ kinit-5.21.0/src/kdeinit/kinit.cpp +@@ -657,19 +657,16 @@ static pid_t launch(int argc, const char + + if (!libpath.isEmpty()) { + if (libpath_relative) { +- // NB: Because Qt makes the actual dlopen() call, the +- // RUNPATH of kdeinit is *not* respected - see +- // https://sourceware.org/bugzilla/show_bug.cgi?id=13945 +- // - so we try hacking it in ourselves +- QString install_lib_dir = QFile::decodeName( +- CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/"); +- QString orig_libpath = libpath; +- libpath = install_lib_dir + libpath; +- l.setFileName(libpath); +- if (!l.load()) { +- libpath = orig_libpath; +- l.setFileName(libpath); +- l.load(); ++ // Try to load the library relative to the active profiles. ++ QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' '); ++ // Reverse the profile list. ++ std::reverse(profiles.begin(), profiles.end()); ++ const QString libdir = QString::fromLatin1("/lib/"); ++ Q_FOREACH (const QByteArray &profile, profiles) { ++ if (!profile.isEmpty()) { ++ l.setFileName(QFile::decodeName(profile) + libdir + libpath); ++ if (l.load()) break; ++ } + } + } else { + l.load(); diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kinit/series b/pkgs/desktops/kde-5/frameworks-5.21/kinit/series index 5faa456366b..5faa456366b 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kinit/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix index a2131ff3385..cfa597e9cd1 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix @@ -9,17 +9,15 @@ kdeFramework { name = "kio"; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - acl karchive kconfig kcoreaddons kdbusaddons kiconthemes - knotifications ktextwidgets kwallet kwidgetsaddons - qtscript - ]; propagatedBuildInputs = [ - kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets - kservice kwindowsystem kxmlgui solid qtx11extras + acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons + kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice + ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript + qtx11extras ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postInstall = '' wrapQtProgram "$out/bin/kcookiejar5" wrapQtProgram "$out/bin/ktelnetservice5" @@ -27,7 +25,4 @@ kdeFramework { wrapQtProgram "$out/bin/kmailservice5" wrapQtProgram "$out/bin/protocoltojson" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch index c9ad46b41bb..c9ad46b41bb 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kio/series b/pkgs/desktops/kde-5/frameworks-5.21/kio/series index 77ca1545004..77ca1545004 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kio/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix index a9024d771cc..7dff10b7fe0 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix @@ -4,8 +4,6 @@ kdeFramework { name = "kitemmodels"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix index 931019ce495..77f4b662160 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix @@ -4,8 +4,6 @@ kdeFramework { name = "kitemviews"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix index 746edf12eea..2692458b8be 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix @@ -7,10 +7,7 @@ kdeFramework { name = "kjobwidgets"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kwidgetsaddons ]; - propagatedBuildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix index 768720f178c..1a8750ea74f 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix @@ -6,11 +6,9 @@ kdeFramework { name = "kjs"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; postInstall = '' wrapQtProgram "$out/bin/kjs5" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix index 22eef2d47bd..7611b831007 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix @@ -4,14 +4,11 @@ kdeFramework { name = "kjsembed"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ qtsvg ]; - propagatedBuildInputs = [ ki18n kjs ]; + propagatedBuildInputs = [ ki18n kjs qtsvg ]; postInstall = '' wrapQtProgram "$out/bin/kjscmd5" wrapQtProgram "$out/bin/kjsconsole" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix index 460458b2232..93a6b450f76 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix @@ -6,10 +6,7 @@ kdeFramework { name = "kmediaplayer"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kxmlgui ]; - propagatedBuildInputs = [ kparts ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ kparts kxmlgui ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix index 5bcd6f30146..002418c65ad 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix @@ -5,13 +5,10 @@ kdeFramework { name = "knewstuff"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - karchive kcompletion kconfig kcoreaddons kiconthemes - kitemviews ktextwidgets kwidgetsaddons + propagatedBuildInputs = [ + attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio + kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui ]; - propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix new file mode 100644 index 00000000000..7196832495f --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix @@ -0,0 +1,16 @@ +{ kdeFramework, lib +, extra-cmake-modules +, kcodecs, kconfig, kcoreaddons, kwindowsystem +, libdbusmenu +, phonon +, qtx11extras +}: + +kdeFramework { + name = "knotifications"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ + kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras + ]; +} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix index dd99d2d4f1e..0e357aecb99 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix @@ -4,10 +4,7 @@ kdeFramework { name = "knotifyconfig"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcompletion kconfig phonon ]; - propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch index e9d74444814..e9d74444814 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix index aea1b0d31a0..874bb380d73 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix @@ -10,14 +10,11 @@ kdeFramework { name = "kpackage"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ karchive kconfig ]; - propagatedBuildInputs = [ kcoreaddons ki18n ]; + propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postInstall = '' wrapQtProgram "$out/bin/kpackagetool5" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch index ddbf17d0006..ddbf17d0006 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/series index 9b7f076efc7..9b7f076efc7 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix index 1c3e0b2cbc5..ad6ea2dbc30 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix @@ -5,13 +5,10 @@ kdeFramework { name = "kparts"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons kiconthemes kjobwidgets knotifications - kservice kwidgetsaddons + propagatedBuildInputs = [ + kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications + kservice ktextwidgets kwidgetsaddons kxmlgui ]; - propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix index 4c3877e7efd..6acb5e2eed5 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix @@ -4,12 +4,9 @@ kdeFramework { name = "kpeople"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcoreaddons kitemviews kservice kwidgetsaddons + propagatedBuildInputs = [ + kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative ]; - propagatedBuildInputs = [ ki18n qtdeclarative ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix index c16f51b5ac3..601f1778db7 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix @@ -4,8 +4,6 @@ kdeFramework { name = "kplotting"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix index 2e34e6f674c..8bdaacb85f8 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix @@ -2,9 +2,7 @@ kdeFramework { name = "kpty"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ kcoreaddons ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kross.nix b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix index 7c6f079feaa..0e66d95b5cc 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kross.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix @@ -5,10 +5,10 @@ kdeFramework { name = "kross"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ kcompletion kcoreaddons kxmlgui ]; - propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ + kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui + qtscript + ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix index 12d2b54d0eb..f07a0c31c29 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix @@ -5,12 +5,10 @@ kdeFramework { name = "krunner"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons kservice qtquick1 solid threadweaver + propagatedBuildInputs = [ + kconfig kcoreaddons ki18n kio kservice plasma-framework qtquick1 solid + threadweaver ]; - propagatedBuildInputs = [ ki18n kio plasma-framework ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix new file mode 100644 index 00000000000..484be408794 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix @@ -0,0 +1,12 @@ +{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcoreaddons +, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem +}: + +kdeFramework { + name = "kservice"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + propagatedNativeBuildInputs = [ extra-cmake-modules ]; + nativeBuildInputs = [ kdoctools ]; + propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); +} diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch new file mode 100644 index 00000000000..e65d4505ed2 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch @@ -0,0 +1,25 @@ +Index: kservice-5.21.0/src/sycoca/ksycocautils.cpp +=================================================================== +--- kservice-5.21.0.orig/src/sycoca/ksycocautils.cpp ++++ kservice-5.21.0/src/sycoca/ksycocautils.cpp +@@ -24,9 +24,10 @@ + + void KSycocaUtilsPrivate::read(QDataStream &s, QString &str) + { ++ const qint32 bufferSize = 65528; + quint32 bytes; + s >> bytes; // read size of string +- if (bytes > 8192) { // null string or too big ++ if (bytes > bufferSize) { // null string or too big + if (bytes != 0xffffffff) { + KSycoca::flagError(); + } +@@ -35,7 +36,7 @@ void KSycocaUtilsPrivate::read(QDataStre + int bt = bytes / 2; + str.resize(bt); + QChar *ch = str.data(); +- char t[8192]; ++ char t[bufferSize]; + char *b = t; + s.readRawData(b, bytes); + while (bt--) { diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch new file mode 100644 index 00000000000..cf98ffb9067 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch @@ -0,0 +1,13 @@ +Index: kservice-5.21.0/src/sycoca/vfolder_menu.cpp +=================================================================== +--- kservice-5.21.0.orig/src/sycoca/vfolder_menu.cpp ++++ kservice-5.21.0/src/sycoca/vfolder_menu.cpp +@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString & + } + + if (!relative) { +- QString resolved = QDir(dir).canonicalPath(); ++ QString resolved = QDir::cleanPath(dir); + if (!resolved.isEmpty()) { + dir = resolved; + } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch new file mode 100644 index 00000000000..cbe13b70950 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch @@ -0,0 +1,13 @@ +Index: kservice-5.21.0/src/sycoca/kbuildsycoca.cpp +=================================================================== +--- kservice-5.21.0.orig/src/sycoca/kbuildsycoca.cpp ++++ kservice-5.21.0/src/sycoca/kbuildsycoca.cpp +@@ -203,7 +203,7 @@ bool KBuildSycoca::build() + QSet<QString> relFiles; + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory); + Q_FOREACH (const QString &dir, dirs) { +- QDirIterator it(dir, QDirIterator::Subdirectories); ++ QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + const QString filePath = it.next(); + Q_ASSERT(filePath.startsWith(dir)); // due to the line below... diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/series b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series new file mode 100644 index 00000000000..c1655f68606 --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series @@ -0,0 +1,3 @@ +qdiriterator-follow-symlinks.patch +no-canonicalize-path.patch +ksycoca-buffer-size.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh index c28e862ff8a..c28e862ff8a 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh +++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix index b8df6a5f4c0..e1a5e8b2339 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix @@ -8,15 +8,11 @@ kdeFramework { name = "ktexteditor"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ]; - buildInputs = [ - karchive kconfig kguiaddons kiconthemes kparts - libgit2 - qtscript qtxmlpatterns + propagatedBuildInputs = [ + karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript + qtxmlpatterns sonnet ]; - propagatedBuildInputs = [ ki18n kio sonnet ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch index 19ab1e1e551..19ab1e1e551 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch +++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series index 46cd23829a2..46cd23829a2 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series +++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix index e332d4ff9a8..25954c60397 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix @@ -5,12 +5,10 @@ kdeFramework { name = "ktextwidgets"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion kconfig kconfigwidgets kiconthemes kservice + propagatedBuildInputs = [ + kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem + sonnet ]; - propagatedBuildInputs = [ ki18n kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix index 3cf0f847d83..c04ded722aa 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix @@ -2,9 +2,7 @@ kdeFramework { name = "kunitconversion"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ ki18n ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix index 5ade5f63a8d..3bb99df39a7 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix @@ -5,17 +5,14 @@ kdeFramework { name = "kwallet"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes - knotifications kservice kwidgetsaddons libgcrypt + propagatedBuildInputs = [ + kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes + knotifications kservice kwidgetsaddons kwindowsystem libgcrypt ]; - propagatedBuildInputs = [ ki18n kwindowsystem ]; postInstall = '' wrapQtProgram "$out/bin/kwalletd5" wrapQtProgram "$out/bin/kwallet-query" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix index d95f44d3fec..7f2b35d8f7b 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix @@ -4,8 +4,6 @@ kdeFramework { name = "kwidgetsaddons"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix index 09ab1f2200d..6acab52d135 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix @@ -5,9 +5,7 @@ kdeFramework { name = "kwindowsystem"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ qtx11extras ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + propagatedBuildInputs = [ qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix index f081d5f9170..ea800bf58ae 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix @@ -5,14 +5,10 @@ kdeFramework { name = "kxmlgui"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - attica kconfig kiconthemes kitemviews ktextwidgets - ]; propagatedBuildInputs = [ - kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet + attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews + ktextwidgets kwindowsystem sonnet ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix index 20a300b68bc..f20f4a22394 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix @@ -2,9 +2,7 @@ kdeFramework { name = "kxmlrpcclient"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ ki18n kio ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix index 7d7f769d6a9..e03254a71ed 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix @@ -5,9 +5,7 @@ kdeFramework { name = "modemmanager-qt"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ modemmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix index 333378bd143..0515509a77c 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix @@ -5,9 +5,7 @@ kdeFramework { name = "networkmanager-qt"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; propagatedBuildInputs = [ networkmanager ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix index ee350f8e153..0b5c75b960d 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix @@ -5,9 +5,10 @@ kdeFramework { name = "oxygen-icons5"; - nativeBuildInputs = [ extra-cmake-modules ]; meta = { license = lib.licenses.lgpl3Plus; maintainers = [ lib.maintainers.ttuegel ]; }; + outputs = [ "out" ]; + nativeBuildInputs = [ extra-cmake-modules ]; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix index d8846f77723..2a8762c814f 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix @@ -7,19 +7,14 @@ kdeFramework { name = "plasma-framework"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons - kiconthemes knotifications kxmlgui qtscript - ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem - qtx11extras + kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons + kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications + kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras ]; postInstall = '' wrapQtProgram "$out/bin/plasmapkg2" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/solid.nix b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix index afd125e3c59..f1db5c35c10 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/solid.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix @@ -6,12 +6,10 @@ kdeFramework { name = "solid"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ qtdeclarative ]; + propagatedBuildInputs = [ qtdeclarative ]; postInstall = '' wrapQtProgram "$out/bin/solid-hardware5" ''; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix index 943fe04a1c9..28c24302abc 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix @@ -5,9 +5,7 @@ kdeFramework { name = "sonnet"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ hunspell ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; } diff --git a/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix new file mode 100644 index 00000000000..a4a1f95c52c --- /dev/null +++ b/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix @@ -0,0 +1,573 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/attica-5.21.0.tar.xz"; + sha256 = "1aqfw73g424f60qmpx1lky3qfqrsl1id02388pnlmpa8fnpp940c"; + name = "attica-5.21.0.tar.xz"; + }; + }; + baloo = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/baloo-5.21.0.tar.xz"; + sha256 = "1a5sl2bkrs90mfks93q2hrijp6dpapp2l0fhq7km36mvsrc78yqn"; + name = "baloo-5.21.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/bluez-qt-5.21.0.tar.xz"; + sha256 = "0nsnxa4k31l69fapxn49g112948zprc5xr7v3ggxwnxkb1pll60a"; + name = "bluez-qt-5.21.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/breeze-icons-5.21.0.tar.xz"; + sha256 = "1a7ikdq8a44n42i6swf29aqyfwjh05ir3ym0lzjzdb6133fzlb01"; + name = "breeze-icons-5.21.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/extra-cmake-modules-5.21.0.tar.xz"; + sha256 = "1kbc5fkcbz9vkg0jpz10vsfgwajlrsmbl0vrbls5qvrdgbgrwlm3"; + name = "extra-cmake-modules-5.21.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/frameworkintegration-5.21.0.tar.xz"; + sha256 = "0mbpn18cjzd8xznk73slvals86lv77ram09px4l44xgyf019xll8"; + name = "frameworkintegration-5.21.0.tar.xz"; + }; + }; + kactivities = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kactivities-5.21.0.tar.xz"; + sha256 = "09jr7m6vaffdb879jph1ckgri0b9pdyh5q39i7fyi6s277rybcyk"; + name = "kactivities-5.21.0.tar.xz"; + }; + }; + kactivities-stats = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kactivities-stats-5.21.0.tar.xz"; + sha256 = "0vd01b812r0ggbnqsq3y6ik68v0668rzx6npl3h11wdrvlidhyqf"; + name = "kactivities-stats-5.21.0.tar.xz"; + }; + }; + kapidox = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kapidox-5.21.0.tar.xz"; + sha256 = "0w3jch93d8vdqd0g4yl2fxmamrg9hnx1lypnpgw7615wlsb02qyx"; + name = "kapidox-5.21.0.tar.xz"; + }; + }; + karchive = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/karchive-5.21.0.tar.xz"; + sha256 = "042ww21wmm3sf87zqgr2qiyg2j5mjf1mmqpqhpcax4gnjpck5nvc"; + name = "karchive-5.21.0.tar.xz"; + }; + }; + kauth = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kauth-5.21.0.tar.xz"; + sha256 = "03dy36g9y04p3533l2y0m0jlr91m94y0i4wpnlr5ndgccif2a63r"; + name = "kauth-5.21.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kbookmarks-5.21.0.tar.xz"; + sha256 = "0qxq5wbddaj1cpjd34q8k65brfbb677gs0y5zh24mqbwcr0rfs6g"; + name = "kbookmarks-5.21.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kcmutils-5.21.0.tar.xz"; + sha256 = "01ch3y43r4cb1sj0gy5a8wq3c6wpx2brn96d7rjm3r3hh5n5xdlj"; + name = "kcmutils-5.21.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kcodecs-5.21.0.tar.xz"; + sha256 = "0wng7kqqxrsz7b4w163j6m2zdhb5pvgbd9n6bn7ggyldn4zl86w7"; + name = "kcodecs-5.21.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kcompletion-5.21.0.tar.xz"; + sha256 = "0r6gsnsjkfvwhrpkch7y44m2yqyxb42bdkc35jxrm8y7xaa8nwi4"; + name = "kcompletion-5.21.0.tar.xz"; + }; + }; + kconfig = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kconfig-5.21.0.tar.xz"; + sha256 = "0w5wvy3yhgh64k8jghyv5fkx9jr828yl11jlihg24hfplnmihkxw"; + name = "kconfig-5.21.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kconfigwidgets-5.21.0.tar.xz"; + sha256 = "030iq46bwiaixn2wf6285y2gg7h1y5xqf6d6bg3xcz0v1xjd3n0f"; + name = "kconfigwidgets-5.21.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kcoreaddons-5.21.0.tar.xz"; + sha256 = "16226z60simxgfriwsm6srx39f7wm64mdl39qxaa77wn07i8xmsi"; + name = "kcoreaddons-5.21.0.tar.xz"; + }; + }; + kcrash = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kcrash-5.21.0.tar.xz"; + sha256 = "1mrbmfkzd0dy42ppq8gl1z9liprq722w4f3a499iamqnlsdwq2w8"; + name = "kcrash-5.21.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kdbusaddons-5.21.0.tar.xz"; + sha256 = "1yvpan0plm80sw0wai39ffvpswyzy7xiqra69cb8mfxcdl8acjjw"; + name = "kdbusaddons-5.21.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kdeclarative-5.21.0.tar.xz"; + sha256 = "1m61js8kdnif1106vxs5bv830hyj8j2whv5mlshkj9jbpp9v5qkj"; + name = "kdeclarative-5.21.0.tar.xz"; + }; + }; + kded = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kded-5.21.0.tar.xz"; + sha256 = "138svq07zgabn6razkqp5zxdlw9ajr1966icd82mxsxq1cjgfl4g"; + name = "kded-5.21.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/portingAids/kdelibs4support-5.21.0.tar.xz"; + sha256 = "1q1wyfry2ypa1mk01rabva0cq1ai9lmq8ygsji413p6c1avfrywc"; + name = "kdelibs4support-5.21.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kdesignerplugin-5.21.0.tar.xz"; + sha256 = "0rj79mdgdcm0wlramx5s53ba0jkhravcgkl570ds7s3wwa1aa62j"; + name = "kdesignerplugin-5.21.0.tar.xz"; + }; + }; + kdesu = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kdesu-5.21.0.tar.xz"; + sha256 = "13daljcjgrvybj7hbv6l9cwc6cdh45d2zz2ch7cbar46z2zxh5qb"; + name = "kdesu-5.21.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kdewebkit-5.21.0.tar.xz"; + sha256 = "1rc5i265sagvbqwy96i4dnksc4vnrq864z3rkxqlrx2blwq08550"; + name = "kdewebkit-5.21.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kdnssd-5.21.0.tar.xz"; + sha256 = "0k3qia322cd2h9pcf7k0fg7w91jxc503digjv93vhsfzfhbadf9l"; + name = "kdnssd-5.21.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kdoctools-5.21.0.tar.xz"; + sha256 = "16ysqwvwmxas56rhg68rzkipszqqahh787ww9rkq9ak2r6d29r6c"; + name = "kdoctools-5.21.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kemoticons-5.21.0.tar.xz"; + sha256 = "1paddfylh1xb4g4h939lzvy7f67syyfsx76gz7w5mdbnqk5xc7fc"; + name = "kemoticons-5.21.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kfilemetadata-5.21.0.tar.xz"; + sha256 = "1jmcvzazcw5klmnzd17a7x6rcwjb6xdrxrn1jjiq8kibdbghx7l0"; + name = "kfilemetadata-5.21.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kglobalaccel-5.21.0.tar.xz"; + sha256 = "1bdd613ybz1cl25sx3ihdfzsjwlxyjx9blidmzbnvv0lb2304hwp"; + name = "kglobalaccel-5.21.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kguiaddons-5.21.0.tar.xz"; + sha256 = "01hdrcdsiq3qs620jprv65kk4pvldlm70aghjsi9wk7j3x6qid2x"; + name = "kguiaddons-5.21.0.tar.xz"; + }; + }; + khtml = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/portingAids/khtml-5.21.0.tar.xz"; + sha256 = "17xvzklhhp6k9wi94s7agc8qnb7gwvx3aa5jbq6d76qn0rsqbzhv"; + name = "khtml-5.21.0.tar.xz"; + }; + }; + ki18n = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/ki18n-5.21.0.tar.xz"; + sha256 = "0qm9p77zqz2jy0j5yfv5v6pqska25p790yy1b6wg1gd67561q5bn"; + name = "ki18n-5.21.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kiconthemes-5.21.0.tar.xz"; + sha256 = "14a43jca1cyh45dbz5c9lc5yqc376qg3q2c420bk5s44ynpnhp4i"; + name = "kiconthemes-5.21.0.tar.xz"; + }; + }; + kidletime = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kidletime-5.21.0.tar.xz"; + sha256 = "10vdx2sp3hjp20saqlyqdz83jbqhsqyk7gl063lhz00mnk7nk1mn"; + name = "kidletime-5.21.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kimageformats-5.21.0.tar.xz"; + sha256 = "09m0w5f39y9gq0g00iapay3v09kk24lqwiyjq4y487il865p22ph"; + name = "kimageformats-5.21.0.tar.xz"; + }; + }; + kinit = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kinit-5.21.0.tar.xz"; + sha256 = "19avsq0bi2ys574n0dcn65chd7wrpyp354xfsw45gig28skjiir5"; + name = "kinit-5.21.0.tar.xz"; + }; + }; + kio = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kio-5.21.0.tar.xz"; + sha256 = "08wrjimkv255gbc9y7pxilwxi9nikg3196rzs0fbw4vqdlzl0gjq"; + name = "kio-5.21.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kitemmodels-5.21.0.tar.xz"; + sha256 = "1bp02vp08bwsd64wnrr3ivy4k8g1vzv1s5iyiqj99d1gk0fxvv7d"; + name = "kitemmodels-5.21.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kitemviews-5.21.0.tar.xz"; + sha256 = "16yzcyrg8wa8fvz749x8dbixyga1ggls1fvjns6gdbz5aqm6ib4d"; + name = "kitemviews-5.21.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kjobwidgets-5.21.0.tar.xz"; + sha256 = "0y8zmz6wx4igbpc0jlsxrr1yxgyq8hsmynl9fqy3lc2bzmwr9wcp"; + name = "kjobwidgets-5.21.0.tar.xz"; + }; + }; + kjs = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/portingAids/kjs-5.21.0.tar.xz"; + sha256 = "0vsgmz0yn1if11xfbw3f9p0kg2dv1rb26ging4fc860wv2j5gyln"; + name = "kjs-5.21.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/portingAids/kjsembed-5.21.0.tar.xz"; + sha256 = "1nbc12m86s90y8f5gp62l4f9v4hqy8cmzw4sh0655sczd5vbkvki"; + name = "kjsembed-5.21.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/portingAids/kmediaplayer-5.21.0.tar.xz"; + sha256 = "1hz7l95w57z73wg9ypbqpkxvkw42wgbymv67lg4vdxppplnkqriz"; + name = "kmediaplayer-5.21.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/knewstuff-5.21.0.tar.xz"; + sha256 = "05r11r9r789686i36y0x770f1pc7dwvqzdzclrx22r3lbz708pga"; + name = "knewstuff-5.21.0.tar.xz"; + }; + }; + knotifications = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/knotifications-5.21.0.tar.xz"; + sha256 = "0iia73ai2s5w8c3j1kmc8bb7yp1d2cv0yd2k3ilaxf3y9wgsp4x8"; + name = "knotifications-5.21.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/knotifyconfig-5.21.0.tar.xz"; + sha256 = "1mqal5ndr3v54lp7a9a2fm0c0hsiqb7kziw56rz0xd659328k9ix"; + name = "knotifyconfig-5.21.0.tar.xz"; + }; + }; + kpackage = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kpackage-5.21.0.tar.xz"; + sha256 = "024k15v0b24hivkjpn3gwn2wdfsng9ralz414i858qj0lm688xk5"; + name = "kpackage-5.21.0.tar.xz"; + }; + }; + kparts = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kparts-5.21.0.tar.xz"; + sha256 = "1s1nk1vdnb3g0ilv2b1m783h8g52yr9hpqz0vscj56m9cn2sf8rv"; + name = "kparts-5.21.0.tar.xz"; + }; + }; + kpeople = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kpeople-5.21.0.tar.xz"; + sha256 = "0nfpv4g9zvja9sv3zbpyksbvz1xa8lmncg48awrwbrmf83bxvcjq"; + name = "kpeople-5.21.0.tar.xz"; + }; + }; + kplotting = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kplotting-5.21.0.tar.xz"; + sha256 = "1hrpv1qg6qx4y4wvyq0rxfi0ngq1lgd5l3vwi00ri86xm1qbs4hk"; + name = "kplotting-5.21.0.tar.xz"; + }; + }; + kpty = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kpty-5.21.0.tar.xz"; + sha256 = "1vzgpmagjggssva6r57hd094dv3vxf3gpsr3xpvspa9l1mk4d35c"; + name = "kpty-5.21.0.tar.xz"; + }; + }; + kross = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/portingAids/kross-5.21.0.tar.xz"; + sha256 = "0c1gbaifzswz4dcdwzka5mnlm07i463dpwc2fihmzn67skm4ybix"; + name = "kross-5.21.0.tar.xz"; + }; + }; + krunner = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/portingAids/krunner-5.21.0.tar.xz"; + sha256 = "1jn8fr83c71kz25yzd1qay9as6dvzl1xvlg1vyspdifxg43vqzq4"; + name = "krunner-5.21.0.tar.xz"; + }; + }; + kservice = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kservice-5.21.0.tar.xz"; + sha256 = "19cnapz23ji5p01r9rgj91rzph3mqqrmnfwprmi9p3h2w68njhv6"; + name = "kservice-5.21.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/ktexteditor-5.21.0.tar.xz"; + sha256 = "1m9zipx5kisxsy037py709c2ri5qvix6n362l981kbbvcgkpiaq2"; + name = "ktexteditor-5.21.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/ktextwidgets-5.21.0.tar.xz"; + sha256 = "11nsi6j9b2678bqaa0ykp8as5lw1v9421b73dd1qxqrpdqfkxyzn"; + name = "ktextwidgets-5.21.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kunitconversion-5.21.0.tar.xz"; + sha256 = "03vnls5df0c2bqyw9a04hlc3cn34y6xwx693klh27jmm37r776yh"; + name = "kunitconversion-5.21.0.tar.xz"; + }; + }; + kwallet = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kwallet-5.21.0.tar.xz"; + sha256 = "1rmfy21r2p79gwg1kq26g2fqnclbsww9rz3py368pk4s1lrzafii"; + name = "kwallet-5.21.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kwidgetsaddons-5.21.0.tar.xz"; + sha256 = "1gqyc0j77sm6i2511qnz0sllmfxjgjb9qpi8551np16zviqa52k7"; + name = "kwidgetsaddons-5.21.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kwindowsystem-5.21.0.tar.xz"; + sha256 = "13lfwpw5a4in0mp5y8d15jg6xhhrka2qmw73wrdzcvj22n6ldzzi"; + name = "kwindowsystem-5.21.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kxmlgui-5.21.0.tar.xz"; + sha256 = "1cb6n016ffvxy8dbbhc3dwlzdqpq0pbvly416qlvlc1lv70lxyfj"; + name = "kxmlgui-5.21.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/kxmlrpcclient-5.21.0.tar.xz"; + sha256 = "082qpnvgm9r81iip9akakbf5rqmxb0r8y6gp7jk49q29lvkrx1kh"; + name = "kxmlrpcclient-5.21.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/modemmanager-qt-5.21.0.tar.xz"; + sha256 = "1w0kjp2pmgss45g63930lbn1c018ld2snng6h40saxi76n8cv57n"; + name = "modemmanager-qt-5.21.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/networkmanager-qt-5.21.0.tar.xz"; + sha256 = "0iy4a4qb1am2y7w03jg6n7q69c46y4gdpb72r6qjrnm9d4c2xsg1"; + name = "networkmanager-qt-5.21.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/oxygen-icons5-5.21.0.tar.xz"; + sha256 = "00qh1h3xx392hh73zdlknc1j9i2sck9ys74a9ffkf6an4rl0hws5"; + name = "oxygen-icons5-5.21.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/plasma-framework-5.21.0.tar.xz"; + sha256 = "006k8y8dnar371b5qhikny6rda3vg810jy53sl9yps695j0y39c0"; + name = "plasma-framework-5.21.0.tar.xz"; + }; + }; + solid = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/solid-5.21.0.tar.xz"; + sha256 = "13r9zcf7sr6vg5wlqjms2q7vl4g8gpzqghp3y25ldglhj0z7252r"; + name = "solid-5.21.0.tar.xz"; + }; + }; + sonnet = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/sonnet-5.21.0.tar.xz"; + sha256 = "088b87r80lds6jr0lnqxv0bd4isy2mkcgrq7hxfni7r2h6vn3xcd"; + name = "sonnet-5.21.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.21.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.21/threadweaver-5.21.0.tar.xz"; + sha256 = "17l23jj9bsixhg3gpv5sjrlc6w1kmjwlfb0z17drdkyzs5ak80ry"; + name = "threadweaver-5.21.0.tar.xz"; + }; + }; +} diff --git a/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix index 52817921cc7..b8f2939e8b5 100644 --- a/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix +++ b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix @@ -5,7 +5,5 @@ kdeFramework { name = "threadweaver"; nativeBuildInputs = [ extra-cmake-modules ]; - meta = { - maintainers = [ lib.maintainers.ttuegel ]; - }; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix deleted file mode 100644 index 1a96c1eced2..00000000000 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ plasmaPackage, lib, copyPathsToStore -, extra-cmake-modules, kdoctools -, baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative -, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime -, kjsembed, knewstuff, knotifyconfig, kpackage, krunner -, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient -, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt -, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland -, libksysguard, kconfig, solid, qtquickcontrols -}: - -plasmaPackage { - name = "plasma-workspace"; - - nativeBuildInputs = [ - extra-cmake-modules - kdoctools - ]; - buildInputs = [ - kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit - kjsembed knewstuff knotifyconfig kpackage - ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM - libXcursor networkmanager-qt pam phonon qtscript - wayland - ]; - propagatedBuildInputs = [ - baloo kactivities kdeclarative kdelibs4support kglobalaccel - kidletime krunner ktexteditor kwin libkscreen libksysguard - plasma-framework qtquick1 qtquickcontrols qtx11extras solid - ]; - - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); - - postPatch = '' - substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ - --replace kdostartupconfig5 $out/bin/kdostartupconfig5 - ''; - - postInstall = '' - rm "$out/bin/startkde" - rm "$out/bin/startplasmacompositor" - rm "$out/lib/libexec/startplasma" - rm -r "$out/share/wayland-sessions" - ''; -} diff --git a/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh deleted file mode 100644 index a8d9b7e0e36..00000000000 --- a/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh +++ /dev/null @@ -1 +0,0 @@ -addToSearchPath XDG_DATA_DIRS @out@/share diff --git a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix deleted file mode 100644 index f27b39033e2..00000000000 --- a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix +++ /dev/null @@ -1,309 +0,0 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh -{ fetchurl, mirror }: - -{ - bluedevil = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/bluedevil-5.5.5.tar.xz"; - sha256 = "10fm3gf28c4hwy628z8wy82j6n00z6xf0vad52jahwzz98w5xy9l"; - name = "bluedevil-5.5.5.tar.xz"; - }; - }; - breeze = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/breeze-5.5.5.tar.xz"; - sha256 = "0xxfykg1gsr65jb8jmkk6qr991cvdfibpb9228kb16kpfn73k45l"; - name = "breeze-5.5.5.tar.xz"; - }; - }; - breeze-gtk = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/breeze-gtk-5.5.5.tar.xz"; - sha256 = "047b5xrbpk2d1x1srxpx2j5sp0kjzfvgh1xaldirxpcla6jpjj65"; - name = "breeze-gtk-5.5.5.tar.xz"; - }; - }; - discover = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/discover-5.5.5.tar.xz"; - sha256 = "0asbn69k4agr0jyw249bnw8xhi9hnj18asij0h1a8r5wlqbqj22a"; - name = "discover-5.5.5.tar.xz"; - }; - }; - kde-cli-tools = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kde-cli-tools-5.5.5.tar.xz"; - sha256 = "19iggnanlxz1j2xx9l2p7wwf1471yic9fyjfhhk0wfj2z3ickmsh"; - name = "kde-cli-tools-5.5.5.tar.xz"; - }; - }; - kdecoration = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kdecoration-5.5.5.tar.xz"; - sha256 = "0ix4jnqm5jpfdhgr6r8j1mwasics22i63hacd6h8gj5klhbgsqvc"; - name = "kdecoration-5.5.5.tar.xz"; - }; - }; - kde-gtk-config = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kde-gtk-config-5.5.5.tar.xz"; - sha256 = "0b6xkpfy4da3vign82z186ghg61l6k9sisppmfgmy5ycqjp4yghq"; - name = "kde-gtk-config-5.5.5.tar.xz"; - }; - }; - kdeplasma-addons = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kdeplasma-addons-5.5.5.tar.xz"; - sha256 = "1l327fi0x3vljkj7f3113ryynxrsk16qhn0vpsdxc7f169vf4isx"; - name = "kdeplasma-addons-5.5.5.tar.xz"; - }; - }; - kgamma5 = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kgamma5-5.5.5.tar.xz"; - sha256 = "1597q98iw4dmkzm40525xlcjj3xfrgsmhp8djgm2yk92bjxy7ydj"; - name = "kgamma5-5.5.5.tar.xz"; - }; - }; - khelpcenter = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/khelpcenter-5.5.5.tar.xz"; - sha256 = "04q5rj5g882qzdzvxxil6668x77iwvbpqx0z8jzm5z80x0xrg44p"; - name = "khelpcenter-5.5.5.tar.xz"; - }; - }; - khotkeys = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/khotkeys-5.5.5.tar.xz"; - sha256 = "12rrgs7slais8xagv3rn06him4qq21cahlb1yh3gpz571mhyl1nj"; - name = "khotkeys-5.5.5.tar.xz"; - }; - }; - kinfocenter = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kinfocenter-5.5.5.tar.xz"; - sha256 = "1j76cfpilhjy97541l90fm6nsamlwa4q4ap7hrp65cdwi5lb08c2"; - name = "kinfocenter-5.5.5.tar.xz"; - }; - }; - kmenuedit = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kmenuedit-5.5.5.tar.xz"; - sha256 = "010fdfp7kawwhvg76ypzq4rs047xkc2gxz3cfifaybiz5z1y4mdj"; - name = "kmenuedit-5.5.5.tar.xz"; - }; - }; - kscreen = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kscreen-5.5.5.tar.xz"; - sha256 = "1a0fq2x30nnrq2r4slgmfziibbdjmbzh1n8q8ym1lj18j5zyhqcz"; - name = "kscreen-5.5.5.tar.xz"; - }; - }; - kscreenlocker = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kscreenlocker-5.5.5.tar.xz"; - sha256 = "00sq4ddb30sxdp6br9h8r4rb07hra3vqv0kxvqfdr50hhcq8dbbw"; - name = "kscreenlocker-5.5.5.tar.xz"; - }; - }; - ksshaskpass = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/ksshaskpass-5.5.5.tar.xz"; - sha256 = "0szw50wfwh8dvwm61m3azk96di6fr0ymvjhjqffy6ja41kslhp4a"; - name = "ksshaskpass-5.5.5.tar.xz"; - }; - }; - ksysguard = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/ksysguard-5.5.5.tar.xz"; - sha256 = "020b5fkkj3baqg7clhkvpjhqp5xl0gdzyh75b19sx4ba3akpqx5m"; - name = "ksysguard-5.5.5.tar.xz"; - }; - }; - kwallet-pam = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kwallet-pam-5.5.5.tar.xz"; - sha256 = "0dlkm1dm60fbnwdmfhiql6mkqrqkdpqi04qa6xxpccijb6h57h8r"; - name = "kwallet-pam-5.5.5.tar.xz"; - }; - }; - kwayland = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kwayland-5.5.5.tar.xz"; - sha256 = "04p6m9fgllarh7l449injjn5426bqfjwyab0d739p0ys6kdm9hqh"; - name = "kwayland-5.5.5.tar.xz"; - }; - }; - kwayland-integration = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kwayland-integration-5.5.5.tar.xz"; - sha256 = "1ijllnfxy5ackz6bbxffi31ibpsrmgg3abm74x1p2m6a5r4f6bj8"; - name = "kwayland-integration-5.5.5.tar.xz"; - }; - }; - kwin = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kwin-5.5.5.tar.xz"; - sha256 = "1i79qq9p0rfz6gjjx9m1kjskrnh2kkpvkgp20cw8akn1cgi755vm"; - name = "kwin-5.5.5.tar.xz"; - }; - }; - kwrited = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/kwrited-5.5.5.tar.xz"; - sha256 = "17hq5jknqaqdf571m3ahdf3dwvphrmxj3jxgl5bhrb9zh5whjsi3"; - name = "kwrited-5.5.5.tar.xz"; - }; - }; - libkscreen = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/libkscreen-5.5.5.tar.xz"; - sha256 = "1djv0h6vw4ijfsd281pxr3yxi24rjbg7kshpm6qhfn3gbhz7qbqv"; - name = "libkscreen-5.5.5.tar.xz"; - }; - }; - libksysguard = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/libksysguard-5.5.5.tar.xz"; - sha256 = "16ky6xmd60ga2a09kgd4111rhly1p26dv72xmda4n40zswd6k1j2"; - name = "libksysguard-5.5.5.tar.xz"; - }; - }; - milou = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/milou-5.5.5.tar.xz"; - sha256 = "1fzbni8lyrx858pd3b1365x84pmyjamxa5f56q2h3ahzdhb726l5"; - name = "milou-5.5.5.tar.xz"; - }; - }; - oxygen = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/oxygen-5.5.5.tar.xz"; - sha256 = "1hmzvpsh0rpp2aps77cs9w4fqdfa3y5fbq7mpx97sp2z072x6i12"; - name = "oxygen-5.5.5.tar.xz"; - }; - }; - plasma-desktop = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/plasma-desktop-5.5.5.tar.xz"; - sha256 = "12za7c6c28iccw0b7ccrwz0hj2pa71387334jdinl2a1f60xljb6"; - name = "plasma-desktop-5.5.5.tar.xz"; - }; - }; - plasma-mediacenter = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/plasma-mediacenter-5.5.5.tar.xz"; - sha256 = "1yixqsajxf9jp5n16n0zg53iypmp9c114lbnhlr5ni1a0dqgfc8j"; - name = "plasma-mediacenter-5.5.5.tar.xz"; - }; - }; - plasma-nm = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/plasma-nm-5.5.5.tar.xz"; - sha256 = "0xffyfw1pb53h686lfc1v9k5f2p3mjqgzi49h6j46l2zxd2wi9w4"; - name = "plasma-nm-5.5.5.tar.xz"; - }; - }; - plasma-pa = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/plasma-pa-5.5.5.tar.xz"; - sha256 = "1msmnci4id2qxj1453qizx3zsmdf2rpryy83c7j192izc25ry6sh"; - name = "plasma-pa-5.5.5.tar.xz"; - }; - }; - plasma-sdk = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/plasma-sdk-5.5.5.tar.xz"; - sha256 = "0301h0h1z5id0win0599qwhvxdxz6m881qadyzwxrvhysj3r1sd8"; - name = "plasma-sdk-5.5.5.tar.xz"; - }; - }; - plasma-workspace = { - version = "5.5.5.2"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.2.tar.xz"; - sha256 = "09kvzv2cjlv0bglik7723m373nvhvh3c4aaip2xkv5lbhxfydldy"; - name = "plasma-workspace-5.5.5.2.tar.xz"; - }; - }; - plasma-workspace-wallpapers = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-wallpapers-5.5.5.tar.xz"; - sha256 = "01mrrz6y81ypsd33ldpcz1llj13faqmrip5fg9fxqf6vjbh7jlcp"; - name = "plasma-workspace-wallpapers-5.5.5.tar.xz"; - }; - }; - polkit-kde-agent = { - version = "1-5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/polkit-kde-agent-1-5.5.5.tar.xz"; - sha256 = "0pcwzb747gjp2s68i3apv5q2cfl3igkf1hsx0v1j1y7sk4diqkj9"; - name = "polkit-kde-agent-1-5.5.5.tar.xz"; - }; - }; - powerdevil = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/powerdevil-5.5.5.tar.xz"; - sha256 = "1sb046pyir6x75r2gpqcq6765igpdc0hl9g5jams6j3l65ivzgvk"; - name = "powerdevil-5.5.5.tar.xz"; - }; - }; - sddm-kcm = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/sddm-kcm-5.5.5.tar.xz"; - sha256 = "0zpl6wfpgvmkf80aqn4b46wrpk1a81yz7srxcnw857xyhvw31m6g"; - name = "sddm-kcm-5.5.5.tar.xz"; - }; - }; - systemsettings = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/systemsettings-5.5.5.tar.xz"; - sha256 = "183sb898f1452ljdk11k6wqy4dgzlgnicjlrygjfgvw9sz0vgn90"; - name = "systemsettings-5.5.5.tar.xz"; - }; - }; - user-manager = { - version = "5.5.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.5.5/user-manager-5.5.5.tar.xz"; - sha256 = "1g9fm1i05mzmjs3c5fsg45pf8nd28vhh7g5awbpd397z586gr44y"; - name = "user-manager-5.5.5.tar.xz"; - }; - }; -} diff --git a/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix index 6596c246202..3bfac828084 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix @@ -9,12 +9,9 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules makeQtWrapper shared_mime_info ]; - buildInputs = [ - kcoreaddons kdbusaddons kded kiconthemes knotifications - kwidgetsaddons - ]; propagatedBuildInputs = [ - bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative + bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons + kdbusaddons kded kiconthemes knotifications kwidgetsaddons ]; propagatedUserEnvPkgs = [ bluez-qt ]; postInstall = '' diff --git a/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix index 179f15dc876..179f15dc876 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix diff --git a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix index f8092bc9d37..f8092bc9d37 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix diff --git a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix index 63ade168805..f641b48c82b 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix @@ -10,11 +10,9 @@ plasmaPackage { extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons - ]; propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras + kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; postInstall = '' diff --git a/pkgs/desktops/kde-5/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix index 3921f93a41d..27274654ce2 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix @@ -55,6 +55,7 @@ let name = "breeze-${version}"; paths = map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]; }; + kactivitymanagerd = callPackage ./kactivitymanagerd.nix {}; kde-cli-tools = callPackage ./kde-cli-tools.nix {}; kde-gtk-config = callPackage ./kde-gtk-config {}; kdecoration = callPackage ./kdecoration.nix {}; @@ -71,7 +72,7 @@ let kwayland = callPackage ./kwayland.nix {}; kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; - libkscreen = callPackage ./libkscreen {}; + libkscreen = callPackage ./libkscreen.nix {}; libksysguard = callPackage ./libksysguard {}; milou = callPackage ./milou.nix {}; oxygen = callPackage ./oxygen.nix {}; diff --git a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh index d2b426b85d6..93f58373ca2 100755 --- a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh +++ b/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh @@ -4,7 +4,7 @@ set -x # The trailing slash at the end is necessary! -RELEASE_URL="http://download.kde.org/stable/plasma/5.5.5/" +RELEASE_URL="http://download.kde.org/stable/plasma/5.6.3/" EXTRA_WGET_ARGS='-A *.tar.xz' mkdir tmp; cd tmp diff --git a/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix new file mode 100644 index 00000000000..282e58ecf9e --- /dev/null +++ b/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix @@ -0,0 +1,14 @@ +{ plasmaPackage +, extra-cmake-modules +, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel +, kwindowsystem, kxmlgui +}: + +plasmaPackage { + name = "kactivitymanagerd"; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ + boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem + kxmlgui + ]; +} diff --git a/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix index 7f19af6959e..d95db120dec 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix @@ -6,11 +6,9 @@ plasmaPackage { name = "kde-cli-tools"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ - kcmutils kconfig kdesu kiconthemes - ]; propagatedBuildInputs = [ - kdelibs4support ki18n kwindowsystem qtsvg qtx11extras + kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu + kiconthemes ]; postInstall = '' wrapQtProgram "$out/bin/kmimetypefinder5" diff --git a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch index 759eda4cc13..759eda4cc13 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix index ab8867520b3..f482f2a6a3f 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix @@ -16,11 +16,10 @@ plasmaPackage { name = "kde-gtk-config"; patches = [ ./0001-follow-symlinks.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes + propagatedBuildInputs = [ + ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes knewstuff ]; - propagatedBuildInputs = [ ki18n kio ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" diff --git a/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix index eb65f7f90af..eb65f7f90af 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix diff --git a/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix index d6a96a3276d..570112e4480 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix @@ -1,7 +1,7 @@ { plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig , kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n , kio, knewstuff, kross, krunner, kservice, kunitconversion -, plasma-framework, qtdeclarative, qtx11extras +, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras }: plasmaPackage { @@ -10,12 +10,9 @@ plasmaPackage { extra-cmake-modules kdoctools ]; - buildInputs = [ - ibus kconfig kconfigwidgets kcoreaddons kcmutils - knewstuff kservice kunitconversion - ]; propagatedBuildInputs = [ - kdelibs4support kio kross krunner plasma-framework qtdeclarative - qtx11extras + kdelibs4support kio kross krunner plasma-framework plasma-workspace + qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils + knewstuff kservice kunitconversion ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix index 965c33e6eef..965c33e6eef 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix diff --git a/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix index 6ba860b9dfb..3ded239b09b 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix @@ -10,10 +10,10 @@ plasmaPackage { kdoctools makeQtWrapper ]; - buildInputs = [ - kconfig kcoreaddons kdbusaddons kinit kcmutils kservice + propagatedBuildInputs = [ + kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit kcmutils + kservice ]; - propagatedBuildInputs = [ kdelibs4support khtml ki18n ]; postInstall = '' wrapQtProgram "$out/bin/khelpcenter" ''; diff --git a/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix index 141320e6b3e..1666692c928 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix @@ -6,11 +6,8 @@ plasmaPackage { name = "khotkeys"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils kdbusaddons kxmlgui - ]; propagatedBuildInputs = [ - kdelibs4support kglobalaccel ki18n kio plasma-framework - plasma-workspace qtx11extras + kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace + qtx11extras kcmutils kdbusaddons kxmlgui ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix index ed717790cd0..c6a86fc05f6 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix @@ -12,12 +12,11 @@ plasmaPackage { kdoctools makeQtWrapper ]; - buildInputs = [ - kcmutils kcompletion kconfig kconfigwidgets kcoreaddons - kdbusaddons kiconthemes kpackage kservice kwidgetsaddons - kxmlgui libraw1394 pciutils solid + propagatedBuildInputs = [ + kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig + kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice + kwidgetsaddons kxmlgui libraw1394 pciutils solid ]; - propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ]; postInstall = '' wrapQtProgram "$out/bin/kinfocenter" ''; diff --git a/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix index 3834ca1328f..09224a48716 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix @@ -9,10 +9,9 @@ plasmaPackage { kdoctools makeQtWrapper ]; - buildInputs = [ - kxmlgui kdbusaddons kiconthemes + propagatedBuildInputs = [ + kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes ]; - propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ]; postInstall = '' wrapQtProgram "$out/bin/kmenuedit" ''; diff --git a/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix index a521a799362..117a39c3be3 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix @@ -9,19 +9,9 @@ plasmaPackage { extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - kconfig - kconfigwidgets - kdbusaddons - kwidgetsaddons - kxmlgui - ]; propagatedBuildInputs = [ - kglobalaccel - ki18n - libkscreen - qtdeclarative - qtgraphicaleffects + kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig + kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui ]; postInstall = '' wrapQtProgram "$out/bin/kscreen-console" diff --git a/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix index 562797b546e..2cb3aac0f55 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix @@ -9,11 +9,8 @@ plasmaPackage { extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland - libXcursor pam wayland - ]; propagatedBuildInputs = [ - kdeclarative plasma-framework qtdeclarative + kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support + kglobalaccel kidletime kwayland libXcursor pam wayland ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix index f274512e027..8fe7cecd5a8 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix @@ -5,8 +5,7 @@ plasmaPackage { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ]; - buildInputs = [ kcoreaddons kwallet kwidgetsaddons ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ]; postInstall = '' wrapQtProgram "$out/bin/ksshaskpass" ''; diff --git a/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix index d47f9215a41..637d539189d 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix @@ -10,10 +10,10 @@ plasmaPackage { kdoctools makeQtWrapper ]; - buildInputs = [ + propagatedBuildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard + kdelibs4support ki18n ]; - propagatedBuildInputs = [ kdelibs4support ki18n ]; postInstall = '' wrapQtProgram "$out/bin/ksysguardd" ''; diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix index e4d6eb631f9..3c2788237fc 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix @@ -8,7 +8,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ + propagatedBuildInputs = [ wayland ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch index 797a32fc5f8..797a32fc5f8 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix index a09acb88aad..8c85981de7e 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix @@ -15,15 +15,13 @@ plasmaPackage { kdoctools makeQtWrapper ]; - buildInputs = [ - epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons - kcrash kdecoration kiconthemes kidletime kinit knewstuff knotifications - kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE - libSM qtscript udev wayland xcb-util-cursor - ]; propagatedBuildInputs = [ - kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker - kwindowsystem plasma-framework qtdeclarative qtmultimedia qtx11extras + kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem + plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion + kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes + kidletime kinit knewstuff knotifications kpackage kservice kwayland + kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland + xcb-util-cursor ]; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix index a6ed9d9bb28..29498e93404 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix @@ -5,6 +5,5 @@ plasmaPackage { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ]; - propagatedBuildInputs = [ ki18n ]; + propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix index 9fccbd6834c..4e04fd5ed1d 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix @@ -1,6 +1,6 @@ { plasmaPackage , extra-cmake-modules -, libXrandr +, kwayland, libXrandr , qtx11extras }: @@ -9,10 +9,7 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - libXrandr - ]; propagatedBuildInputs = [ - qtx11extras + kwayland libXrandr qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch index fbbb11ae755..fbbb11ae755 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix index 402b3ce3bee..679ba61e3e2 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix @@ -8,21 +8,13 @@ plasmaPackage { name = "libksysguard"; patches = [ ./0001-qdiriterator-follow-symlinks.patch - (fetchpatch { # should be included on update - name = "glibc-2.23-isnan.patch"; - url = https://github.com/KDE/libksysguard/commit/b0578798eb3.patch; - sha256 = "1my5nqp58c5azyi265j261a10wh047zxakprrnpl85mlg7bwskdh"; - }) ]; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kservice - kwidgetsaddons qtscript qtwebkit - ]; propagatedBuildInputs = [ - kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework - qtx11extras + kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras + kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript + qtwebkit ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/milou.nix b/pkgs/desktops/kde-5/plasma-5.6/milou.nix index 760de2d79ab..43f78d9e2a9 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/milou.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/milou.nix @@ -8,10 +8,8 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - qtscript kcoreaddons kservice - ]; propagatedBuildInputs = [ - kdeclarative ki18n krunner plasma-framework qtdeclarative + kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript + kcoreaddons kservice ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix index 02918100408..5a783ca6502 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix @@ -8,11 +8,10 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ]; - buildInputs = [ - kcmutils kconfig kdecoration kguiaddons kwidgetsaddons - kservice kcompletion + propagatedBuildInputs = [ + kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion + frameworkintegration ki18n kwindowsystem qtx11extras ]; - propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ]; postInstall = '' wrapQtProgram "$out/bin/oxygen-demo5" wrapQtProgram "$out/bin/oxygen-settings5" diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch index ead7452daa8..ead7452daa8 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch index 17b01486d92..17b01486d92 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch index aba97b032f8..aba97b032f8 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix index 5f27efc7f24..3475f53e858 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix @@ -17,48 +17,14 @@ plasmaPackage rec { kdoctools makeQtWrapper ]; - buildInputs = [ - attica - boost - fontconfig - kcmutils - kdbusaddons - kded - kitemmodels - knewstuff - knotifications - knotifyconfig - kwallet - libcanberra_kde - libXcursor - libpulseaudio - libXft - libxkbfile - phonon - qtsvg - xf86inputevdev - xf86inputsynaptics - xkeyboard_config - xinput - ]; propagatedBuildInputs = [ - baloo - kactivities - kauth - kdeclarative - kdelibs4support - kemoticons - kglobalaccel - ki18n - kpeople - krunner - kwin - plasma-framework - plasma-workspace - qtdeclarative - qtquick1 - qtquickcontrols - qtx11extras + attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff + knotifications knotifyconfig kwallet libcanberra_kde libXcursor + libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev + xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth + kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner + kwin plasma-framework plasma-workspace qtdeclarative qtquick1 + qtquickcontrols qtx11extras ]; patches = [ ./0001-qt-5.5-QML-import-paths.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix index 7088f45d64e..a1e1cf8a127 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix @@ -9,12 +9,8 @@ plasmaPackage rec { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kconfig kcoreaddons kguiaddons kservice - qtdeclarative qtmultimedia taglib - ]; propagatedBuildInputs = [ - baloo kactivities kdeclarative kfilemetadata ki18n kio - plasma-framework + baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework + kconfig kcoreaddons kguiaddons kservice qtdeclarative qtmultimedia taglib ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch index 79b5cfb437e..79b5cfb437e 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix index 249c6d8aac9..0ea2ab49f55 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix @@ -20,15 +20,12 @@ plasmaPackage { kdoctools makeQtWrapper ]; - buildInputs = [ - kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes - kinit kitemviews knotifications kservice kwallet kwidgetsaddons - kxmlgui mobile_broadband_provider_info modemmanager-qt - networkmanager-qt openconnect qca-qt5 solid - ]; propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework - qtdeclarative + qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes + kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui + mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect + qca-qt5 solid ]; postInstall = '' wrapQtProgram "$out/bin/kde5-nm-connection-editor" diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix index ff56d1199b1..1712dab773d 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix @@ -9,10 +9,8 @@ plasmaPackage { extra-cmake-modules kdoctools ]; - buildInputs = [ - glib kconfigwidgets kcoreaddons libpulseaudio - ]; propagatedBuildInputs = [ - kdeclarative kglobalaccel ki18n plasma-framework + glib kconfigwidgets kcoreaddons libpulseaudio kdeclarative kglobalaccel + ki18n plasma-framework ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix index bc87abcad15..bc87abcad15 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix new file mode 100644 index 00000000000..73a84274642 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix @@ -0,0 +1,57 @@ +{ plasmaPackage, lib, copyPathsToStore +, extra-cmake-modules, kdoctools +, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative +, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime, kjsembed, knewstuff +, knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland +, kwin, kxmlrpcclient, libdbusmenu, libkscreen, libksysguard, libSM, libXcursor +, networkmanager-qt, pam, phonon, plasma-framework, qtquick1, qtquickcontrols +, qtscript, qtx11extras, solid, wayland +}: + +plasmaPackage { + name = "plasma-workspace"; + + nativeBuildInputs = [ + extra-cmake-modules + kdoctools + ]; + propagatedBuildInputs = [ + baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative + kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff + knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland + kwin kxmlrpcclient libdbusmenu libkscreen libksysguard libSM libXcursor + networkmanager-qt pam phonon plasma-framework qtquick1 qtquickcontrols + qtscript qtx11extras solid wayland + ]; + + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + + postPatch = '' + substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \ + --replace kdostartupconfig5 $out/bin/kdostartupconfig5 + ''; + + postInstall = '' + rm "$out/bin/startkde" + rm "$out/bin/startplasmacompositor" + rm "$out/lib/libexec/startplasma" + rm -r "$out/share/wayland-sessions" + ''; + + preFixup = '' + wrapQtProgram $out/bin/kcheckrunning + wrapQtProgram $out/bin/kcminit + wrapQtProgram $out/bin/kcminit_startup + wrapQtProgram $out/bin/kdostartupconfig5 + wrapQtProgram $out/bin/klipper + wrapQtProgram $out/bin/krunner + wrapQtProgram $out/bin/ksmserver + wrapQtProgram $out/bin/ksplashqml + wrapQtProgram $out/bin/kstartupconfig5 + wrapQtProgram $out/bin/kuiserver5 + wrapQtProgram $out/bin/plasmashell + wrapQtProgram $out/bin/plasmawindowed + wrapQtProgram $out/bin/systemmonitor + wrapQtProgram $out/bin/xembedsniproxy + ''; +} diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch index 1d34001be59..7842109669a 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch @@ -1,20 +1,20 @@ -Index: plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml +Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/analog-clock/contents/ui/analogclock.qml -+++ plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as Pl - import QtQuick.Layouts 1.1 +--- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml ++++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml +@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore + import org.kde.plasma.components 2.0 as PlasmaComponents -import "logic.js" as Logic +import "../code/logic.js" as Logic Item { id: analogclock -Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml +Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml -+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml +--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml ++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml @@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.workspace.components 2.0 @@ -24,10 +24,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/Battery Item { id: batteryItem -Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml +--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml ++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml @@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as Components @@ -37,10 +37,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/Compact MouseArea { id: root -Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml +Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml -+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml +--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml ++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml @@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma import org.kde.plasma.components 2.0 as Components import org.kde.plasma.extras 2.0 as PlasmaExtras @@ -50,10 +50,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDi FocusScope { id: dialog -Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml +Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml -+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml +--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml ++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml @@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.kcoreaddons 1.0 as KCoreAddons @@ -63,10 +63,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/battery Item { id: batterymonitor -Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml +Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/lock_logout/contents/ui/lockout.qml -+++ plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml +--- plasma-workspace-5.6.3.orig/applets/lock_logout/contents/ui/lockout.qml ++++ plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 @@ -76,10 +76,10 @@ Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml Flow { id: lockout -Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml +Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/notifications/package/contents/ui/main.qml -+++ plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml +--- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml ++++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas import org.kde.plasma.private.notifications 1.0 @@ -89,10 +89,10 @@ Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml MouseEventListener { id: notificationsApplet -Index: plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml +Index: plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml =================================================================== ---- plasma-workspace-5.5.1.orig/applets/systemtray/package/contents/ui/main.qml -+++ plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml +--- plasma-workspace-5.6.3.orig/applets/systemtray/package/contents/ui/main.qml ++++ plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml @@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma // import org.kde.plasma.extras 2.0 as PlasmaExtras diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series index b9081298bd6..b9081298bd6 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch index eea0ae4c199..eea0ae4c199 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch +++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch diff --git a/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix index 3fc3a441ac3..68bb3a9ef3d 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix @@ -17,15 +17,8 @@ plasmaPackage { nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ - kdbusaddons - kwidgetsaddons - kcoreaddons - kcrash - kconfig - kiconthemes - knotifications - polkit-qt + propagatedBuildInputs = [ + kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes + knotifications kwindowsystem polkit-qt ]; - propagatedBuildInputs = [ ki18n kwindowsystem ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix index 475e8878206..8f3b354b947 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix @@ -10,11 +10,9 @@ plasmaPackage { extra-cmake-modules kdoctools ]; - buildInputs = [ - kconfig kdbusaddons knotifyconfig solid udev - ]; propagatedBuildInputs = [ - kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime - kwayland libkscreen plasma-workspace qtx11extras + kconfig kdbusaddons knotifyconfig solid udev kactivities kauth + kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen + plasma-workspace qtx11extras ]; } diff --git a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix new file mode 100644 index 00000000000..288378771e5 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix @@ -0,0 +1,341 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + bluedevil = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/bluedevil-5.6.3.tar.xz"; + sha256 = "1x8rdsk2jhx01pfw5d74ks2240w9pky7c38rwb84w18l3w1mrq6q"; + name = "bluedevil-5.6.3.tar.xz"; + }; + }; + breeze = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/breeze-5.6.3.tar.xz"; + sha256 = "191pkbkn1hb1c2k7f5y8x2wm99p4v2rm74jk1ygqk72bh8wpc9zx"; + name = "breeze-5.6.3.tar.xz"; + }; + }; + breeze-grub = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/breeze-grub-5.6.3.tar.xz"; + sha256 = "0i4kxjw8rmp3y40z10yyc792kbvyai9pxd4lva24bilzsh3x2g5c"; + name = "breeze-grub-5.6.3.tar.xz"; + }; + }; + breeze-gtk = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/breeze-gtk-5.6.3.tar.xz"; + sha256 = "0yr20v5b0hq4jicfx8lxmy23znqwf3d87hz88qiizjiad4fyy4ca"; + name = "breeze-gtk-5.6.3.tar.xz"; + }; + }; + breeze-plymouth = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/breeze-plymouth-5.6.3.tar.xz"; + sha256 = "0gkiwravkpxwk9r6l0mzjyr5hc9fpj1d6l5a0i755q7m80h1dahk"; + name = "breeze-plymouth-5.6.3.tar.xz"; + }; + }; + discover = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/discover-5.6.3.tar.xz"; + sha256 = "1rpn22xjabsaakqgdsx0vz4h0v40l8ssfrjqahpj95axs14zi2gg"; + name = "discover-5.6.3.tar.xz"; + }; + }; + kactivitymanagerd = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kactivitymanagerd-5.6.3.tar.xz"; + sha256 = "0zs3z4r27iiqz3wjsv09ik3h45g2f08y1p3mr1ihiss07qgknbz6"; + name = "kactivitymanagerd-5.6.3.tar.xz"; + }; + }; + kde-cli-tools = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kde-cli-tools-5.6.3.tar.xz"; + sha256 = "1cxbvgc3nhrr98ygm3i7srr26ds2rmbg6fzjqvdz2z4bz80ai892"; + name = "kde-cli-tools-5.6.3.tar.xz"; + }; + }; + kdecoration = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kdecoration-5.6.3.tar.xz"; + sha256 = "03iryqrkrpphvc8xpqmmpbdgg7rim9yvvyx3kxrjgpbh2xy6rwsr"; + name = "kdecoration-5.6.3.tar.xz"; + }; + }; + kde-gtk-config = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kde-gtk-config-5.6.3.tar.xz"; + sha256 = "0jiraahajpfn5k81j077l4ipfadq9aqnnca0kfyag488mhkgmil1"; + name = "kde-gtk-config-5.6.3.tar.xz"; + }; + }; + kdeplasma-addons = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kdeplasma-addons-5.6.3.tar.xz"; + sha256 = "1p70ms91hd9lhg9fabnrpz1wkc2la9315ffk2wxi334sx4k70gcs"; + name = "kdeplasma-addons-5.6.3.tar.xz"; + }; + }; + kgamma5 = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kgamma5-5.6.3.tar.xz"; + sha256 = "1wv32s6yc4b8qaskdb444r7j918pz0x8mkal5affbr12vzfz8m6r"; + name = "kgamma5-5.6.3.tar.xz"; + }; + }; + khelpcenter = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/khelpcenter-5.6.3.tar.xz"; + sha256 = "14mwy1rv04mp92dfci6ak6dvmaqx2vc0yk0zyp1v6s64jiry658g"; + name = "khelpcenter-5.6.3.tar.xz"; + }; + }; + khotkeys = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/khotkeys-5.6.3.tar.xz"; + sha256 = "05235ckdr81cl46iyalapjxxmybqd8b2zy1yqclv7fwld2c347pc"; + name = "khotkeys-5.6.3.tar.xz"; + }; + }; + kinfocenter = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kinfocenter-5.6.3.tar.xz"; + sha256 = "1rvixj9sr98abna8ss6bmvf7g7i4nm5xa49dv4d42874kskqjci5"; + name = "kinfocenter-5.6.3.tar.xz"; + }; + }; + kmenuedit = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kmenuedit-5.6.3.tar.xz"; + sha256 = "169ybp4vvay5isfwk2kv73npspiww2abb4vaa7af8rbiv82cwr0g"; + name = "kmenuedit-5.6.3.tar.xz"; + }; + }; + kscreen = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kscreen-5.6.3.tar.xz"; + sha256 = "1cvgxwdh742r7dk59qqa4w28sd7k62gjy7w5hmq3dnhka0nlxr74"; + name = "kscreen-5.6.3.tar.xz"; + }; + }; + kscreenlocker = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kscreenlocker-5.6.3.tar.xz"; + sha256 = "13fqmazqrhcdg32iwdym9rci9fj2jn02mkc01rz8fw9a8fwxzdcn"; + name = "kscreenlocker-5.6.3.tar.xz"; + }; + }; + ksshaskpass = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/ksshaskpass-5.6.3.tar.xz"; + sha256 = "0bxpwlylfnicipwkf5fq3s62w9gq8gcxl6iby1lmw8m55fm1xd7y"; + name = "ksshaskpass-5.6.3.tar.xz"; + }; + }; + ksysguard = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/ksysguard-5.6.3.tar.xz"; + sha256 = "0vh0wpsv0jlj6lq6fl45k7aivbj2nwq5ksfnyad74v20qhy2069b"; + name = "ksysguard-5.6.3.tar.xz"; + }; + }; + kwallet-pam = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kwallet-pam-5.6.3.tar.xz"; + sha256 = "1zy5s3pv7qlyckzaz7yvqzb0w478q6zldmm5w7m4ax90j16ihg7n"; + name = "kwallet-pam-5.6.3.tar.xz"; + }; + }; + kwayland = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kwayland-5.6.3.tar.xz"; + sha256 = "04rpvgs25dqrac8bg46w1dpxpwavrlrjyc71bxqiddrya798485v"; + name = "kwayland-5.6.3.tar.xz"; + }; + }; + kwayland-integration = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kwayland-integration-5.6.3.tar.xz"; + sha256 = "19p224n7knih7gikcxkx6n4v49ysgkxd6ghpqwnw5y6jx147qyg4"; + name = "kwayland-integration-5.6.3.tar.xz"; + }; + }; + kwin = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kwin-5.6.3.tar.xz"; + sha256 = "0dxscqk5kqkqfq5cs8qpfwi38i20q3w7r8wvq5l8r9q0q56bsnrk"; + name = "kwin-5.6.3.tar.xz"; + }; + }; + kwrited = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/kwrited-5.6.3.tar.xz"; + sha256 = "18lqr7an6zzlqs2s50arw5zwfdzxl644c7i00j332nlv23yxc1g3"; + name = "kwrited-5.6.3.tar.xz"; + }; + }; + libkscreen = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/libkscreen-5.6.3.tar.xz"; + sha256 = "0w1v432i8xjk0xgs6vbz68myfqfa93kzhhya4mqri7jzjc6nyc1y"; + name = "libkscreen-5.6.3.tar.xz"; + }; + }; + libksysguard = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/libksysguard-5.6.3.tar.xz"; + sha256 = "16pf9p9dbq08mlqrcqrxsmwxgi1dp1rzbm4icksr99cjm30zss0g"; + name = "libksysguard-5.6.3.tar.xz"; + }; + }; + milou = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/milou-5.6.3.tar.xz"; + sha256 = "18d3knb1ndj39pffy5xsqdyncsym0izv73r0cmmc3mw8x7xshcfc"; + name = "milou-5.6.3.tar.xz"; + }; + }; + oxygen = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/oxygen-5.6.3.tar.xz"; + sha256 = "1pnal63by1hnjal356lmadk7sxq2pndi1gfhf8lmqpw0n5dwd9ng"; + name = "oxygen-5.6.3.tar.xz"; + }; + }; + plasma-desktop = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-desktop-5.6.3.tar.xz"; + sha256 = "0dk4ya5srb4czslakbi1f7gyrriv1lb6cdkfirqznax561bk6dk7"; + name = "plasma-desktop-5.6.3.tar.xz"; + }; + }; + plasma-integration = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-integration-5.6.3.tar.xz"; + sha256 = "0wx62s6l8kqhsrc88zji9ydaqgplc9y7l2s52qfwm2g464k4i1qw"; + name = "plasma-integration-5.6.3.tar.xz"; + }; + }; + plasma-mediacenter = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-mediacenter-5.6.3.tar.xz"; + sha256 = "17g5hkpjqsifb413f4p9y10hnbk74k3vbk5srcx46byrsjbkasgq"; + name = "plasma-mediacenter-5.6.3.tar.xz"; + }; + }; + plasma-nm = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-nm-5.6.3.tar.xz"; + sha256 = "0axsv7nxfwqhjq3j5yn30b76wvr8p21p5jlqspq7yxhmxhk88x4j"; + name = "plasma-nm-5.6.3.tar.xz"; + }; + }; + plasma-pa = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-pa-5.6.3.tar.xz"; + sha256 = "1d623xav0ckabckr9v51sg6a6695fi7pkcy86q2lrpg1m6f2m2l3"; + name = "plasma-pa-5.6.3.tar.xz"; + }; + }; + plasma-sdk = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-sdk-5.6.3.tar.xz"; + sha256 = "0w8gcm0hgqk3yqr981zf1xzd024b06y7zxqmzsbzcr3sfh85f0b2"; + name = "plasma-sdk-5.6.3.tar.xz"; + }; + }; + plasma-workspace = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-workspace-5.6.3.tar.xz"; + sha256 = "0p4g15x1ifcc4kn224h66a6fyv3iki1qqpfnihvmkdxmifmbzy2c"; + name = "plasma-workspace-5.6.3.tar.xz"; + }; + }; + plasma-workspace-wallpapers = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/plasma-workspace-wallpapers-5.6.3.tar.xz"; + sha256 = "0jdwm01q7h47qrx832kqshrh17dz4dhjbqmy1x17barxd759kd09"; + name = "plasma-workspace-wallpapers-5.6.3.tar.xz"; + }; + }; + polkit-kde-agent = { + version = "1-5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/polkit-kde-agent-1-5.6.3.tar.xz"; + sha256 = "1d28v8fb5w5snfn5nwghz8mwvk8p1ahs3kxjkhqkwb6sb6l0kkq1"; + name = "polkit-kde-agent-1-5.6.3.tar.xz"; + }; + }; + powerdevil = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/powerdevil-5.6.3.tar.xz"; + sha256 = "1gq04f2pgr3y7wi3jg6xrk8b3fhf1fqn82knv7cix0d5b2khy2lp"; + name = "powerdevil-5.6.3.tar.xz"; + }; + }; + sddm-kcm = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/sddm-kcm-5.6.3.tar.xz"; + sha256 = "1kqkl4p65vl2mvgigw24w3p9p4f0j2fz4d2rv1iy2w93kznl9b4s"; + name = "sddm-kcm-5.6.3.tar.xz"; + }; + }; + systemsettings = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/systemsettings-5.6.3.tar.xz"; + sha256 = "16fgr1qwfbmzriajisq4sj978lni11d4ig80z7k1h7g5xxhahk9k"; + name = "systemsettings-5.6.3.tar.xz"; + }; + }; + user-manager = { + version = "5.6.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.6.3/user-manager-5.6.3.tar.xz"; + sha256 = "1slvz0nxhafpprbdzf87dpiw62yar62ia78rcr9xabgz2rfl0bhl"; + name = "user-manager-5.6.3.tar.xz"; + }; + }; +} diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix b/pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix index 30e986c21b4..30e986c21b4 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh index d839226a456..d839226a456 100755 --- a/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh +++ b/pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh diff --git a/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix index a921e153dbc..47264cf38fd 100644 --- a/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix +++ b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix @@ -11,10 +11,11 @@ plasmaPackage { makeQtWrapper ]; buildInputs = [ - kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons - kconfig ]; - propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ]; + propagatedBuildInputs = [ + khtml ki18n kio kwindowsystem kitemviews kcmutils kservice kiconthemes + kxmlgui kdbusaddons kconfig + ]; postInstall = '' wrapQtProgram "$out/bin/systemsettings5" ''; diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index 1c549907c31..85d8d37b21c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then - patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.out}/lib \ + patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \ + --set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \ "$f" || true fi done diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 3ad872518f9..81bdebdcbd4 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, libedit, ncurses, gmp}: +{stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}: stdenv.mkDerivation rec { version = "6.10.2"; @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { '' else ""); configurePhase = '' - ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include + ./configure --prefix=$out --with-gmp-libraries=${lib.getLib gmp}/lib --with-gmp-includes=${lib.getDev gmp}/include ''; # Stripping combined with patchelf breaks the executables (they die @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { # No building is necessary, but calling make without flags ironically # calls install-strip ... - buildPhase = "true"; + dontBuild = true; # The binaries for Darwin use frameworks, so fake those frameworks, # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index c03cfbaaadd..77e5229a2a0 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { # No building is necessary, but calling make without flags ironically # calls install-strip ... - buildPhase = "true"; + dontBuild = true; postInstall = '' diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index cf21a61b1b3..c9f281980d9 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { # No building is necessary, but calling make without flags ironically # calls install-strip ... - buildPhase = "true"; + dontBuild = true; preInstall = stdenv.lib.optionalString stdenv.isDarwin '' mkdir -p $out/lib/ghc-7.4.2 diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index 3a1f39eab24..17c3cc05217 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go # Find the loader dynamically - LOADER="$(find ${libc.out or libc}/lib -name ld-linux\* | head -n 1)" + LOADER="$(find ${lib.getLib libc}/lib -name ld-linux\* | head -n 1)" # Replace references to the loader find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \; diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index f8565b9637a..a853ca4eb77 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -17,8 +17,8 @@ assert enableThreading -> (stdenv ? glibc); let libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; - libcInc = libc.dev or libc; - libcLib = libc.out or libc; + libcInc = lib.getDev libc; + libcLib = lib.getLib libc; common = { version, sha256 }: stdenv.mkDerivation rec { name = "perl-${version}"; diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index c4086078d7d..6a7424eb5cd 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -22,7 +22,7 @@ let url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2"; sha256 = "1cs9xqs1rmzdcnwxxkbvy064s5cbp6vvzhn2jmyzh5kg4di1r3bn"; }; - libs = [ libffi libedit libuv boost.dev boost.lib zlib ]; + libs = [ libffi libedit libuv boost.dev boost.out zlib ]; include-path = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") libs); library-path = stdenv.lib.concatStringsSep ":" @@ -47,7 +47,7 @@ let patchPhase = '' (cd pixie-src patch -p1 < ${./load_paths.patch} - libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.lib}" "${zlib}"]' + libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.out}" "${zlib}"]' export libraryPaths substituteAllInPlace ./pixie/ffi-infer.pxi) ''; diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix index 095e0b7db08..fdbf7b1bab6 100644 --- a/pkgs/development/interpreters/pypy/default.nix +++ b/pkgs/development/interpreters/pypy/default.nix @@ -25,10 +25,9 @@ let ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; - C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs); - LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") buildInputs); - LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") - (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); + C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs; + LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); preConfigure = '' # hint pypy to find nix ncurses diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 96b44ddc17f..2196bb7e8b8 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -53,8 +53,8 @@ let ++ optional zlibSupport zlib; mkPaths = paths: { - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths); + C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; + LIBRARY_PATH = makeLibraryPath paths; }; # Build the basic Python interpreter without modules that have diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index f1ae897ea4a..6b336766db7 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -102,8 +102,8 @@ let propagatedBuildInputs = optional stdenv.isDarwin configd; mkPaths = paths: { - C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths); - LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths); + C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; + LIBRARY_PATH = makeLibraryPath paths; }; # Build the basic Python interpreter without modules that have diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix index c0b5d3401dd..8a2d24d76f9 100644 --- a/pkgs/development/interpreters/python/3.2/default.nix +++ b/pkgs/development/interpreters/python/3.2/default.nix @@ -44,8 +44,8 @@ stdenv.mkDerivation { ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix index a46ef7c056b..60d56597ea0 100644 --- a/pkgs/development/interpreters/python/3.3/default.nix +++ b/pkgs/development/interpreters/python/3.3/default.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation { ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''} configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 8d87c6abfbb..517dfc3d8b2 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -35,16 +35,16 @@ stdenv.mkDerivation { pythonVersion = majorVersion; inherit majorVersion version; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ]; + buildInputs = optionals stdenv.isDarwin [ CF configd ]; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; sha256 = "18kb5c29w04rj4gyz3jngm72sy8izfnbjlm6ajv6rv2m061d75x7"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' ''; @@ -58,8 +58,8 @@ stdenv.mkDerivation { ''} configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -113,8 +113,8 @@ stdenv.mkDerivation { hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = stdenv.lib.licenses.psfl; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ]; + license = licenses.psfl; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ]; }; } diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix index 4bc39f4c2b3..15e02d1ab3e 100644 --- a/pkgs/development/interpreters/python/3.5/default.nix +++ b/pkgs/development/interpreters/python/3.5/default.nix @@ -35,16 +35,16 @@ stdenv.mkDerivation { pythonVersion = majorVersion; inherit majorVersion version; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ]; + buildInputs = optionals stdenv.isDarwin [ CF configd ]; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6"; }; - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; - prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + prePatch = optionalString stdenv.isDarwin '' substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"' ''; @@ -58,8 +58,8 @@ stdenv.mkDerivation { ''} configureFlagsArray=( --enable-shared --with-threads - CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}" - LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}" + CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" + LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}" ) ''; @@ -113,8 +113,8 @@ stdenv.mkDerivation { hierarchical packages; exception-based error handling; and very high level dynamic data types. ''; - license = stdenv.lib.licenses.psfl; - platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ]; + license = licenses.psfl; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ]; }; } diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index 401743ac517..a56425b8425 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { configurePhase = '' python waf configure --prefix=$out \ --boost-includes="${boost.dev}/include" \ - --boost-libs="${boost.lib}/lib" + --boost-libs="${boost.out}/lib" ''; buildPhase = "python waf"; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index e6f59ca8efe..ab34f64dfbf 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; buildInputs = [ pkgconfig gfortran texinfo ] - ++ optional (boost != null) [ boost.lib ]; + ++ optional (boost != null) [ boost.out ]; configureFlags = [ "--enable-shared" @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ optional enablePadding "--enable-array-length-padding" ++ optional enableSerialization "--enable-serialization" ++ optionals (boost != null) [ "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.lib}/lib" ] + "--with-boost-libdir=${boost.out}/lib" ] ++ optional stdenv.is64bit "--enable-64bit" ; diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 8e5579cb8ea..73499a42497 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -53,7 +53,7 @@ let genericB2Flags = [ "--includedir=$dev/include" - "--libdir=$lib/lib" + "--libdir=$out/lib" "-j$NIX_BUILD_CORES" "--layout=${layout}" "variant=${variant}" @@ -96,10 +96,6 @@ let # Let boost install everything else ./b2 ${b2Args} install - - # Create a derivation which encompasses everything, making buildInputs nicer - mkdir -p $out/nix-support - echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs ''; commonConfigureFlags = [ @@ -135,10 +131,9 @@ stdenv.mkDerivation { }; preConfigure = '' - NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")" if test -f tools/build/src/tools/clang-darwin.jam ; then substituteInPlace tools/build/src/tools/clang-darwin.jam \ - --replace '@rpath/$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)"; + --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)"; fi; '' + optionalString (mpi != null) '' cat << EOF > user-config.jam @@ -167,7 +162,7 @@ stdenv.mkDerivation { postFixup = fixup; - outputs = [ "out" "dev" "lib" ]; + outputs = [ "dev" "out" ]; setOutputFlags = false; crossAttrs = rec { diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 83635d9739f..dd86ca54081 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -6,8 +6,8 @@ assert x11Support -> libX11 != null && libSM != null; let - version = "1.8.20"; - sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw"; + version = "1.10.8"; + sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs"; self = stdenv.mkDerivation { name = "dbus-${version}"; @@ -17,8 +17,7 @@ self = stdenv.mkDerivation { inherit sha256; }; - patches = [ ./ignore-missing-includedirs.patch ] - ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; + patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; postPatch = '' substituteInPlace tools/Makefile.in \ --replace 'install-localstatelibDATA:' 'disabled:' \ diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch deleted file mode 100644 index 2781f4ae3de..00000000000 --- a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c ---- dbus-1.2.24-orig/bus/config-parser.c 2010-03-23 20:01:27.000000000 +0100 -+++ dbus-1.2.24/bus/config-parser.c 2010-07-20 14:17:20.000000000 +0200 -@@ -2159,12 +2159,16 @@ - - retval = FALSE; - -- dir = _dbus_directory_open (dirname, error); -+ dbus_error_init (&tmp_error); -+ -+ dir = _dbus_directory_open (dirname, &tmp_error); - - if (dir == NULL) -- goto failed; -+ { -+ retval = TRUE; -+ goto failed; -+ } - -- dbus_error_init (&tmp_error); - while (_dbus_directory_get_next_file (dir, &filename, &tmp_error)) - { - DBusString full_path; diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index e1af46cc3ed..af17c9ae0f0 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { }; postPatch = "patchShebangs ./src/svn_version.sh"; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ gettext ]; propagatedBuildInputs = [ zlib expat ]; diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix index 191db2f6f6d..b45ec24ca6b 100644 --- a/pkgs/development/libraries/fmod/4.24.16.nix +++ b/pkgs/development/libraries/fmod/4.24.16.nix @@ -29,11 +29,10 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + dontBuild = true; makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ]; - buildPhase = "true"; - preInstall = '' mkdir -p $out/lib ''; diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix index 621d6dc405f..af946019540 100644 --- a/pkgs/development/libraries/fmod/default.nix +++ b/pkgs/development/libraries/fmod/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { }; dontStrip = true; - buildPhase = "true"; + dontBuild = true; + installPhase = '' mkdir -p $out/lib $out/include/fmodex diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 72867e012a9..dc07c481b10 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs build ''; - configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]; + configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index 38432f68273..70b731f56dd 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { description = "Graph-based image processing framework"; homepage = http://www.gegl.org; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 8417179dde1..6d15faf9549 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "c78654addeb27a1213bedd7cd21904a45bbb98a5ba2f2f0de2b2f1a5682d86cf"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig gnum4 ]; propagatedBuildInputs = [ glib libsigcxx ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index add3026275f..c47de95c2ad 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { sha256 = "03m99igngm37653353n5d724bcqw7p6hw6xjw0i2824523fpcqqi"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; buildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index b2fff30197c..176eb404f00 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { sha256 = "08hmg7fp519wim1fm04r7f2q2020ssdninawqsbrqjsvs70srh5b"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python gobjectIntrospection ]; @@ -31,7 +33,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ gstreamer ]; - configureFlags = if stdenv.isDarwin then [ + configureFlags = if stdenv.isDarwin then [ # Does not currently build on Darwin "--disable-libvisual" # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 40caf4093f0..bbd4bcde785 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -17,17 +17,30 @@ stdenv.mkDerivation rec { sha256 = "1p5y9bbrhywng0prmpxv29p6jsz6vd039d49bnc98p9b45532yll"; }; + outputs = [ "dev" "out" ]; + outputBin = "dev"; + nativeBuildInputs = [ pkgconfig perl bison flex python gobjectIntrospection makeWrapper ]; propagatedBuildInputs = [ glib ]; + enableParallelBuilding = true; + + preConfigure = '' + configureFlagsArray+=("--exec-prefix=$dev") + ''; + postInstall = '' for prog in "$out/bin/"*; do wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")" done ''; + preFixup = '' + moveToOutput "share/bash-completion" "$dev" + ''; + setupHook = ./setup-hook.sh; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index e47ecfa01aa..0b48d87b90a 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1gisdfa91kq89bsmbvb47alaxh8lpqmr6f3dzlwmf389nkandw2h"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ]; propagatedBuildInputs = [ gnonlin libxml2 ]; diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix index 9d43f3ac23c..db29413476f 100644 --- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ gst-plugins-base ]; diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 54175fb83fb..d14a99ce56b 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -29,6 +29,8 @@ stdenv.mkDerivation rec { sha256 = "0kczdvqxvl8kxiy2d7czv16jp73hv9k3nykh47ckihnv8x6i6362"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; buildInputs = [ @@ -40,5 +42,10 @@ stdenv.mkDerivation rec { ++ libintlOrEmpty ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ]; + preFixup = '' + mkdir -p "$dev/lib/gstreamer-1.0" + mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0" + ''; + LDFLAGS = optionalString stdenv.isDarwin "-lintl"; } diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix index 692310be0ba..9b7db6d4732 100644 --- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix +++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix @@ -11,13 +11,15 @@ stdenv.mkDerivation rec { url = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz"; sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi"; }; - + + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig file ]; propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ]; enableParallelBuilding = true; - + meta = with stdenv.lib; { description = "C++ interface for GStreamer"; homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index e4daa642ba0..ad3bdb81858 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "0719njp8aarhvn038pijq6dmsnli0zlg146hyfs3rsdffs4f472s"; }; + outputs = [ "dev" "out" ]; + configureFlags = stdenv.lib.optionalString withSystemLibav "--with-system-libav"; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 5320fdfaced..6d018c36f56 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { patches = [ ./different-path-with-pygobject.patch ]; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; # XXX: in the Libs.private field of python3.pc diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix index 3bd840dcd7e..675fdf322e8 100644 --- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { }) ]; + outputs = [ "dev" "out" ]; + buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ]; propagatedBuildInputs = [ boost ]; nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ]; diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 8f8437ad4ac..3b17c548ba2 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { sha256 = "137b6kqykh5nwbmiv28nn1pc1d2x2rb2xxg382pc9pa9gpxpyrak"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig python ]; buildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index a9aa3d73fa2..18394193706 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ]; buildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index 1c123621664..02ce69af907 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1pcy9pfffyk6xiw6aq38kbv7k24x2rljdy8fabjfy1abpmvvfrkn"; }; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 467dd87f43e..55ff770f4bd 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; + # Without this, pkgconfig-based dependencies are unhappy + propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; + preBuild = if stdenv.isCygwin then '' echo "#include <windows.h>" >> config.h '' else null; diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix index 4aadafff844..95de4918668 100644 --- a/pkgs/development/libraries/libgnome-keyring/default.nix +++ b/pkgs/development/libraries/libgnome-keyring/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n"; }; + outputs = [ "dev" "out" ]; + propagatedBuildInputs = [ glib dbus_libs libgcrypt ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 2c29482227a..82dca85c040 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9"; }; + outputs = [ "dev" "out" ]; + configureFlags = [ (mkFlag documentationSupport "documentation") (mkFlag eventGUISupport "event-gui") diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 0768a21bf54..6147e847b33 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; + outputs = [ "dev" "out" ]; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix index 02bd1f966e6..951a939cbfb 100644 --- a/pkgs/development/libraries/libspotify/default.nix +++ b/pkgs/development/libraries/libspotify/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }: -let - version = "12.1.51"; +let + version = "12.1.51"; isLinux = (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); in @@ -29,13 +29,8 @@ else stdenv.mkDerivation { else null; - # common - buildPhase = "true"; - # no patch or build phase for darwin - phases = - [ "unpackPhase" ] ++ - (stdenv.lib.optionals (isLinux) [ "patchPhase" "buildPhase" ]) ++ - [ "installPhase" ]; + dontBuild = true; + installPhase = if (isLinux) then "installPhase" else '' @@ -48,7 +43,7 @@ else stdenv.mkDerivation { mkdir -p "$out"/share/man mv -v man3 "$out"/share/man ''; - + # darwin-specific buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix index a5bb258af1a..d840487b4a5 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "--with-libgeoip=system" "--with-libiconv=yes" "--with-boost=${boost.dev}" - "--with-boost-libdir=${boost.lib}/lib" + "--with-boost-libdir=${boost.out}/lib" "--with-libiconv=yes" ]; diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 4af9278c7b1..714745c432e 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchurl, zlib }: +{ stdenv, fetchurl, perl, zlib }: stdenv.mkDerivation rec { - name = "libzip-0.11.2"; + name = "libzip-${version}"; + version = "1.1.2"; src = fetchurl { url = "http://www.nih.at/libzip/${name}.tar.gz"; - sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3"; + sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r"; }; - # fix CVE-2015-2331 taken from Debian patch: - # https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=libzip-0.11.2-1.2-nmu.diff;att=1;bug=780756 - postPatch = '' - substituteInPlace lib/zip_dirent.c --replace \ - 'else if ((cd->entry=(struct zip_entry *)' \ - 'else if (nentry > ((size_t)-1)/sizeof(*(cd->entry)) || (cd->entry=(struct zip_entry *)' - cat lib/zip_dirent.c - ''; + outputs = [ "dev" "out" ]; + nativeBuildInputs = [ perl ]; propagatedBuildInputs = [ zlib ]; + preInstall = '' + patchShebangs man/handle_links + ''; + # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice # had this same problem. This links it somewhere that mysqlworkbench looks. postInstall = '' - ( cd $out/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) + mkdir -p $dev/lib + mv $out/lib/libzip $dev/lib/libzip + ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) ''; meta = { homepage = http://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix index d95443da359..87aaaece53f 100644 --- a/pkgs/development/libraries/ndn-cxx/default.nix +++ b/pkgs/development/libraries/ndn-cxx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ./waf configure \ --with-cryptopp=${cryptopp} \ --boost-includes=${boost.dev}/include \ - --boost-libs=${boost.lib}/lib \ + --boost-libs=${boost.out}/lib \ --with-examples \ --prefix=$out ''; diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 1b4b4af7f41..b01ff527d8c 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -25,12 +25,14 @@ in stdenv.mkDerivation rec { name = "openjpeg-${version}"; - + src = fetchurl { url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz"; inherit sha256; }; + outputs = [ "dev" "out" ]; + cmakeFlags = [ "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib" "-DBUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index fa84b89bd38..157ce5fb9de 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -57,20 +57,20 @@ let rm "$out/lib/"*.a fi - mkdir -p $bin - mv $out/bin $bin/ + mkdir -p $bin + mv $out/bin $bin/ - mkdir $dev - mv $out/include $dev/ + mkdir $dev + mv $out/include $dev/ # remove dependency on Perl at runtime - rm -r $out/etc/ssl/misc + rm -r $out/etc/ssl/misc rmdir $out/etc/ssl/{certs,private} ''; postFixup = '' - # Check to make sure the main output doesn't depend on perl + # Check to make sure the main output doesn't depend on perl if grep -r '${perl}' $out; then echo "Found an erroneous dependency on perl ^^^" >&2 exit 1 diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix deleted file mode 100644 index 2f588cbe708..00000000000 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all_1 }: - -let - version = "4.8.2"; - pname = "phonon-backend-gstreamer"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; - }; - - buildInputs = with gst_all_1; [ phonon qt4 gstreamer gst-plugins-base ]; - - nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - - NIX_CFLAGS_COMPILE = [ - # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" - ]; - - cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; - - meta = { - homepage = http://phonon.kde.org/; - description = "GStreamer backend for Phonon"; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix deleted file mode 100644 index 98aa7d81b36..00000000000 --- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, cmake, gst_all_1, phonon, pkgconfig, qtbase, debug ? false }: - -with stdenv.lib; - -let - version = "4.8.2"; - pname = "phonon-backend-gstreamer"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10"; - }; - - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ]; - - NIX_CFLAGS_COMPILE = [ - # This flag should be picked up through pkgconfig, but it isn't. - "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" - ]; - - nativeBuildInputs = [ cmake pkgconfig ]; - - cmakeFlags = [ - "-DCMAKE_INSTALL_LIBDIR=lib" - "-DPHONON_BUILD_PHONON4QT5=ON" - ] - ++ optional debug "-DCMAKE_BUILD_TYPE=Debug"; - - meta = with stdenv.lib; { - homepage = http://phonon.kde.org/; - description = "GStreamer backend for Phonon"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel ]; - }; -} diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix deleted file mode 100644 index 70b6174c635..00000000000 --- a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}: - -with stdenv.lib; - -let - pname = "phonon-backend-vlc"; - v = "0.8.1"; - # Force same Qt version in phonon and VLC - vlc_ = vlc.override { inherit qt4; }; - phonon_ = phonon.override { inherit qt4; }; -in - -stdenv.mkDerivation { - name = "${pname}-${v}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; - sha256 = "1fyfh7qyb6rld350v2fgz452ld96d3z5ifchr323q0vc3hb9k222"; - }; - - nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; - - buildInputs = [ vlc_ phonon_ qt4 ]; - - meta = { - homepage = http://phonon.kde.org/; - description = "VideoLAN backend for Phonon multimedia framework"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel urkud ]; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix deleted file mode 100644 index 744d681a694..00000000000 --- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon, qtbase }: - -with stdenv.lib; - -let - pname = "phonon-backend-vlc"; - v = "0.8.2"; -in - -stdenv.mkDerivation { - name = "${pname}-${v}"; - - src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; - sha256 = "18ysdga681my75lxxv5h242pa4qappvg5z73wnc0ks9yypnzidys"; - }; - - nativeBuildInputs = [ cmake pkgconfig xz ]; - - buildInputs = [ vlc phonon qtbase ]; - - cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"]; - - meta = { - homepage = http://phonon.kde.org/; - description = "VideoLAN backend for Phonon multimedia framework"; - platforms = platforms.linux; - maintainers = with maintainers; [ ttuegel urkud ]; - license = licenses.lgpl21Plus; - }; -} diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix new file mode 100644 index 00000000000..3f2ab6696d1 --- /dev/null +++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig +, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null +, debug ? false }: + +with lib; + +let + v = "4.9.0"; + pname = "phonon-backend-gstreamer"; + withQt5 = extra-cmake-modules != null; +in + +assert withQt5 -> qtbase != null; +assert withQt5 -> qtx11extras != null; + +stdenv.mkDerivation rec { + name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + + meta = with stdenv.lib; { + homepage = http://phonon.kde.org/; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel ]; + }; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; + sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf"; + }; + + buildInputs = with gst_all_1; + [ gstreamer gst-plugins-base phonon ] + ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + + NIX_CFLAGS_COMPILE = [ + # This flag should be picked up through pkgconfig, but it isn't. + "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include" + ]; + + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] + ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; +} diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix new file mode 100644 index 00000000000..aaff26eee28 --- /dev/null +++ b/pkgs/development/libraries/phonon/backends/vlc.nix @@ -0,0 +1,39 @@ +{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc +, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null +, debug ? false }: + +with lib; + +let + v = "0.9.0"; + pname = "phonon-backend-vlc"; + withQt5 = extra-cmake-modules != null; +in + +assert withQt5 -> qtbase != null; +assert withQt5 -> qtx11extras != null; + +stdenv.mkDerivation rec { + name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}"; + + meta = with stdenv.lib; { + homepage = http://phonon.kde.org/; + description = "GStreamer backend for Phonon"; + platforms = platforms.linux; + }; + + src = fetchurl { + url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; + sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0"; + }; + + buildInputs = + [ phonon vlc ] + ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]); + + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; + + cmakeFlags = + [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ] + ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; +} diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index db4c237c989..2356a040380 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio -, qt4 ? null, automoc4 ? null -, qtbase ? null, qtquick1 ? null, qttools ? null +{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio +, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qtquick1 ? null, qttools ? null , debug ? false }: -with stdenv.lib; +with lib; let - v = "4.8.3"; - withQt5 = qtbase != null; + v = "4.9.0"; + withQt5 = extra-cmake-modules != null; in +assert withQt5 -> qtbase != null; assert withQt5 -> qtquick1 != null; assert withQt5 -> qttools != null; -assert !withQt5 -> automoc4 != null; stdenv.mkDerivation rec { - name = "phonon-${v}"; + name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}"; meta = { homepage = http://phonon.kde.org/; @@ -26,17 +25,15 @@ stdenv.mkDerivation rec { }; src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz"; - sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551"; + url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; + sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v"; }; buildInputs = [ mesa libpulseaudio ] ++ (if withQt5 then [ qtbase qtquick1 qttools ] else [ qt4 ]); - nativeBuildInputs = - [ cmake pkgconfig ] - ++ optional (!withQt5) automoc4; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules; NIX_CFLAGS_COMPILE = "-fPIC"; diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 1f9ec43bc20..51b5ac5981e 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -29,11 +29,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty; + NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; + configureFlags = with lib; [ "--enable-xpdf-headers" "--enable-libcurl" "--enable-zlib" + "--enable-build-type=release" ] ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 034e25662ea..9cfc052e730 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -45,7 +45,6 @@ let nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ]; NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true; - dontFixLibtool = args.dontFixLibtool or true; outputs = args.outputs or [ "dev" "out" ]; setOutputFlags = args.setOutputFlags or false; diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh index f059c19e03b..aa20779f4ec 100644 --- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh +++ b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh @@ -53,6 +53,17 @@ _qtMultioutModuleDevs() { # The destination directory must exist or moveToOutput will do nothing mkdir -p "${!outputDev}/share" moveToOutput "share/doc" "${!outputDev}" + + # Move libtool archives and qmake project files to $dev/lib + if [ "z${!outputLib}" != "z${!outputDev}" ]; then + pushd "${!outputLib}" + find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \ + while read -r -d $'\0' file; do + mkdir -p "${!outputDev}/$(dirname "$file")" + mv "${!outputLib}/$file" "${!outputDev}/$file" + done + popd + fi } qmakeConfigurePhase() { diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index 7d68116d716..2cd129acab1 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -8,7 +8,7 @@ , zlib, libjpeg, libpng, libtiff, sqlite, icu , coreutils, bison, flex, gdb, gperf, lndir, ruby -, python, perl, pkgconfig +, patchelf, perl, pkgconfig, python # optional dependencies , cups ? null @@ -19,7 +19,7 @@ , buildExamples ? false , buildTests ? false , developerBuild ? false -, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk +, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk , decryptSslTraffic ? false }: @@ -27,6 +27,9 @@ let inherit (srcs.qt5) version; system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; + # Search path for Gtk plugin + gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ]; + dontInvalidateBacking = fetchurl { url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; name = "qtbug-48321-dont-invalidate-backing-store.patch"; @@ -43,7 +46,7 @@ stdenv.mkDerivation { sourceRoot = "qt-everywhere-opensource-src-${version}"; - outputs = [ "dev" "out" ]; + outputs = [ "dev" "out" "gtk" ]; postUnpack = '' mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase @@ -51,7 +54,6 @@ stdenv.mkDerivation { patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ]; @@ -89,14 +91,6 @@ stdenv.mkDerivation { qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ --replace "@libX11@" "${libX11.out}" '' - + lib.optionalString gtkStyle '' - substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}" - substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \ - --replace "@gtk@" "${gtk.out}" \ - --replace "@gnome_vfs@" "${gnome_vfs.out}" \ - --replace "@libgnomeui@" "${libgnomeui.out}" \ - --replace "@gconf@" "${GConf.out}" - '' + lib.optionalString mesaSupported '' substituteInPlace \ qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ @@ -106,24 +100,12 @@ stdenv.mkDerivation { --replace "@mesa_inc@" "${mesa.dev}" ''; + setOutputFlags = false; preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export MAKEFLAGS=-j$NIX_BUILD_CORES - _multioutQtDevs() { - # We cannot simply set these paths in configureFlags because libQtCore retains - # references to the paths it was built with. - moveToOutput "bin" "$dev" - moveToOutput "include" "$dev" - moveToOutput "mkspecs" "$dev" - - # The destination directory must exist or moveToOutput will do nothing - mkdir -p "$dev/share" - moveToOutput "share/doc" "$dev" - } - preFixupHooks+=(_multioutQtDevs) - configureFlags+="\ -plugindir $out/lib/qt5/plugins \ -importdir $out/lib/qt5/imports \ @@ -230,11 +212,50 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf]; - nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ]; + nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + preFixup = '' + # We cannot simply set these paths in configureFlags because libQtCore retains + # references to the paths it was built with. + moveToOutput "bin" "$dev" + moveToOutput "include" "$dev" + moveToOutput "mkspecs" "$dev" + + # The destination directory must exist or moveToOutput will do nothing + mkdir -p "$dev/share" + moveToOutput "share/doc" "$dev" + + # Move libtool archives and qmake projects + if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then + pushd "''${!outputLib}" + find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \ + while read -r file; do + mkdir -p "''${!outputDev}/$(dirname "$file")" + mv "''${!outputLib}/$file" "''${!outputDev}/$file" + done + popd + fi + + # Move the QGtkStyle plugin to the gtk output + mkdir -p "$gtk/lib/qt5/plugins/platformthemes" + mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes" + rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake" + + # Set RPATH for QGtkStyle plugin + qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so" + qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")" + qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}" + patchelf "$qgtk2" \ + --add-needed libgtk-x11-2.0.so \ + --add-needed libgnomeui-2.so \ + --add-needed libgnomevfs-2.so \ + --add-needed libgconf-2.so \ + --set-rpath "$qgtk2_RPATH" + ''; + postFixup = '' # Don't retain build-time dependencies like gdb and ruby. diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix index 64ea6fa0e74..46ecada9668 100644 --- a/pkgs/development/libraries/swiften/default.nix +++ b/pkgs/development/libraries/swiften/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { patchShebangs ./scons ./scons openssl=${openssl} \ boost_includedir=${boost.dev}/include \ - boost_libdir=${boost.lib}/lib \ + boost_libdir=${boost.out}/lib \ boost_bundled_enable=false \ SWIFTEN_INSTALLDIR=$out $out ''; diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix index 5f3b71131e0..511129de1e8 100644 --- a/pkgs/development/libraries/uthash/default.nix +++ b/pkgs/development/libraries/uthash/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "035z3cs5ignywgh4wqxx358a2nhn3lj0x1ifij6vj0yyyhah3wgj"; }; - buildPhase = ":"; + dontBuild = false; buildInputs = stdenv.lib.optional doCheck perl; diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix index cf14490c514..8bd7a90ad5a 100644 --- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix +++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig +{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig , git, xorg, gnum4, libxcb, gperf }: stdenv.mkDerivation rec { @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; }; + outputs = [ "dev" "out" ]; + buildInputs = [ autoconf automake @@ -34,6 +36,6 @@ stdenv.mkDerivation rec { configurePhase = '' sed -i '15 i\ LT_INIT' configure.ac - ${bashInteractive}/bin/bash autogen.sh --prefix="$out" + ${stdenv.shell} autogen.sh --prefix="$out" ''; } diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix index fcdab133e2f..ffc58d9ad4b 100644 --- a/pkgs/development/libraries/xlibs-wrapper/default.nix +++ b/pkgs/development/libraries/xlibs-wrapper/default.nix @@ -2,9 +2,12 @@ stdenv.mkDerivation { name = "xlibs-wrapper"; - buildPhase = "true"; + + dontBuild = true; + installPhase = "mkdir -p $out"; unpackPhase = "sourceRoot=."; + propagatedBuildInputs = packages; preferLocalBuild = true; diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix index f7a72a7673a..2176fa6f31c 100644 --- a/pkgs/development/libraries/zlib/default.nix +++ b/pkgs/development/libraries/zlib/default.nix @@ -71,9 +71,6 @@ stdenv.mkDerivation rec { makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ]; }; - # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds - cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null; - passthru.version = version; meta = with stdenv.lib; { diff --git a/pkgs/development/mobile/titaniumenv/cli/node-env.nix b/pkgs/development/mobile/titaniumenv/cli/node-env.nix index 7af18c034f2..c6d56c9e074 100644 --- a/pkgs/development/mobile/titaniumenv/cli/node-env.nix +++ b/pkgs/development/mobile/titaniumenv/cli/node-env.nix @@ -4,7 +4,7 @@ let # Function that generates a TGZ file from a NPM project buildNodeSourceDist = { name, version, src }: - + stdenv.mkDerivation { name = "node-tarball-${name}-${version}"; inherit src; @@ -30,7 +30,7 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; } {}; - + # Function that produces a deployed NPM package in the Nix store buildNodePackage = { name, version, src, dependencies ? {}, buildInputs ? [], production ? true, npmFlags ? "", meta ? {}, linkDependencies ? false }: @@ -42,8 +42,8 @@ let # # It uses the semver utility to check whether a version range matches any # of the provided dependencies. - - analysedDependencies = + + analysedDependencies = if dependencies == {} then {} else import (stdenv.mkDerivation { @@ -63,14 +63,14 @@ let let providedDependency = builtins.getAttr dependencyName providedDependencies; versions = builtins.attrNames providedDependency; - + # If there is a version range match, add the dependency to # the set of shimmed dependencies. # Otherwise, it is a required dependency. in '' $(latestVersion=$(semver -r '${versionSpec}' ${stdenv.lib.concatMapStrings (version: " '${version}'") versions} | tail -1 | tr -d '\n') - + if semver -r '${versionSpec}' ${stdenv.lib.concatMapStrings (version: " '${version}'") versions} >/dev/null then echo "shimmedDependencies.\"${dependencyName}\".\"$latestVersion\" = true;" @@ -86,7 +86,7 @@ let EOF ''; }); - + requiredDependencies = analysedDependencies.requiredDependencies or {}; shimmedDependencies = analysedDependencies.shimmedDependencies or {}; @@ -95,11 +95,11 @@ let tar --no-same-owner --no-same-permissions -xf ${nodejs.src} mv node-* $out ''; - + # Compose dependency information that this package must propagate to its # dependencies, so that provided dependencies are not included a second time. # This prevents cycles and wildcard version mismatches. - + propagatedProvidedDependencies = (stdenv.lib.mapAttrs (dependencyName: dependency: builtins.listToAttrs (map (versionSpec: @@ -110,20 +110,20 @@ let ) dependencies) // providedDependencies // { "${name}"."${version}" = true; }; - + # Create a node_modules folder containing all required dependencies of the # package - + nodeDependencies = stdenv.mkDerivation { name = "node-dependencies-${name}-${version}"; inherit src; buildCommand = '' mkdir -p $out/lib/node_modules cd $out/lib/node_modules - + # Create copies of (or symlinks to) the dependencies that must be deployed in this package's private node_modules folder. # This package's private dependencies are NPM packages that have not been provided by any of the includers. - + ${stdenv.lib.concatMapStrings (requiredDependencyName: stdenv.lib.concatMapStrings (versionSpec: let @@ -133,7 +133,7 @@ let in '' depPath=$(echo ${dependency}/lib/node_modules/*) - + ${if linkDependencies then '' ln -s $depPath . '' else '' @@ -144,35 +144,35 @@ let ) (builtins.attrNames requiredDependencies)} ''; }; - + # Deploy the Node package with some tricks self = stdenv.lib.makeOverridable stdenv.mkDerivation { inherit src meta; dontStrip = true; - + name = "node-${name}-${version}"; buildInputs = [ nodejs python ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; - buildPhase = "true"; - + dontBuild = true; + installPhase = '' # Move the contents of the tarball into the output folder mkdir -p "$out/lib/node_modules/${name}" mv * "$out/lib/node_modules/${name}" - + # Enter the target directory cd "$out/lib/node_modules/${name}" - + # Patch the shebangs of the bundled modules. For "regular" dependencies # this is step is not required, because it has already been done by the generic builder. - + if [ -d node_modules ] then patchShebangs node_modules fi - + # Copy the required dependencies mkdir -p node_modules - + ${stdenv.lib.optionalString (requiredDependencies != {}) '' for i in ${nodeDependencies}/lib/node_modules/* do @@ -182,9 +182,9 @@ let fi done ''} - + # Create shims for the packages that have been provided by earlier includers to allow the NPM install operation to still succeed - + ${stdenv.lib.concatMapStrings (shimmedDependencyName: stdenv.lib.concatMapStrings (versionSpec: '' @@ -198,24 +198,24 @@ let '' ) (builtins.attrNames (shimmedDependencies."${shimmedDependencyName}")) ) (builtins.attrNames shimmedDependencies)} - + # Ignore npm-shrinkwrap.json for now. Ideally, it should be supported as well rm -f npm-shrinkwrap.json - + # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store. # The following JavaScript replaces these by * to prevent that: - + ( cat <<EOF var fs = require('fs'); var url = require('url'); - + /* * Replaces an impure version specification by * */ function replaceImpureVersionSpec(versionSpec) { var parsedUrl = url.parse(versionSpec); - + if(versionSpec == "latest" || versionSpec == "unstable" || versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/') return '*'; @@ -225,9 +225,9 @@ let else return versionSpec; } - + var packageObj = JSON.parse(fs.readFileSync('./package.json')); - + /* Replace dependencies */ if(packageObj.dependencies !== undefined) { for(var dependency in packageObj.dependencies) { @@ -235,7 +235,7 @@ let packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec); } } - + /* Replace development dependencies */ if(packageObj.devDependencies !== undefined) { for(var dependency in packageObj.devDependencies) { @@ -243,7 +243,7 @@ let packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec); } } - + /* Replace optional dependencies */ if(packageObj.optionalDependencies !== undefined) { for(var dependency in packageObj.optionalDependencies) { @@ -251,19 +251,19 @@ let packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec); } } - + /* Write the fixed JSON file */ fs.writeFileSync("package.json", JSON.stringify(packageObj)); EOF ) | node - + # Deploy the Node.js package by running npm install. Since the dependencies have been symlinked, it should not attempt to install them again, # which is good, because we want to make it Nix's responsibility. If it needs to install any dependencies anyway (e.g. because the dependency # parameters are incomplete/incorrect), it fails. - + export HOME=$TMPDIR npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install - + # After deployment of the NPM package, we must remove the shims again ${stdenv.lib.concatMapStrings (shimmedDependencyName: '' @@ -271,19 +271,19 @@ let rmdir node_modules/${shimmedDependencyName} '' ) (builtins.attrNames shimmedDependencies)} - + # It makes no sense to keep an empty node_modules folder around, so delete it if this is the case if [ -d node_modules ] then rmdir --ignore-fail-on-non-empty node_modules fi - + # Create symlink to the deployed executable folder, if applicable if [ -d "$out/lib/node_modules/.bin" ] then ln -s $out/lib/node_modules/.bin $out/bin fi - + # Create symlinks to the deployed manual page folders, if applicable if [ -d "$out/lib/node_modules/${name}/man" ] then @@ -298,7 +298,7 @@ let done fi ''; - + shellHook = stdenv.lib.optionalString (requiredDependencies != {}) '' export NODE_PATH=${nodeDependencies}/lib/node_modules ''; diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index f70888f102f..5e372535b8e 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -3,15 +3,22 @@ stdenv.mkDerivation rec { name = "PyStringTemplate-${version}"; version = "3.2b1"; - meta = { - homepage = "http://www.stringtemplate.org/"; - description = "Text Templating Library"; - }; + src = fetchurl { url = "http://www.stringtemplate.org/download/${name}.tar.gz"; sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; }; + propagatedBuildInputs = [python antlr]; - buildPhase = "true"; - installPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1"; + + dontBuild = true; + + installPhase = '' + python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1 + ''; + + meta = { + homepage = "http://www.stringtemplate.org/"; + description = "Text Templating Library"; + }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 955dd9ed667..99cb9d03ab6 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1866,7 +1866,7 @@ let RVowpalWabbit = old.RVowpalWabbit.overrideDerivation (attrs: { configureFlags = [ - "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.lib}/lib" + "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.out}/lib" ]; }); diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix index 50583f65f60..2e01e4d8f28 100644 --- a/pkgs/development/tools/analysis/clang-analyzer/default.nix +++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation rec { patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ]; buildInputs = [ clang llvmPackages.clang perl makeWrapper ]; - buildPhase = "true"; + + dontBuild = true; installPhase = '' mkdir -p $out/bin $out/libexec diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 6542c9ae3c5..885e10b465a 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = optional wantPS ps; - CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" + CMAKE_PREFIX_PATH = concatStringsSep ":" (concatMap (p: [ p p.out ]) buildInputs); configureFlags = @@ -63,9 +63,9 @@ stdenv.mkDerivation rec { source $setupHook fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${glibc.bin or glibc} \ - --subst-var-by glibc_dev ${glibc.dev or glibc} \ - --subst-var-by glibc_lib ${glibc.out or glibc} + --subst-var-by glibc_bin ${getBin glibc} \ + --subst-var-by glibc_dev ${getDev glibc} \ + --subst-var-by glibc_lib ${getLib glibc} ''; meta = { diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 9d0ff6e1f17..e1528aa5f00 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { '' fixCmakeFiles . substituteInPlace Modules/Platform/UnixPaths.cmake \ - --subst-var-by glibc_bin ${glibc.bin or glibc} \ - --subst-var-by glibc_dev ${glibc.dev or glibc} \ - --subst-var-by glibc_lib ${glibc.out or glibc} + --subst-var-by glibc_bin ${getBin glibc} \ + --subst-var-by glibc_dev ${getDev glibc} \ + --subst-var-by glibc_lib ${getLib glibc} ''; configureFlags = [ "--docdir=/share/doc/${name}" diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 730d4207375..7fae5604e2a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -4,7 +4,7 @@ rec { gradleGen = {name, src} : stdenv.mkDerivation rec { inherit name src; - buildPhase = ":"; + dontBuild = true; installPhase = '' mkdir -pv $out/lib/gradle/ diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 7216e1e169d..eda98091fc6 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -8,10 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf"; }; - doCheck = !stdenv.isDarwin - && !stdenv.isCygwin # XXX: `test-dup2' fails on Cygwin - && !stdenv.isSunOS # XXX: `test-setlocale2.sh' fails - && !stdenv.isFreeBSD; # XXX: test 084 fails + doCheck = false; configureFlags = "--with-syscmd-shell=${stdenv.shell}"; diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix index 0a1032cecf8..bcdba402b2e 100644 --- a/pkgs/development/tools/misc/sqitch/default.nix +++ b/pkgs/development/tools/misc/sqitch/default.nix @@ -1,9 +1,13 @@ { name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }: + stdenv.mkDerivation { name = "${name}-${sqitchModule.version}"; + buildInputs = [ perl makeWrapper sqitchModule databaseModule ]; - unpackPhase = ":"; - buildPhase = ":"; + + src = sqitchModule; + dontBuild = true; + installPhase = '' mkdir -p $out/bin for d in bin/sqitch etc lib share ; do diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix index 5b9e27b4829..ef8ac133b2c 100644 --- a/pkgs/development/web/grails/default.nix +++ b/pkgs/development/web/grails/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p "$out" diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix index 3196153b604..9845aa3bf8c 100644 --- a/pkgs/development/web/nodejs/v0_10.nix +++ b/pkgs/development/web/nodejs/v0_10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares +{ stdenv, lib, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares , pkgconfig, runCommand, which, libtool # apple frameworks @@ -20,10 +20,10 @@ let }) // ({ cares = c-ares; }); - sharedConfigureFlags = name: [ + sharedConfigureFlags = name: let drv = builtins.getAttr name deps; in [ "--shared-${name}" - "--shared-${name}-includes=${builtins.getAttr name deps}/include" - "--shared-${name}-libpath=${builtins.getAttr name deps}/lib" + "--shared-${name}-includes=${lib.getDev drv}/include" + "--shared-${name}-libpath=${lib.getLib drv}/lib" ]; inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms; diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 963dde91068..4bac1cd1bb3 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -12,7 +12,7 @@ let rtdeps = stdenv.lib.makeLibraryPath [ xorg.libXxf86vm xorg.libXext openal ] - + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ]; + + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; buildCommand = '' diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix index 3623f78eb20..db60ece128f 100644 --- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix @@ -9,7 +9,7 @@ Logging ------- - + `/tmp/br_cupswrapper_ml1.log` when `DEBUG > 0` in `brother_lpdwrapper_BrGenML1`. Note that when `DEBUG > 1` the wrapper stops performing its function. Better keep `DEBUG == 1` unless this is desirable. @@ -29,7 +29,7 @@ Fixed. 3. > perl: warning: Falling back to the standard locale ("C"). - + are supported and installed on your system. LANG = "en_US.UTF-8" LC_ALL = (unset), @@ -67,12 +67,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups perl coreutils gnused gnugrep brgenml1lpr ]; - configurePhase = ":"; - buildPhase = ":"; + dontBuild = true; patchPhase = '' WRAPPER=opt/brother/Printers/BrGenML1/cupswrapper/brother_lpdwrapper_BrGenML1 - PAPER_CFG=opt/brother/Printers/BrGenML1/cupswrapper/paperconfigml1 + PAPER_CFG=opt/brother/Printers/BrGenML1/cupswrapper/paperconfigml1 substituteInPlace $WRAPPER \ --replace "basedir =~" "basedir = \"${brgenml1lpr}/opt/brother/Printers/BrGenML1\"; #" \ diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix index 6dc2408ec88..bd069b0d65a 100644 --- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix +++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix @@ -8,7 +8,7 @@ Logging ------- - + `/tmp/br_lpdfilter_ml1.log` when `$ENV{LPD_DEBUG} > 0` in `filter_BrGenML1` which is activated automatically when `DEBUG > 0` in `brother_lpdwrapper_BrGenML1` from the cups wrapper. @@ -17,7 +17,7 @@ ------ - filter_BrGenML1 ln 196 `my $GHOST_SCRIPT=`which gs`;` - + `GHOST_SCRIPT` is empty resulting in an empty `/tmp/br_lpdfilter_ml1_gsout.dat` file. See `/tmp/br_lpdfilter_ml1.log` for the executed command. @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ cups perl glibc ghostscript which ]; - - buildPhase = ":"; + + dontBuild = true; patchPhase = '' INFDIR=opt/brother/Printers/BrGenML1/inf diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 60fb8e11391..0398ed57a70 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -32,9 +32,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath " + path) ( - map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ (map (x: x.lib or x.out) buildInputs)) + map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs) # libpulsecommon.so is linked but not found otherwise - ++ lib.optionals pulseaudioSupport (map (x: "${x.lib or x.out}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) + ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio") + (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))) ); # Don't shrink the ELF RPATHs in order to keep the extra RPATH diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix index 6a7e6caaa26..581eb31cc71 100644 --- a/pkgs/os-specific/darwin/install_name_tool/default.nix +++ b/pkgs/os-specific/darwin/install_name_tool/default.nix @@ -5,9 +5,9 @@ assert stdenv.isDarwin; stdenv.mkDerivation { name = "install_name_tool"; src = "/usr/bin/install_name_tool"; + unpackPhase = "true"; - configurePhase = "true"; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/os-specific/darwin/osx-sdk/default.nix b/pkgs/os-specific/darwin/osx-sdk/default.nix index 875479b4f29..235eadfd255 100644 --- a/pkgs/os-specific/darwin/osx-sdk/default.nix +++ b/pkgs/os-specific/darwin/osx-sdk/default.nix @@ -7,9 +7,8 @@ in stdenv.mkDerivation rec { src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"; - unpackPhase = "true"; - configurePhase = "true"; - buildPhase = "true"; + unpackPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p $out/Developer/SDKs/ diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix index 4bdb6e132fb..5eccee62468 100644 --- a/pkgs/os-specific/gnu/hurd/default.nix +++ b/pkgs/os-specific/gnu/hurd/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation ({ // (if headersOnly - then { buildPhase = ":"; installPhase = "make install-headers"; } + then { dontBuild = true; installPhase = "make install-headers"; } else (if (cross != null) then { crossConfig = cross.config; diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix index 4b16652ba05..294a1548582 100644 --- a/pkgs/os-specific/gnu/libpthread/default.nix +++ b/pkgs/os-specific/gnu/libpthread/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation ({ "ac_cv_lib_ihash_hurd_ihash_create=yes" ]; - buildPhase = ":"; + dontBuild = true; installPhase = "make install-data-local-headers"; } else { }) diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix index 6d2d20687bc..e8c15850715 100644 --- a/pkgs/os-specific/gnu/mach/default.nix +++ b/pkgs/os-specific/gnu/mach/default.nix @@ -53,5 +53,5 @@ stdenv.mkDerivation ({ // (if headersOnly - then { buildPhase = ":"; installPhase = "make install-data"; } + then { dontBuild = true; installPhase = "make install-data"; } else {})) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 9750a2a7649..a7e36d21dd4 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -6,7 +6,7 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { name = "bluez-5.37"; - + src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; sha256 = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0"; @@ -20,11 +20,13 @@ stdenv.mkDerivation rec { readline libsndfile udev libical # Disables GStreamer; not clear what it gains us other than a # zillion extra dependencies. - # gstreamer gst_plugins_base + # gstreamer gst_plugins_base ]; + outputs = [ "dev" "out" "test" ]; + patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ]; - + preConfigure = '' substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci " @@ -51,9 +53,9 @@ stdenv.mkDerivation rec { # FIXME: Move these into a separate package to prevent Bluez from # depending on Python etc. postInstall = '' - mkdir $out/test - cp -a test $out - pushd $out/test + mkdir -p $test/test + cp -a test $test + pushd $test/test for a in \ simple-agent \ test-adapter \ @@ -65,7 +67,7 @@ stdenv.mkDerivation rec { ln -s ../test/$a $out/bin/bluez-$a done popd - wrapPythonProgramsIn $out/test "$out/test $pythonPath" + wrapPythonProgramsIn $test/test "$test/test $pythonPath" # for bluez4 compatibility for NixOS mkdir $out/sbin diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix index 19cbdecca0c..2298cbd13c5 100644 --- a/pkgs/os-specific/linux/firmware/zd1211/default.nix +++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix @@ -11,9 +11,12 @@ stdenv.mkDerivation rec { sha256 = "04ibs0qw8bh6h6zmm5iz6lddgknwhsjq8ib3gyck6a7psw83h7gi"; }; - buildPhase = "true"; + dontBuild = true; - installPhase = "mkdir -p $out/lib/firmware/zd1211; cp * $out/lib/firmware/zd1211"; + installPhase = '' + mkdir -p $out/lib/firmware/zd1211 + cp * $out/lib/firmware/zd1211 + ''; meta = { description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip"; diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix index cb74dc204a3..e2257642d0b 100644 --- a/pkgs/os-specific/linux/pm-utils/default.nix +++ b/pkgs/os-specific/linux/pm-utils/default.nix @@ -6,7 +6,7 @@ let binPath = stdenv.lib.makeBinPath [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ]; - sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"] + sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin" [ procps ]; in diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 17b21f92c17..476f3ffcac6 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { sha256 = "0k46z5gqjzg702m2vs4sv6sxynq1sj14m0pgwvl2gkgg3dfbyjhn"; }; + outputs = [ "dev" "out" ]; + configureFlags = [ "--enable-libv4l" ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [ @@ -36,15 +38,15 @@ stdenv.mkDerivation rec { "--disable-qv4l2" ]); - postInstall = '' + postFixup = '' # Create symlink for V4l1 compatibility - ln -s $out/include/libv4l1-videodev.h $out/include/videodev.h + ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h" ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ alsaLib libX11 qt4 qt5 ]; - + propagatedBuildInputs = [ libjpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 9436f4bf300..fd8a009b167 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -11,15 +11,14 @@ stdenv.mkDerivation rec { sha256 = "1i6va44bx2zfgbld7znf1slph0iqidlahq2xh3kd8q4lhvbrjn02"; }; - patches = - [ # log to systemd journal - ./log-stdout.patch - ]; + patches = [ + # log to systemd journal + ./log-stdout.patch + ]; - postPatch = - '' - substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid - ''; + postPatch = '' + substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid + ''; buildInputs = [ perl makeWrapper glibc ] ++ (with perlPackages; [ @@ -37,7 +36,8 @@ stdenv.mkDerivation rec { DBDmysql ]); - buildPhase = "true"; + dontBuild = true; + installPhase = '' mkdir -p $out/bin $out/usr mv Linode $out diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix index 77b7c6d4f26..4bb111e1893 100644 --- a/pkgs/servers/rt/default.nix +++ b/pkgs/servers/rt/default.nix @@ -7,7 +7,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz"; - sha256 = "1hgz50fxv9zdcngww083aqh8vzyk148lm7mcivxflpnsqfw3696x"; }; @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir $out diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix index 443dafef55c..0e27211a060 100644 --- a/pkgs/servers/sql/monetdb/default.nix +++ b/pkgs/servers/sql/monetdb/default.nix @@ -25,15 +25,14 @@ composableDerivation.composableDerivation {} { javaSupport = true; }; - configurePhase = ":"; - buildPhase = ":"; - + dontBuild = true; + installPhase = '' mkdir $TMP/build sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery ''; - meta = { + meta = { description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval"; homepage = http://monetdb.cwi.nl/; license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a0405ec077f..a19f479bf2e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -265,6 +265,7 @@ in }; xcbutilcursor = attrs: attrs // { + outputs = [ "dev" "out" ]; meta.maintainers = [ stdenv.lib.maintainers.lovek323 ]; }; diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index db0c446617a..16a4aeb1ce5 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -98,9 +98,13 @@ let }; in stdenv.mkDerivation { name = "xquartz"; + buildInputs = [ ruby makeWrapper ]; + unpackPhase = "sourceRoot=."; - buildPhase = ":"; + + dontBuild = true; + installPhase = '' cp -rT ${xorg.xinit} $out chmod -R u+w $out @@ -179,6 +183,7 @@ in stdenv.mkDerivation { --replace "@DEFAULT_CLIENT@" "${xterm}/bin/xterm" \ --replace "@FONTCONFIG_FILE@" "$fontsConfPath" ''; + meta = with lib; { platforms = platforms.darwin; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 2fa229692eb..49d149eb183 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { inherit sha256; }; - outputs = if (!interactive) # conditional to avoid mass rebuild ATM - then [ "out" "doc" ] - else [ "out" "doc" "info" ]; + outputs = [ "out" "doc" "info" ]; # the man pages are small and useful enough outputMan = if interactive then "out" else null; diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 561dcc7fdfd..40f26dc2450 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -62,7 +62,7 @@ rec { cp -d ${openssl.out}/lib/*.dylib $out/lib cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib - cp -d ${libiconv.lib or libiconv}/lib/lib*.dylib $out/lib + cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib cp -d ${gettext}/lib/libintl*.dylib $out/lib chmod +x $out/lib/libintl*.dylib cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e01be369f42..b2891030728 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -229,7 +229,7 @@ let # include it in the result, it *is* available to nix-env for queries. meta = { } # If the packager hasn't specified `outputsToInstall`, choose a default, - # namely `p.bin or p.out or p`; + # which is the name of `p.bin or p.out or p`; # if he has specified it, it will be overridden below in `// meta`. # Note: This default probably shouldn't be globally configurable. # Services and users should specify outputs explicitly, diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 9399ff7a764..a183aabed0e 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -408,6 +408,11 @@ substitute() { if [ "$p" = --subst-var ]; then varName="${params[$((n + 1))]}" + # check if the used nix attribute name is a valid bash name + if ! [[ "$varName" =~ ^[a-zA-Z_]+[a-zA-Z0-9_]*$ ]]; then + echo "substitution variables must be valid bash names, \"$varName\" isn't." + exit 1; + fi pattern="@$varName@" replacement="${!varName}" n=$((n + 1)) @@ -439,7 +444,8 @@ substituteAll() { local output="$2" # Select all environment variables that start with a lowercase character. - for envVar in $(env | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do + # Will not work with nix attribute names (and thus env variables) containing '\n'. + for envVar in $(set | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do if [ "$NIX_DEBUG" = "1" ]; then echo "$envVar -> ${!envVar}" fi diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix index c74814ae197..56da02cc8d0 100644 --- a/pkgs/tools/admin/sec/default.nix +++ b/pkgs/tools/admin/sec/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ perl ]; - configurePhase = ":"; - buildPhase = ":"; + dontBuild = false; + doCheck = false; + installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp sec $out/bin cp sec.man $out/share/man/man1/sec.1 ''; - doCheck = false; meta = { homepage = "http://simple-evcorr.sourceforge.net/"; @@ -26,5 +26,4 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.tv ]; platforms = stdenv.lib.platforms.all; }; - } diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index cf09ec8bf73..31a67b1baf9 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gzip-${version}"; - version = "1.7"; + version = "1.8"; src = fetchurl { url = "mirror://gnu/gzip/${name}.tar.xz"; - sha256 = "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv"; + sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz"; }; outputs = [ "out" "man" "info" ]; diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix index 19457e13655..ad237e408c6 100644 --- a/pkgs/tools/filesystems/ceph/generic.nix +++ b/pkgs/tools/filesystems/ceph/generic.nix @@ -267,7 +267,7 @@ stdenv.mkDerivation { # Fix .la file link dependencies find "$lib/lib" -name \*.la | xargs sed -i \ - -e 's,-lboost_[a-z]*,-L${boost.lib}/lib \0,g' \ + -e 's,-lboost_[a-z]*,-L${boost.out}/lib \0,g' \ '' + optionalString (cryptoStr == "cryptopp") '' -e 's,-lcryptopp,-L${optCryptopp}/lib \0,g' \ '' + optionalString (cryptoStr == "nss") '' diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 556cb674212..bbd4b185d5e 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { export ANT_HOME=${ant} export BOOST_INCLUDEDIR=${boost.dev}/include - export BOOST_LIBRARYDIR=${boost.lib}/lib + export BOOST_LIBRARYDIR=${boost.out}/lib export OPENSSL_ROOT_DIR=${openssl} substituteInPlace cpp/cmake/FindValgrind.cmake \ diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 632f46f81e9..690043791b2 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -23,7 +23,7 @@ let for prog in ibus ibus-daemon ibus-setup; do wrapProgram "$out/bin/$prog" \ - --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ + --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix index 4af6475668e..d60b47ca011 100644 --- a/pkgs/tools/misc/debootstrap/default.nix +++ b/pkgs/tools/misc/debootstrap/default.nix @@ -1,11 +1,8 @@ { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }: let - # USAGE like this: debootstrap sid /tmp/target-chroot-directory - # There is also cdebootstrap now. Is that easier to maintain? - makedev = stdenv.mkDerivation { name = "makedev-for-debootstrap"; src = fetchurl { @@ -27,11 +24,7 @@ let chmod +x $t ''; }; - -in - -stdenv.mkDerivation rec { - +in stdenv.mkDerivation rec { name = "debootstrap-${version}"; version = "1.0.80"; @@ -44,14 +37,13 @@ stdenv.mkDerivation rec { buildInputs = [ dpkg gettext gawk perl ]; - buildPhase = ":"; + dontBuild = true; # If you have to update the patch for functions a vim regex like this # can help you identify which lines are used to write scripts on TARGET and # which should /bin/ paths should be replaced: # \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END installPhase = '' - sed -i \ -e 's@/usr/bin/id@id@' \ -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \ @@ -59,7 +51,6 @@ stdenv.mkDerivation rec { -e 's@/bin/sha@${coreutils}/bin/sha@' \ debootstrap - for file in functions debootstrap; do substituteInPlace "$file" \ --subst-var-by gunzip "$(type -p gunzip)" \ @@ -103,7 +94,7 @@ stdenv.mkDerivation rec { inherit makedev; }; - meta = { + meta = { description = "Tool to create a Debian system in a chroot"; homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap license = stdenv.lib.licenses.gpl2; # gentoo says so.. ? diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index afdca314ae6..ecc8f1908de 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; + outputs = [ "dev" "out" ]; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 3e8f3ca3dc5..f8a8b6393d2 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -5,33 +5,34 @@ stdenv.mkDerivation rec { name = "swec-0.4"; src = fetchurl { - url = "http://random.zerodogg.org/files/${name}.tar.bz2"; + url = "http://files.zerodogg.org/swec/${name}.tar.bz2"; sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; buildInputs = [ makeWrapper perl LWP URI HTMLParser ] ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; - configurePhase = - '' for i in swec tests/{runTests,testServer} - do - sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' - done - ''; - - buildPhase = "true"; - installPhase = - '' make install prefix="$out" - - mkdir -p "$out/share/${name}" - cp -v default.sdf "$out/share/${name}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" - - wrapProgram "$out/bin/swec" \ - --prefix PERL5LIB : \ - ${stdenv.lib.concatStringsSep ":" - (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} - ''; + configurePhase = '' + for i in swec tests/{runTests,testServer} + do + sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' + done + ''; + + dontBuild = true; + + installPhase = '' + make install prefix="$out" + + mkdir -p "$out/share/${name}" + cp -v default.sdf "$out/share/${name}" + sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" + + wrapProgram "$out/bin/swec" \ + --prefix PERL5LIB : \ + ${stdenv.lib.concatStringsSep ":" + (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} + ''; doCheck = true; checkPhase = "make test"; diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index e8670770c5f..8dfc9e6333e 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -14,18 +14,17 @@ stdenv.mkDerivation { buildInputs = [ nix readline ]; - buildPhase = "true"; + dontBuild = true; # FIXME: unfortunate cut&paste. - installPhase = - '' - mkdir -p $out/bin - $CXX -O3 -Wall -std=c++0x \ - -o $out/bin/nix-repl nix-repl.cc \ - -I${nix}/include/nix \ - -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ - -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" - ''; + installPhase = '' + mkdir -p $out/bin + $CXX -O3 -Wall -std=c++0x \ + -o $out/bin/nix-repl nix-repl.cc \ + -I${nix}/include/nix \ + -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ + -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" + ''; meta = { homepage = https://github.com/edolstra/nix-repl; diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix index 332576a9873..3a20fdc0fac 100644 --- a/pkgs/tools/package-management/nix-serve/default.nix +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -15,21 +15,20 @@ stdenv.mkDerivation rec { buildInputs = [ perl nix ] ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]); - buildPhase = "true"; + dontBuild = false; # FIXME: unfortunate cut&paste. - installPhase = - '' - mkdir -p $out/libexec/nix-serve - cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi - - mkdir -p $out/bin - cat > $out/bin/nix-serve <<EOF - #! ${stdenv.shell} - PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" - EOF - chmod +x $out/bin/nix-serve - ''; + installPhase = '' + mkdir -p $out/libexec/nix-serve + cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi + + mkdir -p $out/bin + cat > $out/bin/nix-serve <<EOF + #! ${stdenv.shell} + PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@" + EOF + chmod +x $out/bin/nix-serve + ''; meta = { homepage = https://github.com/edolstra/nix-serve; diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix index ae9b3be9ee2..c81a01ef896 100644 --- a/pkgs/tools/security/pius/default.nix +++ b/pkgs/tools/security/pius/default.nix @@ -12,19 +12,19 @@ stdenv.mkDerivation { buildInputs = [ python ]; - patchPhase = - '' sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g' - ''; + patchPhase = '' + sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g' + ''; - buildPhase = "true"; + dontBuild = true; - installPhase = - '' mkdir -p "$out/bin" - cp -v pius "$out/bin" + installPhase = '' + mkdir -p "$out/bin" + cp -v pius "$out/bin" - mkdir -p "$out/doc/pius-${version}" - cp -v README "$out/doc/pius-${version}" - ''; + mkdir -p "$out/doc/pius-${version}" + cp -v README "$out/doc/pius-${version}" + ''; meta = { homepage = http://www.phildev.net/pius/; diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index d618f842a4a..3e714871827 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pcre, libiconv, perl }: -let version = "2.22"; in +let version = "2.25"; in stdenv.mkDerivation { name = "gnugrep-${version}"; src = fetchurl { url = "mirror://gnu/grep/grep-${version}.tar.xz"; - sha256 = "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa"; + sha256 = "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2"; }; # Perl is needed for testing diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index d5530a3df91..5015a220afb 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ boost ]; - configureFlags = [ "--with-boost=${boost.lib}" ]; + configureFlags = [ "--with-boost=${boost.out}" ]; enableParallelBuilding = false; diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix index 000584a50e1..c76e0f49734 100644 --- a/pkgs/tools/text/xidel/default.nix +++ b/pkgs/tools/text/xidel/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { dpkg-deb -x ${src} ./ ''; - buildPhase = "true"; + dontBuild = true; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index e2b59bdb115..b7ff365fad5 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { mimeType = "text/xml"; }; - # We're using a pre-built package - configurePhase = "true"; - buildPhase = "true"; + dontBuild = true; + installPhase = '' mkdir -p "$out" cp -r * "$out" diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix index da029639c3d..c19447cc0c4 100644 --- a/pkgs/tools/typesetting/pygmentex/default.nix +++ b/pkgs/tools/typesetting/pygmentex/default.nix @@ -11,12 +11,11 @@ python2Packages.buildPythonApplication rec { pythonPath = [ python2Packages.pygments python2Packages.chardet ]; - buildPhase = ":"; - + dontBuild = true; + doCheck = false; - + installPhase = '' - mkdir -p $out/bin cp -a pygmentex.py $out/bin ''; diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index 18f9c99ee24..0aab900f150 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { done ''; - buildPhase = "true"; + dontBuild = true; installPhase = '' python ./setup.py install --prefix="$out" --use-python-path --verbose diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index a26513d9f26..5e84a92cadd 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -8,11 +8,13 @@ stdenv.mkDerivation { sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; }; - buildPhase = "true"; + dontBuild = true; + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { branch = "1"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 821357e7273..05e28454be1 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -8,12 +8,13 @@ stdenv.mkDerivation { sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; - buildPhase = "true"; + dontBuild = true; installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { branch = "2"; }; diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 32c73c4a43c..b8df977cfb0 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -17,12 +17,13 @@ stdenv.mkDerivation { unzip $src ''; - buildPhase = "true"; + dontBuild = true; installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { branch = "3"; }; diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix index 67739350c6f..d7c03967b0b 100644 --- a/pkgs/tools/typesetting/tex/pgfplots/default.nix +++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix @@ -2,17 +2,18 @@ stdenv.mkDerivation { name = "pgfplots-1.5.1"; + src = fetchurl { url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip; sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi"; }; - + buildInputs = [ unzip ]; - + unpackPhase = "unzip $src"; - - buildPhase = "true"; - + + dontBuild = true; + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 266313c81e1..8c228a0fd2d 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -44,6 +44,7 @@ doNotDisplayTwice rec { firefox-wrapper = firefox; # 2016-01 firefoxWrapper = firefox; # 2015-09 fuse_exfat = exfat; # 2015-09-11 + fuse_zip = fuse-zip; # added 2016-04-27 gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 grantlee5 = qt5.grantlee; # added 2015-12-19 @@ -67,8 +68,6 @@ doNotDisplayTwice rec { mupen64plus1_5 = mupen64plus; # added 2016-02-12 ncat = nmap; # added 2016-01-26 nfsUtils = nfs-utils; # added 2014-12-06 - phonon_qt5 = qt5.phonon; # added 2015-12-19 - phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 pidginlatexSF = pidginlatex; # added 2014-11-02 poppler_qt5 = qt5.poppler; # added 2015-12-19 qca-qt5 = qt5.qca-qt5; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2c5d47ca7e..acf03896cc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1580,7 +1580,7 @@ in fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; - fuse_zip = callPackage ../tools/filesystems/fuse-zip { }; + fuse-zip = callPackage ../tools/filesystems/fuse-zip { }; exfat = callPackage ../tools/filesystems/exfat { }; @@ -8506,9 +8506,9 @@ in phonon = callPackage ../development/libraries/phonon {}; - phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {}; + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; - phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {}; + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {}; physfs = callPackage ../development/libraries/physfs { }; @@ -8647,12 +8647,6 @@ in openbr = callPackage ../development/libraries/openbr { }; - phonon = callPackage ../development/libraries/phonon { }; - - phonon-backend-gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { }; - - phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { }; - polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -15581,8 +15575,13 @@ in kile = callPackage ../applications/editors/kile/frameworks.nix { }; - konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { - }; + konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { }; + + phonon = callPackage ../development/libraries/phonon { }; + + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; + + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { monolithic = true; @@ -15626,25 +15625,9 @@ in kde5 = let - frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; }; - plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; }; - applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; }; - merged = self: - { plasma = plasma self; - frameworks = frameworks self; - applications = applications self; } - // frameworks self - // plasma self - // applications self - // kde5PackagesFun self; - in - recurseIntoAttrs (lib.makeScope qt55.newScope merged); - - kde5_latest = - let - frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; }; - plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; }; - applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; }; + frameworks = import ../desktops/kde-5/frameworks-5.21 { inherit pkgs; }; + plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; }; + applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; }; merged = self: { plasma = plasma self; frameworks = frameworks self; |