From 21a8c9e30197e1f3ef54150560093140531cc1f2 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 27 Jun 2018 13:09:45 -0700 Subject: [PATCH 01/79] cmrt: init at 1.0.6 --- pkgs/development/libraries/cmrt/default.nix | 24 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/cmrt/default.nix diff --git a/pkgs/development/libraries/cmrt/default.nix b/pkgs/development/libraries/cmrt/default.nix new file mode 100644 index 000000000000..8044d7165f75 --- /dev/null +++ b/pkgs/development/libraries/cmrt/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libdrm, libva }: + +stdenv.mkDerivation rec { + name = "cmrt-${version}"; + version = "1.0.6"; + + src = fetchurl { + url = "https://github.com/intel/cmrt/archive/${version}.tar.gz"; + sha256 = "1q7651nvvcqhph5rgfhklm71zqd0c405mrh3wx0cfzvil82yj8na"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ libdrm libva ]; + + meta = with stdenv.lib; { + homepage = https://01.org/linuxmedia; + description = "Intel C for Media Runtime"; + longDescription = "Media GPU kernel manager for Intel G45 & HD Graphics family"; + license = licenses.mit; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 536951081661..71bd6c598097 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8837,6 +8837,8 @@ with pkgs; cmocka = callPackage ../development/libraries/cmocka { }; + cmrt = callPackage ../development/libraries/cmrt { }; + cogl = callPackage ../development/libraries/cogl { }; coin3d = callPackage ../development/libraries/coin3d { }; From 87130a5b9e5c6b8530dda1a5c73960c4ba2e230a Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 27 Jun 2018 13:10:04 -0700 Subject: [PATCH 02/79] vaapi-intel-hybrid: init at 1.0.2 --- .../libraries/vaapi-intel-hybrid/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/vaapi-intel-hybrid/default.nix diff --git a/pkgs/development/libraries/vaapi-intel-hybrid/default.nix b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix new file mode 100644 index 000000000000..56ded2c56447 --- /dev/null +++ b/pkgs/development/libraries/vaapi-intel-hybrid/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, autoreconfHook, pkgconfig, cmrt, libdrm, libva, libX11, libGL, wayland }: + +stdenv.mkDerivation rec { + name = "intel-hybrid-driver-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "https://github.com/01org/intel-hybrid-driver/archive/${version}.tar.gz"; + sha256 = "0ywdhbvzwzzrq4qhylnw1wc8l3j67h26l0cs1rncwhw05s3ndk8n"; + }; + + patches = [ + # driver_init: load libva-x11.so for any ABI version + (fetchurl { + url = https://github.com/01org/intel-hybrid-driver/pull/26.diff; + sha256 = "1ql4mbi5x1d2a5c8mkjvciaq60zj8nhx912992winbhfkyvpb3gx"; + }) + ]; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ cmrt libdrm libva libX11 libGL wayland ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--enable-drm" + "--enable-x11" + "--enable-wayland" + ]; + + postPatch = '' + patchShebangs ./src/shaders/gpp.py + ''; + + preConfigure = '' + sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure + ''; + + meta = with stdenv.lib; { + homepage = https://01.org/linuxmedia; + description = "Intel driver for the VAAPI library with partial HW acceleration"; + license = licenses.mit; + maintainers = with maintainers; [ tadfisher ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71bd6c598097..c5e40654168e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12010,6 +12010,8 @@ with pkgs; vaapiIntel = callPackage ../development/libraries/vaapi-intel { }; + vaapi-intel-hybrid = callPackage ../development/libraries/vaapi-intel-hybrid { }; + vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { }; vale = callPackage ../tools/text/vale { }; From d2935b93e6a36973c698d5340b0d3e174721e192 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Wed, 27 Jun 2018 13:15:52 -0700 Subject: [PATCH 03/79] vaapiIntel: add enableHybridCodec option --- .../libraries/vaapi-intel/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 4e729db4671e..ba763e334905 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 , intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext +, enableHybridCodec ? false, vaapi-intel-hybrid }: stdenv.mkDerivation rec { @@ -7,8 +8,8 @@ stdenv.mkDerivation rec { inherit (libva) version; src = fetchFromGitHub { - owner = "01org"; - repo = "libva-intel-driver"; + owner = "intel"; + repo = "intel-vaapi-driver"; rev = version; sha256 = "15ag4al9h6b8f8sw1zpighyhsmr5qfqp1882q7r3gsh5g4cnj763"; }; @@ -21,20 +22,25 @@ stdenv.mkDerivation rec { sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure ''; + postInstall = stdenv.lib.optionalString enableHybridCodec '' + ln -s ${vaapi-intel-hybrid}/lib/dri/* $out/lib/dri/ + ''; + configureFlags = [ "--enable-drm" "--enable-x11" "--enable-wayland" - ]; + ] ++ stdenv.lib.optional enableHybridCodec "--enable-hybrid-codec"; nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]; + buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ] + ++ stdenv.lib.optional enableHybridCodec vaapi-intel-hybrid; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://cgit.freedesktop.org/vaapi/intel-driver/; + homepage = https://01.org/linuxmedia; license = licenses.mit; description = "Intel driver for the VAAPI library"; platforms = platforms.unix; From 3d60ae61e7f19522c609d74d761e9df3377f8514 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 16 Jul 2018 15:36:59 +0200 Subject: [PATCH 04/79] mac: init at 4.11-u4-b5-s7 --- pkgs/development/libraries/mac/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/mac/default.nix diff --git a/pkgs/development/libraries/mac/default.nix b/pkgs/development/libraries/mac/default.nix new file mode 100644 index 000000000000..8a8a004a5e69 --- /dev/null +++ b/pkgs/development/libraries/mac/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, fetchpatch, yasm }: + +stdenv.mkDerivation rec { + name = "mac-${version}"; + version = "4.11-u4-b5-s7"; + + src = fetchurl { + url = "https://www.deb-multimedia.org/pool/main/m/monkeys-audio/monkeys-audio_${version}.orig.tar.gz"; + sha256 = "16i96cw5r3xbsivjigqp15vv32wa38k86mxq11qx1pzmpryqpqkk"; + }; + + patches = [ + (fetchpatch { + name = "mac-4.11.4.5.7-gcc6.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-gcc6.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4"; + sha256 = "093b8m8p8s6dmc62fc8vb4hlmjc2ncb4rdgc82g0a8gg6w5kcj8x"; + }) + (fetchpatch { + name = "mac-4.11.4.5.7-output.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-sound/mac/files/mac-4.11.4.5.7-output.patch?id=1bd4e0e30e4d8a8862217d7067323851b34c7fe4"; + sha256 = "0njmwj6d9jqi4pz4fax02w37gk22vda0grszrs2nn97zzmjl36zk"; + }) + ]; + + CXXFLAGS = "-DSHNTOOL"; + + nativeBuildInputs = [ yasm ]; + + meta = with stdenv.lib; { + description = "APE codec and decompressor"; + homepage = http://www.deb-multimedia.org/dists/testing/main/binary-amd64/package/monkeys-audio.php; + license = licenses.unfreeRedistributable; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0e4bfd40435..6ed76a3a7139 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17119,6 +17119,8 @@ with pkgs; lyx = libsForQt5.callPackage ../applications/misc/lyx { }; + mac = callPackage ../development/libraries/mac { }; + magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; From 8063e596d11b3f5d1551c130409dae6b2d6cbb50 Mon Sep 17 00:00:00 2001 From: Johannes Frankenau Date: Mon, 16 Jul 2018 15:39:42 +0200 Subject: [PATCH 05/79] split2flac: init at 122 --- .../applications/audio/split2flac/default.nix | 62 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/audio/split2flac/default.nix diff --git a/pkgs/applications/audio/split2flac/default.nix b/pkgs/applications/audio/split2flac/default.nix new file mode 100644 index 000000000000..372e507ed0e9 --- /dev/null +++ b/pkgs/applications/audio/split2flac/default.nix @@ -0,0 +1,62 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, shntool, cuetools +, flac, faac, mp4v2, wavpack, mac +, imagemagick, libiconv, enca, lame, pythonPackages, vorbis-tools +, aacgain, mp3gain, vorbisgain +}: + +let + wrapSplit2flac = format: '' + makeWrapper $out/bin/.split2flac-wrapped $out/bin/split2${format} \ + --set SPLIT2FLAC_FORMAT ${format} \ + --prefix PATH : ${stdenv.lib.makeBinPath [ + shntool cuetools + flac faac mp4v2 wavpack mac + imagemagick libiconv enca lame pythonPackages.mutagen vorbis-tools + aacgain mp3gain vorbisgain + ]} + ''; + +in stdenv.mkDerivation rec { + name = "split2flac-${version}"; + version = "122"; + + src = fetchFromGitHub { + owner = "ftrvxmtrx"; + repo = "split2flac"; + rev = version; + sha256 = "1a71amamip25hhqx7wwzfcl3d5snry9xsiha0kw73iq2m83r2k63"; + }; + + dontBuild = true; + + nativeBuildInputs = [ makeWrapper ]; + + patchPhase = '' + substituteInPlace split2flac \ + --replace 'FORMAT="''${0##*split2}"' 'FORMAT=''${SPLIT2FLAC_FORMAT:-flac}' + ''; + + installPhase = '' + mkdir -p $out/share/bash-completion/completions + cp split2flac-bash-completion.sh \ + $out/share/bash-completion/completions/split2flac-bash-completion.sh + + mkdir -p $out/bin + cp split2flac $out/bin/.split2flac-wrapped + + ${wrapSplit2flac "flac"} + ${wrapSplit2flac "mp3"} + ${wrapSplit2flac "ogg"} + ${wrapSplit2flac "m4a"} + ${wrapSplit2flac "wav"} + ''; + + meta = with stdenv.lib; { + description = "Split flac/ape/wv/wav + cue sheet into separate tracks"; + homepage = https://github.com/ftrvxmtrx/split2flac; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ jfrankenau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ed76a3a7139..0771c7998b0e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18201,6 +18201,8 @@ with pkgs; spideroak = callPackage ../applications/networking/spideroak { }; + split2flac = callPackage ../applications/audio/split2flac { }; + squishyball = callPackage ../applications/audio/squishyball { ncurses = ncurses5; }; From 51412bbdde9b1866e9f59731c870b67b95822a79 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Jul 2018 11:33:13 -0700 Subject: [PATCH 06/79] lensfun: 0.3.2 -> 0.3.95 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/lensfun/versions. --- pkgs/development/libraries/lensfun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lensfun/default.nix b/pkgs/development/libraries/lensfun/default.nix index 5791b0808b4a..1c0fb1df34fa 100644 --- a/pkgs/development/libraries/lensfun/default.nix +++ b/pkgs/development/libraries/lensfun/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, python, glib, zlib, libpng, gnumake3, cmake }: stdenv.mkDerivation rec { - version = "0.3.2"; + version = "0.3.95"; name = "lensfun-${version}"; src = fetchurl { url = "mirror://sourceforge/lensfun/${version}/${name}.tar.gz"; - sha256 = "0cfk8jjhs9nbfjfdy98plrj9ayi59aph0nx6ppslgjhlcvacm2xf"; + sha256 = "0218f3xrlln0jmh4gcf1zbpvi2bidgl3b2mblf6c810n7j1rrhl2"; }; nativeBuildInputs = [ pkgconfig ]; From f644675bc9fc54c490f015fe57905a0eeb4b46bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:40:54 +0100 Subject: [PATCH 07/79] elasticsearch: drop 1.7.2 (not supported upstream) --- pkgs/servers/search/elasticsearch/default.nix | 40 ------------------- .../search/elasticsearch/es-home.patch | 37 ----------------- 2 files changed, 77 deletions(-) delete mode 100644 pkgs/servers/search/elasticsearch/default.nix delete mode 100644 pkgs/servers/search/elasticsearch/es-home.patch diff --git a/pkgs/servers/search/elasticsearch/default.nix b/pkgs/servers/search/elasticsearch/default.nix deleted file mode 100644 index f4780603f502..000000000000 --- a/pkgs/servers/search/elasticsearch/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "elasticsearch-1.7.2"; - - src = fetchurl { - url = "https://download.elastic.co/elasticsearch/elasticsearch/${name}.tar.gz"; - sha256 = "1lix4asvx1lbc227gzsrws3xqbcbqaal7v10w60kch0c4xg970bg"; - }; - - patches = [ ./es-home.patch ]; - - buildInputs = [ makeWrapper jre utillinux ]; - - installPhase = '' - mkdir -p $out - cp -R bin config lib $out - - # don't want to have binary with name plugin - mv $out/bin/plugin $out/bin/elasticsearch-plugin - - # set ES_CLASSPATH and JAVA_HOME - wrapProgram $out/bin/elasticsearch \ - --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - --prefix PATH : "${utillinux}/bin" \ - --set JAVA_HOME "${jre}" - wrapProgram $out/bin/elasticsearch-plugin \ - --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*":"$out/lib/sigar/*" \ - --set JAVA_HOME "${jre}" - ''; - - meta = { - description = "Open Source, Distributed, RESTful Search Engine"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.offline ]; - }; -} diff --git a/pkgs/servers/search/elasticsearch/es-home.patch b/pkgs/servers/search/elasticsearch/es-home.patch deleted file mode 100644 index 2f2018fd69fa..000000000000 --- a/pkgs/servers/search/elasticsearch/es-home.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2015-08-05 17:52:05.740819671 +0200 -+++ b/bin/elasticsearch 2015-08-05 17:22:34.664657364 +0200 -@@ -83,7 +83,10 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -diff -rupN a/bin/plugin b/bin/plugin ---- a/bin/plugin 2015-08-05 17:57:07.903088815 +0200 -+++ b/bin/plugin 2015-08-05 17:57:38.979808139 +0200 -@@ -16,7 +16,10 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -@@ -105,4 +105,4 @@ - - export HOSTNAME=`hostname -s` - --eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home=\""$ES_HOME"\" $properties -cp \""$ES_HOME/lib/*"\" org.elasticsearch.plugins.PluginManager $args -\ No newline at end of file -+eval "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_CLASSPATH/lib/*" org.elasticsearch.plugins.PluginManager $args From bedf471a089adb1b12d483f8d3672bb4070ebab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:42:53 +0100 Subject: [PATCH 08/79] elasticsearch6: new default version --- nixos/modules/services/search/elasticsearch.nix | 4 ++-- .../servers/search/elasticsearch/{6.x.nix => default.nix} | 0 pkgs/top-level/all-packages.nix | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) rename pkgs/servers/search/elasticsearch/{6.x.nix => default.nix} (100%) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index b0831dcd1ca8..5af82e01d21f 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -58,8 +58,8 @@ in { package = mkOption { description = "Elasticsearch package to use."; - default = pkgs.elasticsearch2; - defaultText = "pkgs.elasticsearch2"; + default = pkgs.elasticsearch; + defaultText = "pkgs.elasticsearch"; type = types.package; }; diff --git a/pkgs/servers/search/elasticsearch/6.x.nix b/pkgs/servers/search/elasticsearch/default.nix similarity index 100% rename from pkgs/servers/search/elasticsearch/6.x.nix rename to pkgs/servers/search/elasticsearch/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa555153e572..5db219dbcddf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2272,13 +2272,15 @@ with pkgs; elk5Version = "5.6.9"; elk6Version = "6.3.2"; - elasticsearch = callPackage ../servers/search/elasticsearch { }; elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; - elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix { }; - elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix { + + elasticsearch6 = callPackage ../servers/search/elasticsearch { }; + elasticsearch6-oss = callPackage ../servers/search/elasticsearch { enableUnfree = false; }; + elasticsearch = elasticsearch6; + elasticsearch-oss = elasticsearch6-oss; elasticsearchPlugins = recurseIntoAttrs ( callPackage ../servers/search/elasticsearch/plugins.nix { } From 1b2b62ba79b453dc648362cd2f6cc51e5a9a3ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:43:37 +0100 Subject: [PATCH 09/79] elasticsearch2: drop unsupported version --- pkgs/servers/search/elasticsearch/2.x.nix | 40 ------------------- .../elasticsearch/es-classpath-2.x.patch | 38 ------------------ .../search/elasticsearch/es-home-2.x.patch | 31 -------------- pkgs/top-level/all-packages.nix | 2 - 4 files changed, 111 deletions(-) delete mode 100644 pkgs/servers/search/elasticsearch/2.x.nix delete mode 100644 pkgs/servers/search/elasticsearch/es-classpath-2.x.patch delete mode 100644 pkgs/servers/search/elasticsearch/es-home-2.x.patch diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix deleted file mode 100644 index 28244d1b3dcd..000000000000 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, utillinux }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - version = "2.4.4"; - name = "elasticsearch-${version}"; - - src = fetchurl { - url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; - sha256 = "1qjq04sfqb35pf2xpvr8j5p27chfxpjp8ymrp1h5bfk5rbk9444q"; - }; - - patches = [ ./es-home-2.x.patch ./es-classpath-2.x.patch ]; - - buildInputs = [ makeWrapper jre utillinux ]; - - installPhase = '' - mkdir -p $out - cp -R bin config lib modules $out - - # don't want to have binary with name plugin - mv $out/bin/plugin $out/bin/elasticsearch-plugin - wrapProgram $out/bin/elasticsearch \ - --prefix ES_CLASSPATH : "$out/lib/${name}.jar":"$out/lib/*" \ - --prefix PATH : "${utillinux}/bin" \ - --set JAVA_HOME "${jre}" - wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}" - ''; - - meta = { - description = "Open Source, Distributed, RESTful Search Engine"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ - maintainers.offline - maintainers.markWot - ]; - }; -} diff --git a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch b/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch deleted file mode 100644 index 46a3f0be71b7..000000000000 --- a/pkgs/servers/search/elasticsearch/es-classpath-2.x.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2017-02-08 18:32:28.000298543 -0500 -+++ b/bin/elasticsearch 2017-02-08 19:10:45.692916675 -0500 -@@ -81,12 +81,7 @@ ES_HOME=`cd "$ES_HOME"; pwd` - # If an include wasn't specified in the environment, then search for one... - if [ "x$ES_INCLUDE" = "x" ]; then - # Locations (in order) to use when searching for an include file. -- for include in /usr/share/elasticsearch/elasticsearch.in.sh \ -- /usr/local/share/elasticsearch/elasticsearch.in.sh \ -- /opt/elasticsearch/elasticsearch.in.sh \ -- ~/.elasticsearch.in.sh \ -- "$ES_HOME/bin/elasticsearch.in.sh" \ -- "`dirname "$0"`"/elasticsearch.in.sh; do -+ for include in "`dirname "$0"`"/elasticsearch.in.sh; do - if [ -r "$include" ]; then - . "$include" - break -diff -rupN a/bin/elasticsearch.in.sh b/bin/elasticsearch.in.sh ---- a/bin/elasticsearch.in.sh 2017-02-08 18:32:28.000298543 -0500 -+++ b/bin/elasticsearch.in.sh 2017-02-08 18:33:46.816634599 -0500 -@@ -1,17 +1,5 @@ - #!/bin/sh - --# check in case a user was using this mechanism --if [ "x$ES_CLASSPATH" != "x" ]; then -- cat >&2 << EOF --Error: Don't modify the classpath with ES_CLASSPATH. Best is to add --additional elements via the plugin mechanism, or if code must really be --added to the main classpath, add jars to lib/ (unsupported). --EOF -- exit 1 --fi -- --ES_CLASSPATH="$ES_HOME/lib/elasticsearch-2.4.4.jar:$ES_HOME/lib/*" -- - if [ "x$ES_MIN_MEM" = "x" ]; then - ES_MIN_MEM=256m - fi diff --git a/pkgs/servers/search/elasticsearch/es-home-2.x.patch b/pkgs/servers/search/elasticsearch/es-home-2.x.patch deleted file mode 100644 index 0c80e8651145..000000000000 --- a/pkgs/servers/search/elasticsearch/es-home-2.x.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -rupN a/bin/elasticsearch b/bin/elasticsearch ---- a/bin/elasticsearch 2015-11-18 21:48:18.000000000 +0100 -+++ b/bin/elasticsearch 2015-12-04 00:52:21.032475098 +0100 -@@ -72,7 +72,11 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+ -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` -diff -rupN a/bin/plugin b/bin/plugin ---- a/bin/plugin 2015-11-18 21:48:18.000000000 +0100 -+++ b/bin/plugin 2015-12-04 00:52:55.947453619 +0100 -@@ -17,7 +17,10 @@ while [ -h "$SCRIPT" ] ; do - done - - # determine elasticsearch home --ES_HOME=`dirname "$SCRIPT"`/.. -+if [ -z "$ES_HOME" ]; then -+ echo "You must set the ES_HOME var" >&2 -+ exit 1 -+fi - - # make ELASTICSEARCH_HOME absolute - ES_HOME=`cd "$ES_HOME"; pwd` diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5db219dbcddf..6753ab584ab5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2272,9 +2272,7 @@ with pkgs; elk5Version = "5.6.9"; elk6Version = "6.3.2"; - elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { }; elasticsearch5 = callPackage ../servers/search/elasticsearch/5.x.nix { }; - elasticsearch6 = callPackage ../servers/search/elasticsearch { }; elasticsearch6-oss = callPackage ../servers/search/elasticsearch { enableUnfree = false; From cba348c561f970482e4c3f792b2f72f78a83f46b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:44:19 +0100 Subject: [PATCH 10/79] elasticsearchPlugins: updated for elasticsearch6 --- pkgs/servers/search/elasticsearch/plugins.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index b93d8c2203d7..b810d5e865b5 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, stdenv, fetchurl, unzip, elasticsearch }: +{ pkgs, stdenv, fetchurl, unzip, elasticsearch-oss, javaPackages, elk6Version }: with pkgs.lib; @@ -6,8 +6,9 @@ let esPlugin = a@{ pluginName, installPhase ? '' - mkdir -p $out/bin - ES_HOME=$out ${elasticsearch}/bin/elasticsearch-plugin --install ${pluginName} --url file://$src + mkdir -p $out/config + mkdir -p $out/plugins + ES_HOME=$out ${elasticsearch-oss}/bin/elasticsearch-plugin install --batch -v file://$src '', ... }: @@ -16,7 +17,7 @@ let unpackPhase = "true"; buildInputs = [ unzip ]; meta = a.meta // { - platforms = elasticsearch.meta.platforms; + platforms = elasticsearch-oss.meta.platforms; maintainers = (a.meta.maintainers or []) ++ [ maintainers.offline ]; }; }); From fa26b59091f56958236e8d0540bd76789e10b259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:48:25 +0100 Subject: [PATCH 11/79] elasticsearchPlugins.{river_jdbc,river_twitter}: remove River plugins are no longer supported in elasticsearch. --- pkgs/servers/search/elasticsearch/plugins.nix | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index b810d5e865b5..8b1bad7768d4 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -22,20 +22,6 @@ let }; }); in { - elasticsearch_river_jdbc = esPlugin rec { - name = "elasticsearch-river-jdbc-${version}"; - pluginName = "elasticsearch-river-jdbc"; - version = "1.5.0.5"; - src = fetchurl { - url = "http://xbib.org/repository/org/xbib/elasticsearch/plugin/elasticsearch-river-jdbc/${version}/${name}-plugin.zip"; - sha256 = "1p75l3vcnb90ar4j3dci2xf8dqnqyy31kc1r075fa2xqlsxgigcp"; - }; - meta = { - homepage = https://github.com/jprante/elasticsearch-river-jdbc; - description = "Plugin to fetch data from JDBC sources for indexing into Elasticsearch"; - license = licenses.asl20; - }; - }; elasticsearch_analysis_lemmagen = esPlugin rec { name = "elasticsearch-analysis-lemmagen-${version}"; @@ -72,26 +58,6 @@ in { }; }; - elasticsearch_river_twitter = esPlugin rec { - name = pname + "-" + version; - pname = "elasticsearch-river-twitter"; - pluginName = "elasticsearch/" + pname + "/" + version; - version = "2.5.0"; - - src = fetchurl { - url = "http://download.elasticsearch.org/elasticsearch/${pname}/${name}.zip"; - sha256 = "0851yrmyrpp6whyxk34ykcj7b28f90w0nvkrhvl49dwqgr5s4mn4"; - }; - - meta = { - homepage = https://github.com/elasticsearch/elasticsearch-river-twitter; - description = "Twitter River Plugin for ElasticSearch"; - license = licenses.asl20; - maintainers = [ maintainers.edwtjo ]; - platforms = elasticsearch.meta.platforms; - }; - }; - elasticsearch_kopf = esPlugin rec { name = "elasticsearch-kopf-${version}"; pluginName = "elasticsearch-kopf"; From 5d3b75ab5d5bd21584096f32769c933ed9dbc2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:51:40 +0100 Subject: [PATCH 12/79] elasticsearchPlugins.elasticsearch_http_basic: remove Deprecated by upstream, search_guard was recommended instead. --- pkgs/servers/search/elasticsearch/plugins.nix | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 8b1bad7768d4..f44e1a4e640a 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -38,25 +38,6 @@ in { }; }; - elasticsearch_http_basic = stdenv.mkDerivation rec { - name = "elasticsearch-http-basic-${version}"; - version = "1.5.0"; - - src = fetchurl { - url = "https://github.com/Asquera/elasticsearch-http-basic/releases/download/v${version}/${name}.jar"; - sha256 = "0fif6sbn2ich39lrgm039y9d5bxkylx9pvly04wss8rdhspvdskb"; - }; - - phases = ["installPhase"]; - installPhase = "install -D $src $out/plugins/http-basic/${name}.jar"; - - meta = { - homepage = https://github.com/Asquera/elasticsearch-http-basic; - description = "HTTP Basic Authentication for Elasticsearch"; - license = licenses.mit; - platforms = elasticsearch.meta.platforms; - }; - }; elasticsearch_kopf = esPlugin rec { name = "elasticsearch-kopf-${version}"; From 0bbf90e1b466e503f616bdaa94b9810bad695459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:53:01 +0100 Subject: [PATCH 13/79] elasticsearchPlugins.elasticsearch_kopf: remove deprecated by upstream, https://github.com/lmenezes/cerebro is recommend instead (but not packaged in nixpkgs) --- pkgs/servers/search/elasticsearch/plugins.nix | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index f44e1a4e640a..b7791e1c0470 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -39,21 +39,6 @@ in { }; - elasticsearch_kopf = esPlugin rec { - name = "elasticsearch-kopf-${version}"; - pluginName = "elasticsearch-kopf"; - version = "2.1.1"; - src = fetchurl { - url = "https://github.com/lmenezes/elasticsearch-kopf/archive/v${version}.zip"; - sha256 = "1nwwd92g0jxhfpkxb1a9z5a62naa1y7hvlx400dm6mwwav3mrf4v"; - }; - meta = { - homepage = https://github.com/lmenezes/elasticsearch-kopf; - description = "Web administration tool for ElasticSearch"; - license = licenses.mit; - }; - }; - search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; pluginName = "search-guard"; From dab5fd5f567933d03313909f810e0b608397ea18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:54:28 +0100 Subject: [PATCH 14/79] elasticsearchPlugins.elasticsearch_analysis_lemmagen: 0.1 -> 6.3.2 --- pkgs/servers/search/elasticsearch/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index b7791e1c0470..51f18c213bf7 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -26,10 +26,10 @@ in { elasticsearch_analysis_lemmagen = esPlugin rec { name = "elasticsearch-analysis-lemmagen-${version}"; pluginName = "elasticsearch-analysis-lemmagen"; - version = "0.1"; + version = "${elk6Version}"; src = fetchurl { url = "https://github.com/vhyza/elasticsearch-analysis-lemmagen/releases/download/v${version}/${name}-plugin.zip"; - sha256 = "bf7bf5ce3ccdd3afecd0e18cd6fce1ef56f824e41f4ef50553ae598caa5c366d"; + sha256 = "1m4z05wixjrq4nlbdjyhvprkrwxjym8aba18scmzfn25fhbjgvkz"; }; meta = { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; From 19fb8c7c6c7cb6f9acf4add346ad93f8ba783042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 09:55:22 +0100 Subject: [PATCH 15/79] elasticsarchPlugins.search_guard: 0.5 -> 6.3.2-22.3 --- pkgs/servers/search/elasticsearch/plugins.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 51f18c213bf7..fa0f9b32ce95 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -42,10 +42,10 @@ in { search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; pluginName = "search-guard"; - version = "0.5"; - src = fetchurl { - url = "https://github.com/floragunncom/search-guard/releases/download/v${version}/${pluginName}-${version}.zip"; - sha256 = "1zima4jmq1rrcqxhlrp2xian80vp244d2splby015n5cgqrp39fl"; + version = "${elk6Version}-22.3"; + src = fetchurl rec { + url = "mirror://maven/com/floragunn/search-guard-6/${version}/search-guard-6-${version}.zip"; + sha256 = "1r71h4h9bmxak1mq5gpm19xq5ji1gry1kp3sjmm8azy4ykdqdncx"; }; meta = { homepage = https://github.com/floragunncom/search-guard; From 806ab02d95deea9c302865b786893116dcfb6d17 Mon Sep 17 00:00:00 2001 From: David Smith Date: Fri, 3 Aug 2018 09:58:42 +0100 Subject: [PATCH 16/79] elasticsearchPlugins.discovery-ec2: init at 6.3.2 --- pkgs/servers/search/elasticsearch/plugins.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index fa0f9b32ce95..b3141ee807d1 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -38,6 +38,20 @@ in { }; }; + discovery-ec2 = esPlugin { + name = "elasticsearch-discovery-ec2-${version}"; + pluginName = "discovery-ec2"; + version = "${elk6Version}"; + src = pkgs.fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/discovery-ec2/discovery-ec2-${elk6Version}.zip"; + sha256 = "1i7ksy69132sr84h51lamgq967yz3a3dw0b54nckxpqwad9pcpj0"; + }; + meta = { + homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; + description = "The EC2 discovery plugin uses the AWS API for unicast discovery."; + license = licenses.asl20; + }; + }; search_guard = esPlugin rec { name = "elastic-search-guard-${version}"; From cd6279020155ce96bf2611526b96591ad179a70b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 11:09:50 +0100 Subject: [PATCH 17/79] nixos/elasticsearch: remove es5 version guard --- .../modules/services/search/elasticsearch.nix | 53 ++++++------------- 1 file changed, 16 insertions(+), 37 deletions(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 5af82e01d21f..2c7e21a20b51 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -5,22 +5,14 @@ with lib; let cfg = config.services.elasticsearch; - es5 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "5" >= 0; es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0; esConfig = '' network.host: ${cfg.listenAddress} cluster.name: ${cfg.cluster_name} - ${if es5 then '' - http.port: ${toString cfg.port} - transport.tcp.port: ${toString cfg.tcp_port} - '' else '' - network.port: ${toString cfg.port} - network.tcp.port: ${toString cfg.tcp_port} - # TODO: find a way to enable security manager - security.manager.enabled: false - ''} + http.port: ${toString cfg.port} + transport.tcp.port: ${toString cfg.tcp_port} ${cfg.extraConf} ''; @@ -32,7 +24,7 @@ let text = esConfig; }; - loggingConfigFilename = if es5 then "log4j2.properties" else "logging.yml"; + loggingConfigFilename = "log4j2.properties"; loggingConfigFile = pkgs.writeTextFile { name = loggingConfigFilename; text = cfg.logging; @@ -41,8 +33,7 @@ let esPlugins = pkgs.buildEnv { name = "elasticsearch-plugins"; paths = cfg.plugins; - # Elasticsearch 5.x won't start when the plugins directory does not exist - postBuild = if es5 then "${pkgs.coreutils}/bin/mkdir -p $out/plugins" else ""; + postBuild = "${pkgs.coreutils}/bin/mkdir -p $out/plugins"; }; in { @@ -100,30 +91,18 @@ in { logging = mkOption { description = "Elasticsearch logging configuration."; - default = - if es5 then '' - logger.action.name = org.elasticsearch.action - logger.action.level = info + default = '' + logger.action.name = org.elasticsearch.action + logger.action.level = info - appender.console.type = Console - appender.console.name = console - appender.console.layout.type = PatternLayout - appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n + appender.console.type = Console + appender.console.name = console + appender.console.layout.type = PatternLayout + appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] %marker%m%n - rootLogger.level = info - rootLogger.appenderRef.console.ref = console - '' else '' - rootLogger: INFO, console - logger: - action: INFO - com.amazonaws: WARN - appender: - console: - type: console - layout: - type: consolePattern - conversionPattern: "[%d{ISO8601}][%-5p][%-25c] %m%n" - ''; + rootLogger.level = info + rootLogger.appenderRef.console.ref = console + ''; type = types.str; }; @@ -204,9 +183,9 @@ in { cp ${elasticsearchYml} ${configDir}/elasticsearch.yml # Make sure the logging configuration for old elasticsearch versions is removed: - rm -f ${if es5 then "${configDir}/logging.yml" else "${configDir}/log4j2.properties"} + rm -f "${configDir}/logging.yml" cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename} - ${optionalString es5 "mkdir -p ${configDir}/scripts"} + mkdir -p ${configDir}/scripts ${optionalString es6 "cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options"} if [ "$(id -u)" = 0 ]; then chown -R elasticsearch:elasticsearch ${cfg.dataDir}; fi From 13db07a092a05f1f692c1f3429fced80d2904526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 11:23:56 +0100 Subject: [PATCH 18/79] logstash: update default version to v6 --- nixos/modules/rename.nix | 1 + nixos/modules/services/logging/logstash.nix | 41 ++-------------- pkgs/tools/misc/logstash/6.x.nix | 53 --------------------- pkgs/tools/misc/logstash/default.nix | 33 ++++++++----- pkgs/top-level/all-packages.nix | 6 +-- 5 files changed, 31 insertions(+), 103 deletions(-) delete mode 100644 pkgs/tools/misc/logstash/6.x.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 40f66ccb26b2..fe395c4256bd 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -257,6 +257,7 @@ with lib; (mkRemovedOptionModule [ "fonts" "fontconfig" "forceAutohint" ] "") (mkRemovedOptionModule [ "fonts" "fontconfig" "renderMonoTTFAsBitmap" ] "") (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") + (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index 28d89a7463ab..aa019d855ea9 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -4,25 +4,12 @@ with lib; let cfg = config.services.logstash; - atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; pluginPath = lib.concatStringsSep ":" cfg.plugins; havePluginPath = lib.length cfg.plugins > 0; ops = lib.optionalString; - verbosityFlag = - if atLeast54 - then "--log.level " + cfg.logLevel - else { - debug = "--debug"; - info = "--verbose"; - warn = ""; # intentionally empty - error = "--quiet"; - fatal = "--silent"; - }."${cfg.logLevel}"; + verbosityFlag = "--log.level " + cfg.logLevel; - pluginsPath = - if atLeast54 - then "--path.plugins ${pluginPath}" - else "--pluginpath ${pluginPath}"; + pluginsPath = "--path.plugins ${pluginPath}"; logstashConf = pkgs.writeText "logstash.conf" '' input { @@ -63,7 +50,7 @@ in type = types.package; default = pkgs.logstash; defaultText = "pkgs.logstash"; - example = literalExample "pkgs.logstash"; + example = literalExample "pkgs.logstash5"; description = "Logstash package to use."; }; @@ -95,12 +82,6 @@ in description = "The quantity of filter workers to run."; }; - enableWeb = mkOption { - type = types.bool; - default = false; - description = "Enable the logstash web interface."; - }; - listenAddress = mkOption { type = types.str; default = "127.0.0.1"; @@ -174,16 +155,6 @@ in ###### implementation config = mkIf cfg.enable { - assertions = [ - { assertion = atLeast54 -> !cfg.enableWeb; - message = '' - The logstash web interface is only available for versions older than 5.4. - So either set services.logstash.enableWeb = false, - or set services.logstash.package to an older logstash. - ''; - } - ]; - systemd.services.logstash = with pkgs; { description = "Logstash Daemon"; wantedBy = [ "multi-user.target" ]; @@ -193,14 +164,12 @@ in ExecStartPre = ''${pkgs.coreutils}/bin/mkdir -p "${cfg.dataDir}" ; ${pkgs.coreutils}/bin/chmod 700 "${cfg.dataDir}"''; ExecStart = concatStringsSep " " (filter (s: stringLength s != 0) [ "${cfg.package}/bin/logstash" - (ops (!atLeast54) "agent") "-w ${toString cfg.filterWorkers}" (ops havePluginPath pluginsPath) "${verbosityFlag}" "-f ${logstashConf}" - (ops atLeast54 "--path.settings ${logstashSettingsDir}") - (ops atLeast54 "--path.data ${cfg.dataDir}") - (ops cfg.enableWeb "-- web -a ${cfg.listenAddress} -p ${cfg.port}") + "--path.settings ${logstashSettingsDir}" + "--path.data ${cfg.dataDir}" ]); }; }; diff --git a/pkgs/tools/misc/logstash/6.x.nix b/pkgs/tools/misc/logstash/6.x.nix deleted file mode 100644 index 4f15ba90d39d..000000000000 --- a/pkgs/tools/misc/logstash/6.x.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, stdenv -, fetchurl -, makeWrapper -, jre -}: - -with stdenv.lib; - -stdenv.mkDerivation rec { - version = elk6Version; - name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; - sha256 = - if enableUnfree - then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr" - else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w"; - }; - - dontBuild = true; - dontPatchELF = true; - dontStrip = true; - dontPatchShebangs = true; - - buildInputs = [ - makeWrapper jre - ]; - - installPhase = '' - mkdir -p $out - cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out - - patchShebangs $out/bin/logstash - patchShebangs $out/bin/logstash-plugin - - wrapProgram $out/bin/logstash \ - --set JAVA_HOME "${jre}" - - wrapProgram $out/bin/logstash-plugin \ - --set JAVA_HOME "${jre}" - ''; - - meta = with stdenv.lib; { - description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; - homepage = https://www.elastic.co/products/logstash; - license = if enableUnfree then licenses.elastic else licenses.asl20; - platforms = platforms.unix; - maintainers = with maintainers; [ wjlroe offline basvandijk ]; - }; -} diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index 079e5c7a93bf..4f15ba90d39d 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,12 +1,23 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ elk6Version +, enableUnfree ? true +, stdenv +, fetchurl +, makeWrapper +, jre +}: + +with stdenv.lib; stdenv.mkDerivation rec { - version = "2.4.0"; - name = "logstash-${version}"; + version = elk6Version; + name = "logstash-${optionalString (!enableUnfree) "oss-"}${version}"; src = fetchurl { - url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; - sha256 = "1k27hb6q1r26rp3y9pb2ry92kicw83mi352dzl2y4h0gbif46b32"; + url = "https://artifacts.elastic.co/downloads/logstash/${name}.tar.gz"; + sha256 = + if enableUnfree + then "0yx9hpiav4d5z1b52x2h5i0iknqs9lmxy8vmz0wkb23mjiz8njdr" + else "1ir8pbq706mxr56k5cgc9ajn2jp603zrqj66dimx6xxf2nfamw0w"; }; dontBuild = true; @@ -20,14 +31,14 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out - cp -r {Gemfile*,vendor,lib,bin} $out + cp -r {Gemfile*,modules,vendor,lib,bin,config,data,logstash-core,logstash-core-plugin-api} $out + + patchShebangs $out/bin/logstash + patchShebangs $out/bin/logstash-plugin wrapProgram $out/bin/logstash \ --set JAVA_HOME "${jre}" - wrapProgram $out/bin/rspec \ - --set JAVA_HOME "${jre}" - wrapProgram $out/bin/logstash-plugin \ --set JAVA_HOME "${jre}" ''; @@ -35,8 +46,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems"; homepage = https://www.elastic.co/products/logstash; - license = licenses.asl20; + license = if enableUnfree then licenses.elastic else licenses.asl20; platforms = platforms.unix; - maintainers = [ maintainers.wjlroe maintainers.offline ]; + maintainers = with maintainers; [ wjlroe offline basvandijk ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6753ab584ab5..e44799b99845 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3468,12 +3468,12 @@ with pkgs; lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; - logstash = callPackage ../tools/misc/logstash { }; logstash5 = callPackage ../tools/misc/logstash/5.x.nix { }; - logstash6 = callPackage ../tools/misc/logstash/6.x.nix { }; - logstash6-oss = callPackage ../tools/misc/logstash/6.x.nix { + logstash6 = callPackage ../tools/misc/logstash { }; + logstash6-oss = callPackage ../tools/misc/logstash { enableUnfree = false; }; + logstash = logstash6; logstash-contrib = callPackage ../tools/misc/logstash/contrib.nix { }; From c3055ab3ce6eeed037d0a396432cc90748d734b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 11:24:38 +0100 Subject: [PATCH 19/79] kibana: update default version to v6 --- nixos/modules/services/search/kibana.nix | 38 +--------- pkgs/development/tools/misc/kibana/6.x.nix | 75 ------------------- .../development/tools/misc/kibana/default.nix | 60 +++++++++++---- pkgs/top-level/all-packages.nix | 7 +- 4 files changed, 50 insertions(+), 130 deletions(-) delete mode 100644 pkgs/development/tools/misc/kibana/6.x.nix diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 5885a72c6628..ca36bba58c02 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -5,43 +5,7 @@ with lib; let cfg = config.services.kibana; - atLeast54 = versionAtLeast (builtins.parseDrvName cfg.package.name).version "5.4"; - - cfgFile = if atLeast54 then cfgFile5 else cfgFile4; - - cfgFile4 = pkgs.writeText "kibana.json" (builtins.toJSON ( - (filterAttrsRecursive (n: v: v != null) ({ - host = cfg.listenAddress; - port = cfg.port; - ssl_cert_file = cfg.cert; - ssl_key_file = cfg.key; - - kibana_index = cfg.index; - default_app_id = cfg.defaultAppId; - - elasticsearch_url = cfg.elasticsearch.url; - kibana_elasticsearch_username = cfg.elasticsearch.username; - kibana_elasticsearch_password = cfg.elasticsearch.password; - kibana_elasticsearch_cert = cfg.elasticsearch.cert; - kibana_elasticsearch_key = cfg.elasticsearch.key; - ca = cfg.elasticsearch.ca; - - bundled_plugin_ids = [ - "plugins/dashboard/index" - "plugins/discover/index" - "plugins/doc/index" - "plugins/kibana/index" - "plugins/markdown_vis/index" - "plugins/metric_vis/index" - "plugins/settings/index" - "plugins/table_vis/index" - "plugins/vis_types/index" - "plugins/visualize/index" - ]; - } // cfg.extraConf) - ))); - - cfgFile5 = pkgs.writeText "kibana.json" (builtins.toJSON ( + cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON ( (filterAttrsRecursive (n: v: v != null) ({ server.host = cfg.listenAddress; server.port = cfg.port; diff --git a/pkgs/development/tools/misc/kibana/6.x.nix b/pkgs/development/tools/misc/kibana/6.x.nix deleted file mode 100644 index 1fd52f435574..000000000000 --- a/pkgs/development/tools/misc/kibana/6.x.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ elk6Version -, enableUnfree ? true -, stdenv -, makeWrapper -, fetchzip -, fetchurl -, nodejs -, coreutils -, which -}: - -with stdenv.lib; -let - inherit (builtins) elemAt; - info = splitString "-" stdenv.system; - arch = elemAt info 0; - plat = elemAt info 1; - shas = - if enableUnfree - then { - "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0"; - "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3"; - } - else { - "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly"; - "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b"; - }; - - # For the correct phantomjs version see: - # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js - phantomjs = rec { - name = "phantomjs-${version}-linux-x86_64"; - version = "2.1.1"; - src = fetchzip { - inherit name; - url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; - }; - }; - -in stdenv.mkDerivation rec { - name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; - version = elk6Version; - - src = fetchurl { - url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; - sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); - }; - - buildInputs = [ makeWrapper ]; - - installPhase = '' - mkdir -p $out/libexec/kibana $out/bin - mv * $out/libexec/kibana/ - rm -r $out/libexec/kibana/node - makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ - --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" - sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana - '' + - # phantomjs is needed in the unfree version. When phantomjs doesn't exist in - # $out/libexec/kibana/data kibana will try to download and unpack it during - # runtime which will fail because the nix store is read-only. So we make sure - # it already exist in the nix store. - optionalString enableUnfree '' - ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} - ''; - - meta = { - description = "Visualize logs and time-stamped data"; - homepage = http://www.elasticsearch.org/overview/kibana; - license = if enableUnfree then licenses.elastic else licenses.asl20; - maintainers = with maintainers; [ offline rickynils basvandijk ]; - platforms = with platforms; unix; - }; -} diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index fc1ac9323387..1fd52f435574 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,26 +1,49 @@ -{ stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }: +{ elk6Version +, enableUnfree ? true +, stdenv +, makeWrapper +, fetchzip +, fetchurl +, nodejs +, coreutils +, which +}: with stdenv.lib; let inherit (builtins) elemAt; - archOverrides = { - "i686" = "x86"; - }; info = splitString "-" stdenv.system; - arch = (elemAt info 0); - elasticArch = archOverrides."${arch}" or arch; + arch = elemAt info 0; plat = elemAt info 1; - shas = { - "x86_64-linux" = "1wnnrhhpgc58s09p99cmi8r2jmwsd5lmh2inb0k8nmizz5v1sjz0"; - "i686-linux" = "0sdx59jlfrf7r9793xpn2vxaxjdczgn3qfw8yny03dcs6fjaxi2y"; - "x86_64-darwin" = "0rmp536kn001g52lxngpj6x6d0j3qj0r11d4djbz7h6s5ml03kza"; + shas = + if enableUnfree + then { + "x86_64-linux" = "1kk97ggpzmblhqm6cfd2sv5940f58h323xcyg6rba1njj7lzanv0"; + "x86_64-darwin" = "1xvwffk8d8br92h0laf4b1m76kvki6cj0pbgcvirfcj1r70vk6c3"; + } + else { + "x86_64-linux" = "0m81ki1v61gpwb3s6zf84azqrirlm9pdfx65g3xmvdp3d3wii5ly"; + "x86_64-darwin" = "0zh9p6vsq1d0gh6ks7z6bh8sbhn6rm4jshjcfp3c9k7n2qa8vv9b"; + }; + + # For the correct phantomjs version see: + # https://github.com/elastic/kibana/blob/master/x-pack/plugins/reporting/server/browsers/phantom/paths.js + phantomjs = rec { + name = "phantomjs-${version}-linux-x86_64"; + version = "2.1.1"; + src = fetchzip { + inherit name; + url = "https://github.com/Medium/phantomjs/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "0g2dqjzr2daz6rkd6shj6rrlw55z4167vqh7bxadl8jl6jk7zbfv"; + }; }; + in stdenv.mkDerivation rec { - name = "kibana-${version}"; - version = "4.6.5"; + name = "kibana-${optionalString (!enableUnfree) "oss-"}${version}"; + version = elk6Version; src = fetchurl { - url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + url = "https://artifacts.elastic.co/downloads/kibana/${name}-${plat}-${arch}.tar.gz"; sha256 = shas."${stdenv.system}" or (throw "Unknown architecture"); }; @@ -33,13 +56,20 @@ in stdenv.mkDerivation rec { makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \ --prefix PATH : "${stdenv.lib.makeBinPath [ nodejs coreutils which ]}" sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana + '' + + # phantomjs is needed in the unfree version. When phantomjs doesn't exist in + # $out/libexec/kibana/data kibana will try to download and unpack it during + # runtime which will fail because the nix store is read-only. So we make sure + # it already exist in the nix store. + optionalString enableUnfree '' + ln -s ${phantomjs.src} $out/libexec/kibana/data/${phantomjs.name} ''; meta = { description = "Visualize logs and time-stamped data"; homepage = http://www.elasticsearch.org/overview/kibana; - license = licenses.asl20; - maintainers = with maintainers; [ offline rickynils ]; + license = if enableUnfree then licenses.elastic else licenses.asl20; + maintainers = with maintainers; [ offline rickynils basvandijk ]; platforms = with platforms; unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e44799b99845..5d1f4d347b32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3386,12 +3386,13 @@ with pkgs; keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; - kibana = callPackage ../development/tools/misc/kibana { }; kibana5 = callPackage ../development/tools/misc/kibana/5.x.nix { }; - kibana6 = callPackage ../development/tools/misc/kibana/6.x.nix { }; - kibana6-oss = callPackage ../development/tools/misc/kibana/6.x.nix { + kibana6 = callPackage ../development/tools/misc/kibana/default.nix { }; + kibana6-oss = callPackage ../development/tools/misc/kibana/default.nix { enableUnfree = false; }; + kibana = kibana6; + kibana-oss = kibana6-oss; kismet = callPackage ../applications/networking/sniffers/kismet { }; From d50253237e015bd93c5e777cf5b4b4c886f91bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 11:45:06 +0100 Subject: [PATCH 20/79] beats: upgrade default from v5 to v6 --- pkgs/misc/logging/beats/5.x.nix | 8 ++++---- pkgs/misc/logging/beats/6.x.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 24 ++++++++++++------------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/pkgs/misc/logging/beats/5.x.nix b/pkgs/misc/logging/beats/5.x.nix index 94d5449100db..e92613025ff9 100644 --- a/pkgs/misc/logging/beats/5.x.nix +++ b/pkgs/misc/logging/beats/5.x.nix @@ -23,10 +23,10 @@ let beat = package : extraArgs : buildGoPackage (rec { }; } // extraArgs); in { - filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; - packetbeat = beat "packetbeat" { + filebeat5 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat5 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat5 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat5 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.description = "Network packet analyzer that ships data to Elasticsearch"; meta.longDescription = '' diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index 111bc449d888..59d7379e06c0 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -23,10 +23,10 @@ let beat = package : extraArgs : buildGoPackage (rec { }; } // extraArgs); in { - filebeat = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; - heartbeat = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; - metricbeat = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; - packetbeat = beat "packetbeat" { + filebeat6 = beat "filebeat" {meta.description = "Lightweight shipper for logfiles";}; + heartbeat6 = beat "heartbeat" {meta.description = "Lightweight shipper for uptime monitoring";}; + metricbeat6 = beat "metricbeat" {meta.description = "Lightweight shipper for metrics";}; + packetbeat6 = beat "packetbeat" { buildInputs = [ libpcap ]; meta.description = "Network packet analyzer that ships data to Elasticsearch"; meta.longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d1f4d347b32..100a299b2ba8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -841,23 +841,23 @@ with pkgs; bchunk = callPackage ../tools/cd-dvd/bchunk { }; - inherit (callPackages ../misc/logging/beats/5.x.nix { }) - filebeat - heartbeat - metricbeat - packetbeat; - - inherit (let beats6 = callPackages ../misc/logging/beats/6.x.nix { }; in { - filebeat6 = beats6.filebeat; - heartbeat6 = beats6.heartbeat; - metricbeat6 = beats6.metricbeat; - packetbeat6 = beats6.packetbeat; - }) + inherit (callPackages ../misc/logging/beats/6.x.nix { }) filebeat6 heartbeat6 metricbeat6 packetbeat6; + filebeat = filebeat6; + heartbeat = heartbeat6; + metricbeat = metricbeat6; + packetbeat = packetbeat6; + + inherit (callPackages ../misc/logging/beats/5.x.nix { }) + filebeat5 + heartbeat5 + metricbeat5 + packetbeat5; + bfr = callPackage ../tools/misc/bfr { }; bibtool = callPackage ../tools/misc/bibtool { }; From c9b41aa81f86e15169d948535002a4d7a10a8f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 3 Aug 2018 15:03:53 +0100 Subject: [PATCH 21/79] nixos/elasticsearch: fix evaluation on systems without unfree set --- nixos/modules/services/search/elasticsearch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 2c7e21a20b51..6b688c640d59 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.elasticsearch; - es6 = builtins.compareVersions (builtins.parseDrvName cfg.package.name).version "6" >= 0; + es6 = builtins.compareVersions cfg.package.version "6" >= 0; esConfig = '' network.host: ${cfg.listenAddress} From 3f889f30bee92c3f2d5eaf53e56aef68f61efc4a Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Fri, 3 Aug 2018 15:39:49 +0200 Subject: [PATCH 22/79] nixos/doc: mention the ELK changes in the 18.09 release notes --- nixos/doc/manual/release-notes/rl-1809.xml | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 33026c5cbaef..b6514f41c017 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -154,6 +154,39 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' which indicates that the nix output hash will be used as tag. + + + The ELK stack: elasticsearch, logstash and kibana + has been upgraded from 2.* to 6.3.*. + The 2.* versions have been unsupported since last year + so they have been removed. You can still use the 5.* versions under the names + elasticsearch5, logstash5 and + kibana5. + + + The elastic beats: + filebeat, heartbeat, + metricbeat and packetbeat + have had the same treatment: they now target 6.3.* as well. + The 5.* versions are available under the names: + filebeat5, heartbeat5, + metricbeat5 and packetbeat5 + + + The ELK-6.3 stack now comes with + X-Pack by default. + Since X-Pack is licensed under the + Elastic License + the ELK packages now have an unfree license. To use them you need to specify + allowUnfree = true; in your nixpkgs configuration. + + + Fortunately there is also a free variant of the ELK stack without X-Pack. + The packages are available under the names: + elasticsearch-oss, logstash-oss and + kibana-oss. + + From 341250fa10e07f50a2700fe18465bb91900c851d Mon Sep 17 00:00:00 2001 From: volth Date: Wed, 18 Jul 2018 14:28:48 +0000 Subject: [PATCH 23/79] qemu: 2.12.1 -> 3.0.0 --- nixos/lib/qemu-flags.nix | 8 ++++++-- nixos/tests/ec2.nix | 4 +++- pkgs/applications/virtualization/qemu/default.nix | 7 +++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index 6f61c64a832e..f115ca5ac000 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -1,11 +1,15 @@ # QEMU flags shared between various Nix expressions. { pkgs }: +let + zeroPad = n: if n < 10 then "0${toString n}" else toString n; +in + { qemuNICFlags = nic: net: machine: - [ "-net nic,vlan=${toString nic},macaddr=52:54:00:12:${toString net}:${toString machine},model=virtio" - "-net vde,vlan=${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" + [ "-device virtio-net-pci,netdev=vlan${toString nic},mac=52:54:00:12:${zeroPad net}:${zeroPad machine}" + "-netdev vde,id=vlan${toString nic},sock=$QEMU_VDE_SOCKET_${toString net}" ]; qemuSerialDevice = if pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64 then "ttyS0" diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index f585fa2ec237..8271747ccc63 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -68,7 +68,9 @@ let # again when it deletes link-local addresses.) Ideally we'd # turn off the DHCP server, but qemu does not have an option # to do that. - my $startCommand = "qemu-kvm -m 768 -net nic,vlan=0,model=virtio -net 'user,vlan=0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; + my $startCommand = "qemu-kvm -m 768"; + $startCommand .= " -device virtio-net-pci,netdev=vlan0"; + $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; $startCommand .= " -drive file=$diskImage,if=virtio,werror=report"; $startCommand .= " \$QEMU_OPTS"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1ff61129b0f9..f9058ef89b65 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -22,8 +22,6 @@ with stdenv.lib; let - version = "2.12.1"; - sha256 = "1jp5y56682bgpfjapagxjfrjdvqkal34pj9qzn6kj8fqaad80l21"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -36,6 +34,7 @@ let in stdenv.mkDerivation rec { + version = "3.0.0"; name = "qemu-" + stdenv.lib.optionalString xenSupport "xen-" + stdenv.lib.optionalString hostCpuOnly "host-cpu-only-" @@ -43,8 +42,8 @@ stdenv.mkDerivation rec { + version; src = fetchurl { - url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - inherit sha256; + url = "https://wiki.qemu.org/download/qemu-${version}.tar.bz2"; + sha256 = "1s7bm2xhcxbc9is0rg8xzwijx7azv67skq7mjc58spsgc2nn4glk"; }; buildInputs = From c40e9f94556e37d50f702437e369f27ca24c63b9 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 23 Aug 2018 00:23:36 +0200 Subject: [PATCH 24/79] wt3: 3.3.10 -> 3.3.11 --- pkgs/development/libraries/wt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 99f73add795a..52bf46db5c54 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -43,8 +43,8 @@ let }; in { wt3 = generic { - version = "3.3.10"; - sha256 = "1y25mhghgbgjgycpny0x4z95xn98q0wraab1c5gkwnay097bgwdy"; + version = "3.3.11"; + sha256 = "1s1bwg3s7brnspr9ya1vg5mr29dbvhf05s606fiv409b7ladqvxq"; }; wt4 = generic { From d0955316ee49d98e2a07e58981172d428aa5de0b Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 23 Aug 2018 00:23:52 +0200 Subject: [PATCH 25/79] wt4: 4.0.3 -> 4.0.4 --- pkgs/development/libraries/wt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wt/default.nix b/pkgs/development/libraries/wt/default.nix index 52bf46db5c54..aec64c9c33c6 100644 --- a/pkgs/development/libraries/wt/default.nix +++ b/pkgs/development/libraries/wt/default.nix @@ -48,7 +48,7 @@ in { }; wt4 = generic { - version = "4.0.3"; - sha256 = "01xch5dkpcanwhr515236wa9mdmnq2a2j13dn7smyhwzqgbpknsg"; + version = "4.0.4"; + sha256 = "17kq9fxc0xqx7q7kyryiph3mg0d3hnd3jw0rl55zvzfsdd71220w"; }; } From a77a1190d30b8453e43dd61ee560b89a9dac48b8 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 9 Aug 2018 12:08:43 -0400 Subject: [PATCH 26/79] nvidia_x11: 390.67 -> 390.77 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 6fcb28a985c8..16bab9979d03 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,11 +17,11 @@ in rec { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "390.67"; - sha256_32bit = "01c8fa80njyyr39c1pyf7ssmfq65ci8mapbs94fd6gnhwc7gfjkg"; - sha256_64bit = "0np6xj93fali2hss8xsdlmy5ykjgn4hx6mzjr8dpbdi0fhdcmwkd"; - settingsSha256 = "1wk4587czysnbj5yxijmv3bldcffzwp4yvfx133apsr31dqca0s7"; - persistencedSha256 = "1zia1r97lyj6fbmvsw4hv5qfcj84x3sz971m4430d8qyks2c4sdw"; + version = "390.77"; + sha256_32bit = "1yd313ghh2qbn07d5wbkshfwgkm4mh49vcqkydds3b3xk0mx4i8l"; + sha256_64bit = "10kjccrkdn360035lh985cadhwy6lk9xrw3wlmww2wqfaa25f775"; + settingsSha256 = "1wvxldpjkrx0ldjm5l6ycm6paxpcw89h0n6hfkznfkahkq7fwxdj"; + persistencedSha256 = "1gklmc0v17m018cwpdlzwdyd45y4sjvjhj8a3l44baygix5zn30f"; }; beta = stable; # not enough interest to maintain beta ATM From 77d49ae9a322e18683f5b6cbfc7b18c681eed8e8 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 23 Aug 2018 18:27:10 -0400 Subject: [PATCH 27/79] Revert "Merge #45509: nvidia_x11*: mark broken on 4.18" This reverts commit d5e2f91ec8411b3ca981698d53b12982c93533c5, reversing changes made to a850a140fbe57e68041806b5a36cb1319e96f21e. --- pkgs/os-specific/linux/nvidia-x11/generic.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index eeb5a3588e3f..0ededc08050d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -84,7 +84,6 @@ let platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ maintainers.vcunat ]; priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so" - broken = stdenv.lib.versionAtLeast kernel.version "4.18"; }; }; From 410a51747c541287102d1ae73d96c7f828d170f1 Mon Sep 17 00:00:00 2001 From: Uri Baghin Date: Fri, 24 Aug 2018 16:35:59 +1000 Subject: [PATCH 28/79] openjdk10: add darwin support --- .../compilers/openjdk/darwin/10.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 2 files changed, 62 insertions(+) create mode 100644 pkgs/development/compilers/openjdk/darwin/10.nix diff --git a/pkgs/development/compilers/openjdk/darwin/10.nix b/pkgs/development/compilers/openjdk/darwin/10.nix new file mode 100644 index 000000000000..95c96c345c2d --- /dev/null +++ b/pkgs/development/compilers/openjdk/darwin/10.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchurl, unzip, setJavaClassPath, freetype }: +let + jce-policies = fetchurl { + # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; + }; + + jdk = stdenv.mkDerivation { + name = "zulu10.1+11-jdk10"; + + src = fetchurl { + url = "https://cdn.azul.com/zulu/bin/zulu10.1+11-jdk10-macosx_x64.zip"; + sha256 = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; + curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/"; + }; + + buildInputs = [ unzip freetype ]; + + installPhase = '' + mkdir -p $out + mv * $out + + unzip ${jce-policies} + mv -f ZuluJCEPolicies/*.jar $out/lib/security/ + + # jni.h expects jni_md.h to be in the header search path. + ln -s $out/include/darwin/*_md.h $out/include/ + + if [ -f $out/LICENSE ]; then + install -D $out/LICENSE $out/share/zulu/LICENSE + rm $out/LICENSE + fi + ''; + + preFixup = '' + # Propagate the setJavaClassPath setup hook from the JRE so that + # any package that depends on the JRE has $CLASSPATH set up + # properly. + mkdir -p $out/nix-support + printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs + + install_name_tool -change /usr/X11/lib/libfreetype.6.dylib ${freetype}/lib/libfreetype.6.dylib $out/lib/libfontmanager.dylib + + # Set JAVA_HOME automatically. + cat <> $out/nix-support/setup-hook + if [ -z "\$JAVA_HOME" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + passthru = { + jre = jdk; + home = jdk; + }; + + meta.platforms = stdenv.lib.platforms.darwin; + + }; +in jdk diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34d5ae13dc77..3d2e1f701613 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6793,6 +6793,9 @@ with pkgs; }; openjdk10 = + if stdenv.isDarwin then + callPackage ../development/compilers/openjdk/darwin/10.nix { } + else callPackage ../development/compilers/openjdk/10.nix { inherit (gnome2) GConf gnome_vfs; }; From 713991132eb7b01f5732a301da4d377bafe32e8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 02:31:51 -0700 Subject: [PATCH 29/79] libtensorflow: 1.9.0 -> 1.10.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libtensorflow/versions. --- pkgs/development/libraries/libtensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index e6cd140c4e4b..2bc83b31423a 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -31,7 +31,7 @@ let in stdenv.mkDerivation rec { pname = "libtensorflow"; - version = "1.9.0"; + version = "1.10.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://storage.googleapis.com/tensorflow/${pname}/${pname}-${tfType}-${system}-${version}.tar.gz"; @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { if system == "linux-x86_64" then if cudaSupport then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" - else "0l9ps115ng5ffzdwphlqmj3jhidps2v5afppdzrbpzmy41xz0z21" + else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb" else if system == "darwin-x86_64" then if cudaSupport then unavailable From e01c61347e5f5ab030f907a2aaf38d593765b754 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Wed, 15 Aug 2018 17:38:47 +0100 Subject: [PATCH 30/79] qtwebengine: Use system ffmpeg on aarch64 On aarch64, linking against the vendored ffmpeg fails. Including ffmpeg as a dependency and passing -system-ffmpeg to qmake fixes this. Slightly odd conditional in qmakeFlags to avoid altering the list on non-arm platforms, so that the change doesn't trigger an unneccessary rebuild. --- pkgs/development/libraries/qt-5/modules/qtwebengine.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index dc5f2ae96b3e..757d5b662e28 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -13,6 +13,7 @@ , systemd , enableProprietaryCodecs ? true , gn, darwin, openbsm +, ffmpeg ? null , lib, stdenv # lib.optional, needsPax }: @@ -117,7 +118,9 @@ EOF fi ''; - qmakeFlags = optional enableProprietaryCodecs "-- -proprietary-codecs"; + qmakeFlags = if stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 + then [ "--" "-system-ffmpeg" ] ++ optional enableProprietaryCodecs "-proprietary-codecs" + else optional enableProprietaryCodecs "-- -proprietary-codecs"; propagatedBuildInputs = [ # Image formats @@ -133,6 +136,8 @@ EOF harfbuzz icu libevent + ] ++ optionals stdenv.hostPlatform.isArm [ + ffmpeg ] ++ optionals (!stdenv.isDarwin) [ dbus zlib minizip snappy nss protobuf jsoncpp From 6e1709734ede37066ea3654a69503f5d631f5834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Mon, 20 Aug 2018 13:44:05 +0200 Subject: [PATCH 31/79] kde-applications: 18.04.03 -> 18.08.0 --- pkgs/applications/kde/default.nix | 2 + pkgs/applications/kde/dolphin.nix | 4 + pkgs/applications/kde/eventviews.nix | 6 +- pkgs/applications/kde/fetch.sh | 2 +- .../grantlee-merge-theme-dirs.patch | 164 +- pkgs/applications/kde/kdepim-addons.nix | 6 +- pkgs/applications/kde/kitinerary.nix | 19 + pkgs/applications/kde/kleopatra.nix | 4 +- pkgs/applications/kde/kmailtransport.nix | 6 +- pkgs/applications/kde/kpkpass.nix | 15 + pkgs/applications/kde/libkgapi.nix | 5 +- pkgs/applications/kde/srcs.nix | 1712 +++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 13 files changed, 1006 insertions(+), 941 deletions(-) create mode 100644 pkgs/applications/kde/kitinerary.nix create mode 100644 pkgs/applications/kde/kpkpass.nix diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index d839a7141e3b..295760bad51b 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -112,6 +112,7 @@ let kidentitymanagement = callPackage ./kidentitymanagement.nix {}; kig = callPackage ./kig.nix {}; kimap = callPackage ./kimap.nix {}; + kitinerary = callPackage ./kitinerary.nix {}; kio-extras = callPackage ./kio-extras.nix {}; kldap = callPackage ./kldap.nix {}; kleopatra = callPackage ./kleopatra.nix {}; @@ -131,6 +132,7 @@ let kpimtextedit = callPackage ./kpimtextedit.nix {}; ksmtp = callPackage ./ksmtp {}; kqtquickcharts = callPackage ./kqtquickcharts.nix {}; + kpkpass = callPackage ./kpkpass.nix {}; krdc = callPackage ./krdc.nix {}; krfb = callPackage ./krfb.nix {}; kruler = callPackage ./kruler.nix {}; diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix index 6a4635c26fb3..dcc797743035 100644 --- a/pkgs/applications/kde/dolphin.nix +++ b/pkgs/applications/kde/dolphin.nix @@ -21,4 +21,8 @@ mkDerivation { phonon solid ]; outputs = [ "out" "dev" ]; + # We need the RPATH for linking, because the `libkdeinit5_dolphin.so` links + # private against its dependencies and without the correct RPATH, these + # dependencies are not found. + cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; } diff --git a/pkgs/applications/kde/eventviews.nix b/pkgs/applications/kde/eventviews.nix index cc1e83f6581d..495491f6d3c1 100644 --- a/pkgs/applications/kde/eventviews.nix +++ b/pkgs/applications/kde/eventviews.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, calendarsupport, kcalutils, kdiagram, libkdepim, qtbase, qttools, + akonadi, calendarsupport, kcalutils, + kdiagram, libkdepim, qtbase, qttools, kholidays }: mkDerivation { @@ -12,7 +13,8 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi calendarsupport kcalutils kdiagram libkdepim qtbase qttools + akonadi calendarsupport kcalutils kdiagram + libkdepim qtbase qttools kholidays ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 181bf54ce8cf..c7cc617f163c 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/18.04.3/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/18.08.0/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch index fe8b15febf2e..ebb81248475f 100644 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch @@ -1,82 +1,8 @@ -Index: grantleetheme-17.04.0/src/grantleetheme_p.h -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme_p.h -+++ grantleetheme-17.04.0/src/grantleetheme_p.h -@@ -47,7 +47,7 @@ public: - QString description; - QString name; - QString dirName; -- QString absolutePath; -+ QStringList absolutePaths; - QString author; - QString email; - -Index: grantleetheme-17.04.0/src/grantleetheme.h -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleetheme.h -+++ grantleetheme-17.04.0/src/grantleetheme.h -@@ -50,11 +50,14 @@ public: - QStringList displayExtraVariables() const; - QString dirName() const; - QString absolutePath() const; -+ QStringList absolutePaths() const; - QString author() const; - QString authorEmail() const; - - QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); - -+ void addThemeDir(const QString&); -+ - static void addPluginPath(const QString &path); - - private: -Index: grantleetheme-17.04.0/src/grantleethememanager.cpp -=================================================================== ---- grantleetheme-17.04.0.orig/src/grantleethememanager.cpp -+++ grantleetheme-17.04.0/src/grantleethememanager.cpp -@@ -142,25 +142,18 @@ public: - - for (const QString &directory : qAsConst(themesDirectories)) { - QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); -- QStringList alreadyLoadedThemeName; - while (dirIt.hasNext()) { - dirIt.next(); - const QString dirName = dirIt.fileName(); - GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - QString themeName = theme.name(); -- if (alreadyLoadedThemeName.contains(themeName)) { -- int i = 2; -- const QString originalName(theme.name()); -- while (alreadyLoadedThemeName.contains(themeName)) { -- themeName = originalName + QStringLiteral(" (%1)").arg(i); -- ++i; -- } -- theme.d->name = themeName; -+ QMap::iterator i = themes.find(dirName); -+ if (i != themes.end()) { -+ i.value().addThemeDir(dirIt.filePath()); -+ } else { -+ themes.insert(dirName, theme); - } -- alreadyLoadedThemeName << themeName; -- themes.insert(dirName, theme); -- //qDebug()<<" theme.name()"<addDir(directory); -@@ -374,7 +367,7 @@ QString ThemeManager::pathFromThemes(con - GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - if (dirName == themeName) { -- return theme.absolutePath(); -+ return theme.absolutePaths().first(); - } - } - } ---- src/grantleetheme.cpp.orig 2017-12-22 16:11:39.863598126 +0300 -+++ ./src/grantleetheme.cpp 2017-12-22 16:16:14.045664607 +0300 -@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr +diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp +index 27d5bc8..8d43140 100644 +--- a/src/grantleetheme.cpp ++++ b/src/grantleetheme.cpp +@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other) , description(other.description) , name(other.name) , dirName(other.dirName) @@ -105,7 +31,7 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp loader->setTheme(dirName); if (!sEngine) { -@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c +@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de KConfigGroup group(&config, QStringLiteral("Desktop Entry")); if (group.isValid()) { d->dirName = dirName; @@ -137,7 +63,7 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp } QString Theme::author() const -@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem +@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con return result; } @@ -151,3 +77,79 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp void Theme::addPluginPath(const QString &path) { if (!ThemePrivate::sEngine) { +diff --git a/src/grantleetheme.h b/src/grantleetheme.h +index a25c27b..be38299 100644 +--- a/src/grantleetheme.h ++++ b/src/grantleetheme.h +@@ -48,11 +48,14 @@ public: + Q_REQUIRED_RESULT QStringList displayExtraVariables() const; + Q_REQUIRED_RESULT QString dirName() const; + Q_REQUIRED_RESULT QString absolutePath() const; ++ Q_REQUIRED_RESULT QStringList absolutePaths() const; + Q_REQUIRED_RESULT QString author() const; + Q_REQUIRED_RESULT QString authorEmail() const; + + Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); + ++ void addThemeDir(const QString&); ++ + static void addPluginPath(const QString &path); + + private: +diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h +index eb73dcb..00510e9 100644 +--- a/src/grantleetheme_p.h ++++ b/src/grantleetheme_p.h +@@ -43,7 +43,7 @@ public: + QString description; + QString name; + QString dirName; +- QString absolutePath; ++ QStringList absolutePaths; + QString author; + QString email; + +diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp +index 606d717..dc99041 100644 +--- a/src/grantleethememanager.cpp ++++ b/src/grantleethememanager.cpp +@@ -125,25 +125,18 @@ public: + + for (const QString &directory : qAsConst(themesDirectories)) { + QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); +- QStringList alreadyLoadedThemeName; + while (dirIt.hasNext()) { + dirIt.next(); + const QString dirName = dirIt.fileName(); + GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + QString themeName = theme.name(); +- if (alreadyLoadedThemeName.contains(themeName)) { +- int i = 2; +- const QString originalName(theme.name()); +- while (alreadyLoadedThemeName.contains(themeName)) { +- themeName = originalName + QStringLiteral(" (%1)").arg(i); +- ++i; +- } +- theme.d->name = themeName; ++ QMap::iterator i = themes.find(dirName); ++ if (i != themes.end()) { ++ i.value().addThemeDir(dirIt.filePath()); ++ } else { ++ themes.insert(dirName, theme); + } +- alreadyLoadedThemeName << themeName; +- themes.insert(dirName, theme); +- //qDebug()<<" theme.name()"<addDir(directory); +@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS + GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); + if (theme.isValid()) { + if (dirName == themeName) { +- return theme.absolutePath(); ++ return theme.absolutePaths().first(); + } + } + } diff --git a/pkgs/applications/kde/kdepim-addons.nix b/pkgs/applications/kde/kdepim-addons.nix index 5be3d881b0c5..75c1bf5be8bf 100644 --- a/pkgs/applications/kde/kdepim-addons.nix +++ b/pkgs/applications/kde/kdepim-addons.nix @@ -4,7 +4,8 @@ akonadi-import-wizard, akonadi-notes, calendarsupport, eventviews, incidenceeditor, kcalcore, kcalutils, kconfig, kdbusaddons, kdeclarative, kdepim-apps-libs, kholidays, ki18n, kmime, ktexteditor, ktnef, libgravatar, - libksieve, mailcommon, mailimporter, messagelib, poppler, prison + libksieve, mailcommon, mailimporter, messagelib, poppler, prison, kpkpass, + kitinerary }: mkDerivation { @@ -18,6 +19,7 @@ mkDerivation { akonadi-import-wizard akonadi-notes calendarsupport eventviews incidenceeditor kcalcore kcalutils kconfig kdbusaddons kdeclarative kdepim-apps-libs kholidays ki18n kmime ktexteditor ktnef libgravatar - libksieve mailcommon mailimporter messagelib poppler prison + libksieve mailcommon mailimporter messagelib poppler prison kpkpass + kitinerary ]; } diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix new file mode 100644 index 000000000000..8112460549b4 --- /dev/null +++ b/pkgs/applications/kde/kitinerary.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, lib, extra-cmake-modules +, qtbase, qtdeclarative, ki18n, kmime, kpkpass +, poppler, kcontacts, kcalcore +}: + +mkDerivation { + name = "kitinerary"; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ lib.maintainers.bkchr ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtbase qtdeclarative ki18n kmime kpkpass poppler + kcontacts kcalcore + ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/kleopatra.nix b/pkgs/applications/kde/kleopatra.nix index a19fef9c9edb..c15c6eb78d69 100644 --- a/pkgs/applications/kde/kleopatra.nix +++ b/pkgs/applications/kde/kleopatra.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, boost, gpgme, kcmutils, kdbusaddons, kiconthemes, kitemmodels, kmime, - knotifications, kwindowsystem, kxmlgui, libkleo + knotifications, kwindowsystem, kxmlgui, libkleo, kcrash }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost gpgme kcmutils kdbusaddons kiconthemes kitemmodels kmime - knotifications kwindowsystem kxmlgui libkleo + knotifications kwindowsystem kxmlgui libkleo kcrash ]; } diff --git a/pkgs/applications/kde/kmailtransport.nix b/pkgs/applications/kde/kmailtransport.nix index c4b7c0ab4327..703f62aa72c0 100644 --- a/pkgs/applications/kde/kmailtransport.nix +++ b/pkgs/applications/kde/kmailtransport.nix @@ -1,7 +1,9 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp + akonadi, akonadi-mime, cyrus_sasl, kcmutils, + ki18n, kio, kmime, kwallet, ksmtp, libkgapi, + kcalcore, kcontacts }: mkDerivation { @@ -11,7 +13,7 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ akonadi kcmutils ki18n kio ksmtp ]; + buildInputs = [ akonadi kcmutils ki18n kio ksmtp libkgapi kcalcore kcontacts ]; propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix new file mode 100644 index 000000000000..e9505a72e85e --- /dev/null +++ b/pkgs/applications/kde/kpkpass.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, extra-cmake-modules +, qtbase, karchive, shared-mime-info +}: + +mkDerivation { + name = "kpkpass"; + meta = { + license = with lib.licenses; [ lgpl21 ]; + maintainers = [ lib.maintainers.bkchr ]; + }; + nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; + buildInputs = [ qtbase karchive ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 7ff3a1f04b09..998e65f28347 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -1,7 +1,8 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - qtwebengine, kio, kcalcore, kcontacts + qtwebengine, kio, kcalcore, kcontacts, + cyrus_sasl }: mkDerivation { @@ -11,5 +12,5 @@ mkDerivation { maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtwebengine kio kcalcore kcontacts ]; + buildInputs = [ qtwebengine kio kcalcore kcontacts cyrus_sasl ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index f50afbcc371e..decf0f4a314f 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,1699 +3,1715 @@ { akonadi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-18.04.3.tar.xz"; - sha256 = "0x232a4rm8vz0vqs1v08p77zmcdjhjn9aicb3pvn4mqlgzz2q8x5"; - name = "akonadi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-18.08.0.tar.xz"; + sha256 = "06a1n84w4bfljyariyajzpn1sajkn4dwpsrr47pz38vf1m6dp7mz"; + name = "akonadi-18.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-calendar-18.04.3.tar.xz"; - sha256 = "1jaigydsk1albvgqblrj0chxqzgpg3nmxihy7yf5wdmnkrkzpqlm"; - name = "akonadi-calendar-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-18.08.0.tar.xz"; + sha256 = "1qlqvsv4gs50v9dd3nbw8wyq0vgvxvslhnk1hnqpyvh0skcwslh5"; + name = "akonadi-calendar-18.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-calendar-tools-18.04.3.tar.xz"; - sha256 = "06azzv80gisiiq1g8a1lm0hmadck38zsvylz8mwwir5s8nah9v09"; - name = "akonadi-calendar-tools-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-calendar-tools-18.08.0.tar.xz"; + sha256 = "1d5kr7nxfy7y9ybi4qnfbfci5kc44ya916j9wgb18r6rfdhdwsxr"; + name = "akonadi-calendar-tools-18.08.0.tar.xz"; }; }; akonadiconsole = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadiconsole-18.04.3.tar.xz"; - sha256 = "12yl23hdyyj3k5b59nkmj1ykr79srx901x16jakwqzx4n07nc30x"; - name = "akonadiconsole-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadiconsole-18.08.0.tar.xz"; + sha256 = "0qrwgjdmqa5jj8vcbs6n733v462sxnf4jcmh2khjddf2h5na6q86"; + name = "akonadiconsole-18.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-contacts-18.04.3.tar.xz"; - sha256 = "0g6vq1k95lvzljl54zafgcg3wmjayn49ihzpyyyxv1dxn7nfdngq"; - name = "akonadi-contacts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-contacts-18.08.0.tar.xz"; + sha256 = "0jqs0llpxq34j4glgzsfifk5yd24x6smky550s66bjzkyg3j2s2m"; + name = "akonadi-contacts-18.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-import-wizard-18.04.3.tar.xz"; - sha256 = "0by9h35gag4ygxna661gg72hmnng235dhc2q1pl6x5mb5gkpnwmp"; - name = "akonadi-import-wizard-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-import-wizard-18.08.0.tar.xz"; + sha256 = "00my9ja8clz758s3x2jjlsxlpc8zfs8vlq4vh9i2vmsacqwrfy24"; + name = "akonadi-import-wizard-18.08.0.tar.xz"; }; }; akonadi-mime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-mime-18.04.3.tar.xz"; - sha256 = "1kk5nxh0dn1rmi1qasqf6kpa9ihg0lkajkj6r7widkh14ssz8sn0"; - name = "akonadi-mime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-mime-18.08.0.tar.xz"; + sha256 = "0jj9l1zjh72crj8gfifpn73c5xiyycjgv0cm1qalf370cd1sdx80"; + name = "akonadi-mime-18.08.0.tar.xz"; }; }; akonadi-notes = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-notes-18.04.3.tar.xz"; - sha256 = "0dir0mlch002l9wx6cgzkywh9nkjgvwm09gzpiz9h9d62q8a5wzc"; - name = "akonadi-notes-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-notes-18.08.0.tar.xz"; + sha256 = "0x2v8ylnli29ld6y9vqj18a4bph4zm34zymdmrp3swll1j6xib7q"; + name = "akonadi-notes-18.08.0.tar.xz"; }; }; akonadi-search = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akonadi-search-18.04.3.tar.xz"; - sha256 = "15a94g4zrq021zaabsi97lcb5lrm9nar9wjakga8xgy9jf48fq23"; - name = "akonadi-search-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akonadi-search-18.08.0.tar.xz"; + sha256 = "0fsn7mm1h9m9h3zm2z2fdghbw7m6wdbgfhg7b4iish2br375qh1s"; + name = "akonadi-search-18.08.0.tar.xz"; }; }; akregator = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/akregator-18.04.3.tar.xz"; - sha256 = "0xhsrx0yf4kggi4cjrg5g3if5n1m3injqfy9zyy891kzgfsybnaj"; - name = "akregator-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/akregator-18.08.0.tar.xz"; + sha256 = "1s044m9l8z6safqcarjplmlksappjkx7iry3k8s2p6ld4w377w3c"; + name = "akregator-18.08.0.tar.xz"; }; }; analitza = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/analitza-18.04.3.tar.xz"; - sha256 = "1yva0j9c8wagzp68qi4hg7lniigz1b61jr6jayw98lnkdvsg7y5f"; - name = "analitza-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/analitza-18.08.0.tar.xz"; + sha256 = "1sqr94mbblqry9a1nkmg6py2w0p1wlnbim99kadmp56ypf483rw7"; + name = "analitza-18.08.0.tar.xz"; }; }; ark = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ark-18.04.3.tar.xz"; - sha256 = "02dv1mv8sim2qb1xm7nni5z6nx4jsdihagmj2y5v48nlvf229k75"; - name = "ark-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ark-18.08.0.tar.xz"; + sha256 = "0dp7lrc0nqwwshcsi1408lqyycqhxgx18bmnf1sq7ysh6d1w6i75"; + name = "ark-18.08.0.tar.xz"; }; }; artikulate = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/artikulate-18.04.3.tar.xz"; - sha256 = "1dvinnbcm6lgjsjjsv9gl1s99xgcgpld10v3nn32ak8h7v89in9m"; - name = "artikulate-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/artikulate-18.08.0.tar.xz"; + sha256 = "12bkfxpaz352823c639q3bal9j6fcaamypv2ql08rn44h9zdjvk8"; + name = "artikulate-18.08.0.tar.xz"; }; }; audiocd-kio = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/audiocd-kio-18.04.3.tar.xz"; - sha256 = "08kzy6nj14qwm3gd7m6idn3s34i7bx5galhbish0xqmg6wnfxpzl"; - name = "audiocd-kio-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/audiocd-kio-18.08.0.tar.xz"; + sha256 = "0mh1cfz0dn28i9hqyjmz2cm50qkxzj0qkrvar59p03i2r8vqybf8"; + name = "audiocd-kio-18.08.0.tar.xz"; }; }; baloo-widgets = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/baloo-widgets-18.04.3.tar.xz"; - sha256 = "01qx2wyiaa00ixyfy0mak8xz7cnpqrxnxn5hzhrf8v9zar1d04ap"; - name = "baloo-widgets-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/baloo-widgets-18.08.0.tar.xz"; + sha256 = "026lm8m7bp8q1akwgfvzsyyam7jknndif3vmij4x5ra7yy5xa0s9"; + name = "baloo-widgets-18.08.0.tar.xz"; }; }; blinken = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/blinken-18.04.3.tar.xz"; - sha256 = "0rv9v678cqhnamz46996pwgw9d4nwa2kg92d2mpvyd790ax5fdrz"; - name = "blinken-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/blinken-18.08.0.tar.xz"; + sha256 = "0ivpv27vgzchm0r8zlb02w6l0a8xsi7q173660bjv1ynwalgn3bm"; + name = "blinken-18.08.0.tar.xz"; }; }; bomber = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/bomber-18.04.3.tar.xz"; - sha256 = "0a7l103ddgn648ijlwf1fgvvma7mg0vz7pqdy50k1vm3gkkvqh03"; - name = "bomber-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/bomber-18.08.0.tar.xz"; + sha256 = "0z83hkvs7h0pg91sczmvkkn7yc8xfch5hl7l25b7kac4c9qznzix"; + name = "bomber-18.08.0.tar.xz"; }; }; bovo = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/bovo-18.04.3.tar.xz"; - sha256 = "047f4k6h3z7yl4f5ggs3jlrcpgp5li4kgkssa2vcy93jsgb4a8wz"; - name = "bovo-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/bovo-18.08.0.tar.xz"; + sha256 = "0bbkm0c801rcvk8z0idbasn1m7cdd2mpbpb1ap9ghgv2vjbln7va"; + name = "bovo-18.08.0.tar.xz"; }; }; calendarsupport = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/calendarsupport-18.04.3.tar.xz"; - sha256 = "14rasrmxsx4d3ap4ifihfd8nm9bydng753xi59xkx86fvxb3qg5r"; - name = "calendarsupport-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/calendarsupport-18.08.0.tar.xz"; + sha256 = "0ps4963c2wbmlwp7aks16jw2pz74fqlxarhsnjj3r339575inzw2"; + name = "calendarsupport-18.08.0.tar.xz"; }; }; cantor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/cantor-18.04.3.tar.xz"; - sha256 = "0ix8vcjrdw1bssmhhc5a0vp8ywfrznhqpfcxvs9d1p4bxl48bblc"; - name = "cantor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/cantor-18.08.0.tar.xz"; + sha256 = "08sqr1nxn9a24z4jicmjn9zn64xv3yyy054rzblr2h2hi3n6fqdy"; + name = "cantor-18.08.0.tar.xz"; }; }; cervisia = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/cervisia-18.04.3.tar.xz"; - sha256 = "0lbcdjjpr56vq14m8zk3fzna6mcz74dqzlkmc1zxn6gijjv89zqf"; - name = "cervisia-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/cervisia-18.08.0.tar.xz"; + sha256 = "1avc18vv2lb27w5ybiajsr65c65zpvbv43ihz4gcjv7awqf754w7"; + name = "cervisia-18.08.0.tar.xz"; }; }; dolphin = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/dolphin-18.04.3.tar.xz"; - sha256 = "1im39knramhxdpw7bsnm2f533iz81fb47lac99vq9jc3c9zn7za1"; - name = "dolphin-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dolphin-18.08.0.tar.xz"; + sha256 = "1r3g3qssawhav3dx9a9qdd7dqcjj1ynm6ravj5wx39h4qdflrysy"; + name = "dolphin-18.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/dolphin-plugins-18.04.3.tar.xz"; - sha256 = "1fccbnr1b05sbqmfz6v09sq1v8dvbkw2jzyk8nqd9cmc2zbymwga"; - name = "dolphin-plugins-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dolphin-plugins-18.08.0.tar.xz"; + sha256 = "1j96bkc3xah4ca3a9asplpf152dp234r2bzs5wg25b3aw7zp5siv"; + name = "dolphin-plugins-18.08.0.tar.xz"; }; }; dragon = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/dragon-18.04.3.tar.xz"; - sha256 = "1dhzbyk87xd0bm89b1rs540rrixh16z9pm26003xl640imwbwy57"; - name = "dragon-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/dragon-18.08.0.tar.xz"; + sha256 = "020vnnzd7crvrv8dbcf41h04hpr2ayrfk6ayxhxpazrzic1sxxx6"; + name = "dragon-18.08.0.tar.xz"; }; }; eventviews = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/eventviews-18.04.3.tar.xz"; - sha256 = "02v57ini7qi9y5ijljhxfsq2b5hqg9jdbgihdkq8vy2dlcg30mfd"; - name = "eventviews-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/eventviews-18.08.0.tar.xz"; + sha256 = "1ca499dzqsy2n6c0s0vrwvjykc4vd5s4m2bkn0vdg2dbyyx9fncj"; + name = "eventviews-18.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ffmpegthumbs-18.04.3.tar.xz"; - sha256 = "0wj403wahlirr2nv380z2s4fcgny446frv5xdxlqgg3b176ydcp6"; - name = "ffmpegthumbs-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ffmpegthumbs-18.08.0.tar.xz"; + sha256 = "1rbfbwnyync4j15qzdhn47gksr6jm97pgkld2x3p564gi98w0vrn"; + name = "ffmpegthumbs-18.08.0.tar.xz"; }; }; filelight = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/filelight-18.04.3.tar.xz"; - sha256 = "1m02si6pz6rb8arjd50s277xnj5f8alkl8r3p8f4cgmx2gs3rymn"; - name = "filelight-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/filelight-18.08.0.tar.xz"; + sha256 = "1wx6q0gq4zlg95a93sg7zqkbaka1pcn99jsjkdncq1z4lfphppk9"; + name = "filelight-18.08.0.tar.xz"; }; }; granatier = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/granatier-18.04.3.tar.xz"; - sha256 = "0i7f4pbj43vcav9ncxznddhvy0fph0z8xv3hb1wf5rncfxbc0kh0"; - name = "granatier-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/granatier-18.08.0.tar.xz"; + sha256 = "06nzgpwvgvbh6hf5yxmcxigh3n72qa0mbiv7k56157yyvxigk62q"; + name = "granatier-18.08.0.tar.xz"; }; }; grantlee-editor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/grantlee-editor-18.04.3.tar.xz"; - sha256 = "0796ihix37igawic7bpva1ca3hzhcz89k7aqd3pwcz220ky6y0fy"; - name = "grantlee-editor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/grantlee-editor-18.08.0.tar.xz"; + sha256 = "06m2n5rcgp63xgnr5jdzly7fda8zx5r3ki07ldxz1xivd985zmfp"; + name = "grantlee-editor-18.08.0.tar.xz"; }; }; grantleetheme = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/grantleetheme-18.04.3.tar.xz"; - sha256 = "1n69wmxs9bsa37swxv8gl1ji6w696mxpg9g5z945il7ai6zwi8av"; - name = "grantleetheme-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/grantleetheme-18.08.0.tar.xz"; + sha256 = "1mk80hfra4nmrcb0ff3n7l33pbw6j5lypb3ip7g4c1p8qik6imfv"; + name = "grantleetheme-18.08.0.tar.xz"; }; }; gwenview = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/gwenview-18.04.3.tar.xz"; - sha256 = "187l75ppnsnl7bi9p6zyxg95qm3syhpmga6zl22ky0g9mqz6s3nx"; - name = "gwenview-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/gwenview-18.08.0.tar.xz"; + sha256 = "1nv9a7pj0h2m3wxzy03jw3pi5ps3xqvq9sx7mblq8p4klga2pcnl"; + name = "gwenview-18.08.0.tar.xz"; }; }; incidenceeditor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/incidenceeditor-18.04.3.tar.xz"; - sha256 = "0zwrr6rgvardpxr5czh1jwrb2wvnxyfk3psgk6marr2sg5nm10km"; - name = "incidenceeditor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/incidenceeditor-18.08.0.tar.xz"; + sha256 = "1s88i1l30b30an8lwc8sdlzfm1cvmb9n5786bs9y0jfgw01wdl7j"; + name = "incidenceeditor-18.08.0.tar.xz"; }; }; juk = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/juk-18.04.3.tar.xz"; - sha256 = "1zbh03mckj32003padxzlghpc6dqry8z72aflv873if986wzw0dk"; - name = "juk-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/juk-18.08.0.tar.xz"; + sha256 = "1lzw9ih4771vdxqngc0ja57v9y6wlgf8dbmnjax74ryi232py1d9"; + name = "juk-18.08.0.tar.xz"; }; }; k3b = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/k3b-18.04.3.tar.xz"; - sha256 = "0wh0l7f9ngyq40p506pmnb3a8irb7wzz8pcncy6br3lcgg9yx0wx"; - name = "k3b-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/k3b-18.08.0.tar.xz"; + sha256 = "1lm9140xc5mq1szyc4vkms6b3qhl4b3yn74kqp942b8k9djn17md"; + name = "k3b-18.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kaccounts-integration-18.04.3.tar.xz"; - sha256 = "0883l8dzs21h8y2xw8vxnln3m4fwp01ifncmwb7vil9yllf6c6jw"; - name = "kaccounts-integration-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaccounts-integration-18.08.0.tar.xz"; + sha256 = "0wvqhf9br8nqqacyn6j4k2323w6nixkfzlajkmx872d31d7aqf11"; + name = "kaccounts-integration-18.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kaccounts-providers-18.04.3.tar.xz"; - sha256 = "0nvwdmmz3lajaj0p624mqi0mpnqv23npk2sbcxhc504gp25bki9i"; - name = "kaccounts-providers-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaccounts-providers-18.08.0.tar.xz"; + sha256 = "1zxyqwdrf9pp5b1vnd8p4wz21ciavffjxd68vcjjyj8bba30c51l"; + name = "kaccounts-providers-18.08.0.tar.xz"; }; }; kaddressbook = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kaddressbook-18.04.3.tar.xz"; - sha256 = "02rqcmbcvl4brzy33vljppad3k50hxsm7g0j96wjrlaj06p2rmfl"; - name = "kaddressbook-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kaddressbook-18.08.0.tar.xz"; + sha256 = "1wgqqnikv9qyrb4nvkm7h91r1iqfkmbpdp67lcw4jkglqghnn2qc"; + name = "kaddressbook-18.08.0.tar.xz"; }; }; kajongg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kajongg-18.04.3.tar.xz"; - sha256 = "1f16w02sqzsmjcfvqijgrvgpjmym7nf9hgc1rxldc1hwi772kcgq"; - name = "kajongg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kajongg-18.08.0.tar.xz"; + sha256 = "0dfrwzq1p9ikff52qi50ckb769pfij7gzn61r6pdkkfjgy86364y"; + name = "kajongg-18.08.0.tar.xz"; }; }; kalarm = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalarm-18.04.3.tar.xz"; - sha256 = "1dlf25p66kcw55vk0xmrcd900ar2wxn9416qqji711n6wnx3xqrf"; - name = "kalarm-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalarm-18.08.0.tar.xz"; + sha256 = "0415yq61q700slmm6vskd92pc2sp1027flghgans80i29617zgaq"; + name = "kalarm-18.08.0.tar.xz"; }; }; kalarmcal = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalarmcal-18.04.3.tar.xz"; - sha256 = "1blzbccdk3zf5fgy4n5l59c5cagy1v7rjs53npjxgmdng7lxb8kl"; - name = "kalarmcal-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalarmcal-18.08.0.tar.xz"; + sha256 = "0ss56dy451lbbq872sarqcyapf4g6kgw78s88hgs7z5mlyj8xnll"; + name = "kalarmcal-18.08.0.tar.xz"; }; }; kalgebra = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalgebra-18.04.3.tar.xz"; - sha256 = "0x1a24k2p02s755kmpv0zanfv7ys50kkwyvc68g76b9z1yjb02dc"; - name = "kalgebra-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalgebra-18.08.0.tar.xz"; + sha256 = "0fv4v7xnspqjbc7x6n2gcyjssm15apszbvj4gs1w2lwlbbr3i224"; + name = "kalgebra-18.08.0.tar.xz"; }; }; kalzium = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kalzium-18.04.3.tar.xz"; - sha256 = "1lqw77xcxjkc3a1g046i1rdb0bk29p0kcnqfyjkm03kp8819gbgg"; - name = "kalzium-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kalzium-18.08.0.tar.xz"; + sha256 = "0bjpiir1xxwvhs4xgnvbhphw24iif9g4kj9zg61bqcvq5zxf821x"; + name = "kalzium-18.08.0.tar.xz"; }; }; kamera = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kamera-18.04.3.tar.xz"; - sha256 = "11b2b3fgi73f2vw97qdvh8kk92bcn7h513plcvpiv2vw1qh6bwm7"; - name = "kamera-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kamera-18.08.0.tar.xz"; + sha256 = "169vsxnpcgxws27hcap2l5wjbfyxxi30321c8r3p8fm2klvbc8nw"; + name = "kamera-18.08.0.tar.xz"; }; }; kamoso = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kamoso-18.04.3.tar.xz"; - sha256 = "0vjhdkx874v9gzm7yla7pxwiphdrf8aj21641xslf5qn4kcx55p1"; - name = "kamoso-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kamoso-18.08.0.tar.xz"; + sha256 = "1a8azx7rdbzznh9qwzg0x6w50vb5bc6cmd442j2hhdwkl15dqpwd"; + name = "kamoso-18.08.0.tar.xz"; }; }; kanagram = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kanagram-18.04.3.tar.xz"; - sha256 = "033mzwirfc7p7xphvyh9h135pq17rqnz5vw8d7rn893z1lwzm8xj"; - name = "kanagram-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kanagram-18.08.0.tar.xz"; + sha256 = "02v3xlkfphkk86y8yrw10lq7f4wc7gmh02ms2w00aqrllkpja4vn"; + name = "kanagram-18.08.0.tar.xz"; }; }; kapman = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kapman-18.04.3.tar.xz"; - sha256 = "0w6xcp5lqzlcmgyvr76mgnbnvhabzhmjmlkab6zfgrrph0w4lnba"; - name = "kapman-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kapman-18.08.0.tar.xz"; + sha256 = "03fhxn8zckidkab56fzgwai0d1ac5k3il32w881gq5z012ms013h"; + name = "kapman-18.08.0.tar.xz"; }; }; kapptemplate = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kapptemplate-18.04.3.tar.xz"; - sha256 = "0gsv6mam7jmix7wx7rq3xyqs1c0c15kcpbcj1ps6qzbf33w73crl"; - name = "kapptemplate-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kapptemplate-18.08.0.tar.xz"; + sha256 = "10fyvwxf6xmn8jdc4p3m3jpb8ykaga1jmwx2hzhf8c6a3rrcxvvb"; + name = "kapptemplate-18.08.0.tar.xz"; }; }; kate = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kate-18.04.3.tar.xz"; - sha256 = "1w1bn0qbj8hxkh9cn6zx2h6hm82y07czzzvjm6gak90wi23lbb74"; - name = "kate-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kate-18.08.0.tar.xz"; + sha256 = "1licprflzcsrfap7klr1ia2kl2z2cp16zgznphrqkkn9n6x7xz67"; + name = "kate-18.08.0.tar.xz"; }; }; katomic = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/katomic-18.04.3.tar.xz"; - sha256 = "0928xwbm7c3d0jc5zg5nkdkl7kfrsn441i40b7z2np4v13y7bf1i"; - name = "katomic-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/katomic-18.08.0.tar.xz"; + sha256 = "07d9irgqrawll18fi3b2mrjj416gpkn43bsriifkraqf8yrn3m4s"; + name = "katomic-18.08.0.tar.xz"; }; }; kbackup = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbackup-18.04.3.tar.xz"; - sha256 = "0m4dxrlm5807azm7bvy06r0nj1pfbfy31gkl37m7pg4z9svx5hp9"; - name = "kbackup-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbackup-18.08.0.tar.xz"; + sha256 = "14nmk7dwrmkfv7kz4r64vzy46n48g3l1iqj0937qnpbqk12yvak9"; + name = "kbackup-18.08.0.tar.xz"; }; }; kblackbox = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kblackbox-18.04.3.tar.xz"; - sha256 = "08sm7h7d16l79isqi2hwr54dsnv3lbikj1zcyq0bwngkyqr49cmh"; - name = "kblackbox-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblackbox-18.08.0.tar.xz"; + sha256 = "0nd4nsx7yyiy1g1g4v0gaw0m6r3kb07gnn8236bch6xxy9xcdzhb"; + name = "kblackbox-18.08.0.tar.xz"; }; }; kblocks = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kblocks-18.04.3.tar.xz"; - sha256 = "1bf4d8s9xm28qn4qv2i18gwh25fi0f06h03blk7bjw9hvr7wfaja"; - name = "kblocks-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblocks-18.08.0.tar.xz"; + sha256 = "1pnxzfp3bd089bjbdsi0iwjpw60p36lb110yb61cv0vb54g1sia1"; + name = "kblocks-18.08.0.tar.xz"; }; }; kblog = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kblog-18.04.3.tar.xz"; - sha256 = "1fh96i9y45abp4cp2bjhkldxax9qjgsxb14ahqivp2qam41rpnnz"; - name = "kblog-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kblog-18.08.0.tar.xz"; + sha256 = "00q7266lx29bfgzhfmb192l8h3qwgpj3yyfc0lykkbhjf6d9w783"; + name = "kblog-18.08.0.tar.xz"; }; }; kbounce = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbounce-18.04.3.tar.xz"; - sha256 = "025nfdnv8ssmln0q6lwkd8ppflv2cimd1x8yf6kqh5jd5ynx73vh"; - name = "kbounce-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbounce-18.08.0.tar.xz"; + sha256 = "0x07lxqip9l2k9mdpan03yh17ammkd1f242l2p3qq3j1s71bpznm"; + name = "kbounce-18.08.0.tar.xz"; }; }; kbreakout = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbreakout-18.04.3.tar.xz"; - sha256 = "11pbd76h5cll7kcb7dcnhckmknj5gm0igq0w1dx2pxdpna1i4p6z"; - name = "kbreakout-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbreakout-18.08.0.tar.xz"; + sha256 = "1jrix92p48zcpgwvfxn484bw1k8ynfacm4iww14splx2d9skj489"; + name = "kbreakout-18.08.0.tar.xz"; }; }; kbruch = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kbruch-18.04.3.tar.xz"; - sha256 = "0d888539cmhxrcyy90iqw83aa8x1w2v5r351xncqw34gfq1k1nj3"; - name = "kbruch-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kbruch-18.08.0.tar.xz"; + sha256 = "1gkij27hl847bc2jdnjqvigncdmb11spj2rsy825rsnpiqxbqv8f"; + name = "kbruch-18.08.0.tar.xz"; }; }; kcachegrind = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcachegrind-18.04.3.tar.xz"; - sha256 = "1zdcarqgb1yxql6z3hmnmam2abg44r3z7sy33y9yqa9wimzq4w13"; - name = "kcachegrind-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcachegrind-18.08.0.tar.xz"; + sha256 = "13nqcxh21apxpzg51alsgn34hps21nr7aqyh60kd4fbmmsxrqll0"; + name = "kcachegrind-18.08.0.tar.xz"; }; }; kcalc = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcalc-18.04.3.tar.xz"; - sha256 = "02kadbv874azlqm1i52y680iyp29jg683cjnjw3bgh1p6la7ssrx"; - name = "kcalc-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalc-18.08.0.tar.xz"; + sha256 = "04bdbdyc9lky6i0dkm6w9f2k3gvr9zq5b9yc6qhl4smdiivlqjb6"; + name = "kcalc-18.08.0.tar.xz"; }; }; kcalcore = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcalcore-18.04.3.tar.xz"; - sha256 = "1l2g8m35dahmpwnrhmq1dr7iqcdw9pg51v4q5a39ashcsvv1bpzj"; - name = "kcalcore-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalcore-18.08.0.tar.xz"; + sha256 = "0sdzx0ygq89np2cj22v06m9j00nwbqn97rm43nffgixwvrlf1wy5"; + name = "kcalcore-18.08.0.tar.xz"; }; }; kcalutils = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcalutils-18.04.3.tar.xz"; - sha256 = "1mycr1nhy2b2nk2izka8ck3sfyblfjqqjqn40g3lhssn4ps2z2jb"; - name = "kcalutils-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcalutils-18.08.0.tar.xz"; + sha256 = "12s2anmwi3q95kjl197jis90vi5gzpxs0b4xj4m6n4lzmnyjvfxl"; + name = "kcalutils-18.08.0.tar.xz"; }; }; kcharselect = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcharselect-18.04.3.tar.xz"; - sha256 = "1yqrsiq68kzx4incb5imra7s49byln85bq047w6r7fmp2ypyxklm"; - name = "kcharselect-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcharselect-18.08.0.tar.xz"; + sha256 = "1gfzzzk5admdclw75qhnsf3271p2lr0fgqzxvclcxppwmv5j56aq"; + name = "kcharselect-18.08.0.tar.xz"; }; }; kcolorchooser = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcolorchooser-18.04.3.tar.xz"; - sha256 = "1ilgsgy5zdfmx8bgdsf9s9wxpl3pmgjb6jh96sy1gca0d4kbkrnv"; - name = "kcolorchooser-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcolorchooser-18.08.0.tar.xz"; + sha256 = "1sxlx6cnpm0yfbrbk1pqaf0lsf1mgzdnkszr30hwz6z5lvvzj73l"; + name = "kcolorchooser-18.08.0.tar.xz"; }; }; kcontacts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcontacts-18.04.3.tar.xz"; - sha256 = "0rwh1p98hx3ybf4gxxp1dkgkrhmzli23fi9hk8m9k2mgr97yiqni"; - name = "kcontacts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcontacts-18.08.0.tar.xz"; + sha256 = "0cil96cd383gvqa2dw1lhaw3vi3m04y4rpjqmiapzwnn4ck0v1ii"; + name = "kcontacts-18.08.0.tar.xz"; }; }; kcron = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kcron-18.04.3.tar.xz"; - sha256 = "0m0pna8hqkk2ab78yxchyc3pjzgrb37ldkhwa5r2zwg2n9y4k0xq"; - name = "kcron-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kcron-18.08.0.tar.xz"; + sha256 = "14lkaz1b6hnpwvxnnx3mgv3fg86vm1g45fggfx25x6x72kiihhzq"; + name = "kcron-18.08.0.tar.xz"; }; }; kdav = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdav-18.04.3.tar.xz"; - sha256 = "0m987fbbnm6xwagsmsn4x6v5zm4b7d0jzab5gi5vw97qkx9rs82h"; - name = "kdav-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdav-18.08.0.tar.xz"; + sha256 = "13jwc4623f9mx64i7fb3ha5gwbqgfd54dirbvcyyglrzipxmgja1"; + name = "kdav-18.08.0.tar.xz"; }; }; kdebugsettings = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdebugsettings-18.04.3.tar.xz"; - sha256 = "0c7fgfp31kj5mar2pmjnfhxb16f33xhp22iwk1vkagy07bl145r9"; - name = "kdebugsettings-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdebugsettings-18.08.0.tar.xz"; + sha256 = "1ddqcfq2icsk2xmfr02jawdgxyydhx4yyhrfd7pk8cfw66rm23br"; + name = "kdebugsettings-18.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kde-dev-scripts-18.04.3.tar.xz"; - sha256 = "0azf5xcnwzyqc5bwxwjnakf7vln74faxq40myhj12hhhg5vckz06"; - name = "kde-dev-scripts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kde-dev-scripts-18.08.0.tar.xz"; + sha256 = "1glnm91wn3xdd6zqqy2p178f05z5wn3gr1i6jyqb0zkl8ansy3yi"; + name = "kde-dev-scripts-18.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kde-dev-utils-18.04.3.tar.xz"; - sha256 = "172479qp82vrlnlqnbbl01xkap6v0gva78qcbzmizww0b085q4vk"; - name = "kde-dev-utils-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kde-dev-utils-18.08.0.tar.xz"; + sha256 = "1dk510kgjgvycdyzr5mwq9z1b3xr8hlpm4ahfwlfn299gl563fwf"; + name = "kde-dev-utils-18.08.0.tar.xz"; }; }; kdeedu-data = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdeedu-data-18.04.3.tar.xz"; - sha256 = "0qg79cv5lkpswhywcgixbmyqfbviwb3yj3nc1iwsrwn4gqff082g"; - name = "kdeedu-data-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdeedu-data-18.08.0.tar.xz"; + sha256 = "1ph3bw4xgmgh28j9vnj9v1amgisy3f44whpwwhzin9zgzz0cw3gw"; + name = "kdeedu-data-18.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdegraphics-mobipocket-18.04.3.tar.xz"; - sha256 = "06c8vn5ga7xkxzsashri86ic14dcpa15c79kb57p4qm168afm8vi"; - name = "kdegraphics-mobipocket-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-mobipocket-18.08.0.tar.xz"; + sha256 = "0p3bci612qbqnbps4g4yb2kd1rs6kx2ppcls6vpfb035c28ygf7a"; + name = "kdegraphics-mobipocket-18.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdegraphics-thumbnailers-18.04.3.tar.xz"; - sha256 = "1p8dfmh7hi3sxlqpahkcpl06x0flf94jam85l3n8r8f00kb9rq5a"; - name = "kdegraphics-thumbnailers-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdegraphics-thumbnailers-18.08.0.tar.xz"; + sha256 = "0dwfphz70y0g43a9nxfda78qwsv7y4llx1f51x6n8jl64kpxnijw"; + name = "kdegraphics-thumbnailers-18.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdenetwork-filesharing-18.04.3.tar.xz"; - sha256 = "1wg2c4a4p3h3i6pqisrjhicllzm3vxd3qp1sxvny54algywqyz66"; - name = "kdenetwork-filesharing-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdenetwork-filesharing-18.08.0.tar.xz"; + sha256 = "0l5f9ffwsk0s9r87kid9k1a7j2v4lcdzbn2w4qb2pg22k92k8p67"; + name = "kdenetwork-filesharing-18.08.0.tar.xz"; }; }; kdenlive = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdenlive-18.04.3.tar.xz"; - sha256 = "0ps33l6wq594p7x82c03hd959bmifhfwq34ghqmr6629bwpaq1cm"; - name = "kdenlive-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdenlive-18.08.0.tar.xz"; + sha256 = "06d0viqma7kivzv3hbsiirkfhbj28mdr2nr3f5ic56381q3ps923"; + name = "kdenlive-18.08.0.tar.xz"; }; }; kdepim-addons = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdepim-addons-18.04.3.tar.xz"; - sha256 = "04cjwql3mc1arm55v8h8r3fwrq42sa5cpfqqwwyhlpcbbh917hvv"; - name = "kdepim-addons-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-addons-18.08.0.tar.xz"; + sha256 = "05141013jdaascsb7ihbmd4f1lh1r6ah5w39wp5vky6ma35zv2l1"; + name = "kdepim-addons-18.08.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdepim-apps-libs-18.04.3.tar.xz"; - sha256 = "1lizw9x5z9byg88s3dpj6hbx89sn8sjaywa3l79h03v5hc5wxi7l"; - name = "kdepim-apps-libs-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-apps-libs-18.08.0.tar.xz"; + sha256 = "0zpx3nilrsvgmgx5visppyx3kn2g5k8fnhfy649k6wa35p846495"; + name = "kdepim-apps-libs-18.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdepim-runtime-18.04.3.tar.xz"; - sha256 = "16xi4i7f9hh9wgbqi4dp6vha278mhkgmxr884d0p9bpa7rcriwb5"; - name = "kdepim-runtime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdepim-runtime-18.08.0.tar.xz"; + sha256 = "0b1jbksxks32s8gjzrjhh4nja089j5dq75yaiil99w11f7nfpkar"; + name = "kdepim-runtime-18.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdesdk-kioslaves-18.04.3.tar.xz"; - sha256 = "0f3xjklc4h3ly6lcvaywh3gi8mlyffbhknpqn1b4g0arvvnymlsl"; - name = "kdesdk-kioslaves-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdesdk-kioslaves-18.08.0.tar.xz"; + sha256 = "1fpg4sdbgzvlc9z7wwxxbp466fhybphvmcdpplbr7ws3588792cb"; + name = "kdesdk-kioslaves-18.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdesdk-thumbnailers-18.04.3.tar.xz"; - sha256 = "1rq1g0wwnmp1hzid4g8b36liyl7nd8qp85cmikli6x1ph5g93zi6"; - name = "kdesdk-thumbnailers-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdesdk-thumbnailers-18.08.0.tar.xz"; + sha256 = "047rnzn2lsbhfll0fp4vdf4jsyixg7vmpl2xyvi1y85df5nvv2pc"; + name = "kdesdk-thumbnailers-18.08.0.tar.xz"; }; }; kdf = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdf-18.04.3.tar.xz"; - sha256 = "0nqw3ahhigsyp15r7blm3nijn6dil1awqi7y11sszl1kr3wln1nz"; - name = "kdf-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdf-18.08.0.tar.xz"; + sha256 = "1flv6qjb936fcj5crshy26qy9y2p7j9i3hlidr9lsk81wsyjkqqg"; + name = "kdf-18.08.0.tar.xz"; }; }; kdialog = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdialog-18.04.3.tar.xz"; - sha256 = "178xp72yd5wm5aanvkv2mxqzcganxw2z9q0aribs2x54z3ccj27c"; - name = "kdialog-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdialog-18.08.0.tar.xz"; + sha256 = "04xhp4pdn7gv69gwydz9afml27qj9mrqz2hnrhcsf29pw3vq0hli"; + name = "kdialog-18.08.0.tar.xz"; }; }; kdiamond = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kdiamond-18.04.3.tar.xz"; - sha256 = "1ikha8fpxmcbm3kncv0jb6hzm0413w3v0yrk0y7866xdaanb5491"; - name = "kdiamond-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kdiamond-18.08.0.tar.xz"; + sha256 = "14c5i2fj9scvkqffz95lrqj49vfg7yh7gfc4s3zzg2sl91j7hwzq"; + name = "kdiamond-18.08.0.tar.xz"; }; }; keditbookmarks = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/keditbookmarks-18.04.3.tar.xz"; - sha256 = "1y0y668ablpp596x77rxblw89pfx2ak533yhdj8khlj1mhzkagiq"; - name = "keditbookmarks-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/keditbookmarks-18.08.0.tar.xz"; + sha256 = "1zsfmcyb9s782k6knlv56mrssazdid6i70g74is46s59sgfdd9fl"; + name = "keditbookmarks-18.08.0.tar.xz"; }; }; kfind = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kfind-18.04.3.tar.xz"; - sha256 = "1f0civprab0y5f76kn1zs1g9iz0xhs4p633x2jh0s2nhb79m5p4a"; - name = "kfind-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfind-18.08.0.tar.xz"; + sha256 = "1bvln7iq2ikcrzaa53wskpqwzmndjvc84a2jdjqzirmh6pqzlf3h"; + name = "kfind-18.08.0.tar.xz"; }; }; kfloppy = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kfloppy-18.04.3.tar.xz"; - sha256 = "0q6z0ppxmllzcwz6fsjfz8qq1a12ya62j526pnfy22fvqw4qwyjw"; - name = "kfloppy-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfloppy-18.08.0.tar.xz"; + sha256 = "1clz5651d11pm77mi57nzr274zwshx2qhglfn6jxiif9yz6s9dfp"; + name = "kfloppy-18.08.0.tar.xz"; }; }; kfourinline = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kfourinline-18.04.3.tar.xz"; - sha256 = "1img467nzvpzqr0piji76ykvz2r0ji05gp3cfpxp7vjn8mbzwc00"; - name = "kfourinline-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kfourinline-18.08.0.tar.xz"; + sha256 = "1agmzlwy4izrmi58cf08cg34h155inmws3ghp524jz1li6rqvzfr"; + name = "kfourinline-18.08.0.tar.xz"; }; }; kgeography = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kgeography-18.04.3.tar.xz"; - sha256 = "1vkyghvibnslp45pabld063f762g4g9y0l7kxs287c3fblwpj23m"; - name = "kgeography-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgeography-18.08.0.tar.xz"; + sha256 = "0nj3lg8q84wvh1pypix619bdr9xm6s9s5vywciq8ggskqa2qrdc5"; + name = "kgeography-18.08.0.tar.xz"; }; }; kget = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kget-18.04.3.tar.xz"; - sha256 = "1j6p8rwjsb34919rlf1i236xc2r0yf5pl432bkpxrcavxvp3f565"; - name = "kget-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kget-18.08.0.tar.xz"; + sha256 = "0vpphsfgqa4h1bsj0k6lz591ymd5zy3ng86fl4l1qv36kh5b3sr4"; + name = "kget-18.08.0.tar.xz"; }; }; kgoldrunner = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kgoldrunner-18.04.3.tar.xz"; - sha256 = "1xj0269qk2pdxah5lk6cp0lgssi6qlczgsxcm97idyp3knrmnxr0"; - name = "kgoldrunner-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgoldrunner-18.08.0.tar.xz"; + sha256 = "13i3b8z2pbvh90ykv365s30az9r33is8wp8ys33kz88z26260rsv"; + name = "kgoldrunner-18.08.0.tar.xz"; }; }; kgpg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kgpg-18.04.3.tar.xz"; - sha256 = "1a1kc1nin0agrrqh4wysm019p02gcyj75xw0rx53db96xim1iczx"; - name = "kgpg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kgpg-18.08.0.tar.xz"; + sha256 = "12d6vqfcrgmqajk383p9gx9l49digm51km00slwkb15yjzgsjckx"; + name = "kgpg-18.08.0.tar.xz"; }; }; khangman = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/khangman-18.04.3.tar.xz"; - sha256 = "1yi1b15kh5z24bp10af2pgl029bbbgkn8gyzh3p5jy7qrykxqxj1"; - name = "khangman-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/khangman-18.08.0.tar.xz"; + sha256 = "0vcyak1pqq894d10jn4s8948fz8py6kjhgrbvjk2ksp28fzsb1q2"; + name = "khangman-18.08.0.tar.xz"; }; }; khelpcenter = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/khelpcenter-18.04.3.tar.xz"; - sha256 = "079yjhsi9nihn792ab03rg4far8l66v6ky7dhfrvrk78rv974ww6"; - name = "khelpcenter-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/khelpcenter-18.08.0.tar.xz"; + sha256 = "1ykw91s1w5953646ylxm49bq0bjgxd8yp29r09644q12qmi1w9ay"; + name = "khelpcenter-18.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kidentitymanagement-18.04.3.tar.xz"; - sha256 = "0yz435r86vm2w3b6bwdwxn7shwafpam0fh7qs3slmdlli60wgw8z"; - name = "kidentitymanagement-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kidentitymanagement-18.08.0.tar.xz"; + sha256 = "1rrdxbil0z0vmv0h0d6jdlwa3sfs3nncq39wmydhwx09phk7db85"; + name = "kidentitymanagement-18.08.0.tar.xz"; }; }; kig = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kig-18.04.3.tar.xz"; - sha256 = "0d459jkpc5x54w4gsrny7sx2103y5kpx6hm0zfyq7fiq1vsy57r4"; - name = "kig-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kig-18.08.0.tar.xz"; + sha256 = "0kgsar7sp3a7x72gnagi2hwajbl1yaaj493qjnwzlwidjjrlzmhb"; + name = "kig-18.08.0.tar.xz"; }; }; kigo = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kigo-18.04.3.tar.xz"; - sha256 = "1w4z04h072c7kf190r8h50rv3q7h6fwqcmckn83mfi9z0lbr9mqc"; - name = "kigo-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kigo-18.08.0.tar.xz"; + sha256 = "1ws0diq3kb8f15v30cj0hc0ii4d14dca7fb3p8vvm8r4ly7gqbdr"; + name = "kigo-18.08.0.tar.xz"; }; }; killbots = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/killbots-18.04.3.tar.xz"; - sha256 = "0vi2i1zaqfnni6608j46ppxsmzi44wcawbpp0l8cdb8bgbjbd1xd"; - name = "killbots-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/killbots-18.08.0.tar.xz"; + sha256 = "165g1zll7wq6gyz1lzaf1x17j2nagd66lj015qxifjpn9fd475mm"; + name = "killbots-18.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kimagemapeditor-18.04.3.tar.xz"; - sha256 = "1cdgfb4r4r3xpyw1dbk1alfyzgqdi718c2nrg30a1g8f450zh2zb"; - name = "kimagemapeditor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kimagemapeditor-18.08.0.tar.xz"; + sha256 = "1r3hngzvidv1yz7kd7l8l78gqdhjvw9smciv1vkzf7dk9qarlyfq"; + name = "kimagemapeditor-18.08.0.tar.xz"; }; }; kimap = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kimap-18.04.3.tar.xz"; - sha256 = "13k46xna99gg5h445xxkipv3dhyi8d1daj6c6kf28x8lvwrxpf1c"; - name = "kimap-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kimap-18.08.0.tar.xz"; + sha256 = "12lslmprwmibijlpwng4acmmhdfhm1dgvqsazbyvsr8jagkryxmq"; + name = "kimap-18.08.0.tar.xz"; }; }; kio-extras = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kio-extras-18.04.3.tar.xz"; - sha256 = "0k034a684wajs7b0j9vhkhd6aabn5b34y050m0s9xlnmi6xk2agj"; - name = "kio-extras-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kio-extras-18.08.0.tar.xz"; + sha256 = "1k5azz26zwsflnsgv4r0i8z8jph060wpksyqfpkz0vfsf3lv0k3n"; + name = "kio-extras-18.08.0.tar.xz"; }; }; kiriki = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kiriki-18.04.3.tar.xz"; - sha256 = "1vz9br7qi4amcpp1g0lxn90822n4da9n4svxm2inj70p0mr59bpf"; - name = "kiriki-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kiriki-18.08.0.tar.xz"; + sha256 = "1fciiq490iwcz86g9pqp8g0s40zf7a3zan132iqmscpl71hsv01b"; + name = "kiriki-18.08.0.tar.xz"; }; }; kiten = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kiten-18.04.3.tar.xz"; - sha256 = "1k21pwxg4wb6jph9a6srgas55xxfkix66qqz4hrpnapc7c18qh6p"; - name = "kiten-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kiten-18.08.0.tar.xz"; + sha256 = "1gzgfj0p0s5yjhwx6hldc8s0cs6p2bn5gd8sy29sicg13wjvhkmj"; + name = "kiten-18.08.0.tar.xz"; + }; + }; + kitinerary = { + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kitinerary-18.08.0.tar.xz"; + sha256 = "14jwlkfy9z6q2pnjmlcy5gihc75n6qnsck05zycs4qsxa4srpn0l"; + name = "kitinerary-18.08.0.tar.xz"; }; }; kjumpingcube = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kjumpingcube-18.04.3.tar.xz"; - sha256 = "0927j5k4pk03j2a7zf07w0594g5dagcb2hraf7b8dpjpzqxrjpv9"; - name = "kjumpingcube-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kjumpingcube-18.08.0.tar.xz"; + sha256 = "001a2ayl74hi89j8i3553qx0cs8w7f4myskq3qa01rg3w4pb3wl2"; + name = "kjumpingcube-18.08.0.tar.xz"; }; }; kldap = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kldap-18.04.3.tar.xz"; - sha256 = "1vjwial1v15f30bsjsi9z6hyr7a833z5hi6d2wim1cc7h1cl1p2v"; - name = "kldap-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kldap-18.08.0.tar.xz"; + sha256 = "1825146vi1lq1383qmn8ix70d2rc2cfwp95vpn4divf9aqwmc4x0"; + name = "kldap-18.08.0.tar.xz"; }; }; kleopatra = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kleopatra-18.04.3.tar.xz"; - sha256 = "0v70rqag7ljgcmny1fa6hlhmsc1g6965gh39gmcz1li61k6hb1ib"; - name = "kleopatra-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kleopatra-18.08.0.tar.xz"; + sha256 = "1wwjn2p2vblr6fdfcy1s5gf3h5cnclc4lj5vsi5cxyp7d86ij49c"; + name = "kleopatra-18.08.0.tar.xz"; }; }; klettres = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/klettres-18.04.3.tar.xz"; - sha256 = "0hky4wallpi2a8klwrmc2ln9lh5d3cnvdrn7kmw6prb7j7pwnm6g"; - name = "klettres-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klettres-18.08.0.tar.xz"; + sha256 = "1g84swzlynyl7r2ln52n7w9q0yf6540dd9hj3j0zsp1y2hb9fns8"; + name = "klettres-18.08.0.tar.xz"; }; }; klickety = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/klickety-18.04.3.tar.xz"; - sha256 = "0d53d4ajh1lpban2jp06bjhrvrmg2fl7jg40mdga9wwrv8g01bs1"; - name = "klickety-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klickety-18.08.0.tar.xz"; + sha256 = "1jrxabmnv0s38i255x7xycn12fgpkmr4p1y0ydk5x98zrv4vn8y0"; + name = "klickety-18.08.0.tar.xz"; }; }; klines = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/klines-18.04.3.tar.xz"; - sha256 = "0hz3id6sf85cdram42niqzrpynnx8xc4bj7imnl5dylhwdbxphhw"; - name = "klines-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/klines-18.08.0.tar.xz"; + sha256 = "14ks53xh6hhlrmiqa7a1f7z42i035qw3v72dpbc8bw20vg53bzpy"; + name = "klines-18.08.0.tar.xz"; }; }; kmag = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmag-18.04.3.tar.xz"; - sha256 = "00rs414p40002y68py1bdf08xcdib3x9zsinkv1iq07mbmr6smb1"; - name = "kmag-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmag-18.08.0.tar.xz"; + sha256 = "00ni6clpgwcr6b2yanmgplsb5jqmqxjiymd3572fkj7q8m17ak7f"; + name = "kmag-18.08.0.tar.xz"; }; }; kmahjongg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmahjongg-18.04.3.tar.xz"; - sha256 = "05bzk6rsfvpis0gqrxqhlwc77jclk6xhljlzyhs07qbm3ii7jmpc"; - name = "kmahjongg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmahjongg-18.08.0.tar.xz"; + sha256 = "0lflx8jxk2yv7bsywwmbk5l54gyhbyv65996fg82z6lw9hrr5wrb"; + name = "kmahjongg-18.08.0.tar.xz"; }; }; kmail = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmail-18.04.3.tar.xz"; - sha256 = "09a2s8w5i80x7h1rigl5a642fqp2xsmv53qm4hfajawn66mqfyz5"; - name = "kmail-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmail-18.08.0.tar.xz"; + sha256 = "1xj2z4ix9zba6k3cdnakr7f0nfij1z925j3vp0gimkgyvbcb28vr"; + name = "kmail-18.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmail-account-wizard-18.04.3.tar.xz"; - sha256 = "09g4r10vbkzz9gab4ihz95bah7qba10zbm57m8wdjbfr4nxm09sc"; - name = "kmail-account-wizard-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmail-account-wizard-18.08.0.tar.xz"; + sha256 = "1hc6zqys2qncljvsl9j48ns77kkq5zabj5a2kzg953dgcdv5x25r"; + name = "kmail-account-wizard-18.08.0.tar.xz"; }; }; kmailtransport = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmailtransport-18.04.3.tar.xz"; - sha256 = "0anmzg87amrxig58ax4jqv7m976cm5x8dr3cwcxwv5mwgp9zczz2"; - name = "kmailtransport-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmailtransport-18.08.0.tar.xz"; + sha256 = "0dfws0pzq3jf1h6j5qzjm96fz1ci4v57j4s9fbry10vyn4racpq8"; + name = "kmailtransport-18.08.0.tar.xz"; }; }; kmbox = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmbox-18.04.3.tar.xz"; - sha256 = "1mdshr9xll1sw5dr99jl4rfcwvghj4c2f39fs4x4c72dnkrijrw5"; - name = "kmbox-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmbox-18.08.0.tar.xz"; + sha256 = "11dh1lgjhiy4bvpvrk1rw23fgjil45ch3lazqc4jp21d1skrr1v4"; + name = "kmbox-18.08.0.tar.xz"; }; }; kmime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmime-18.04.3.tar.xz"; - sha256 = "1gf6a9kn88jnqrj7kj556yjk25anlaqcz8xrlffvg7b1y813wpcq"; - name = "kmime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmime-18.08.0.tar.xz"; + sha256 = "0kci9b2c67hzbl4hjwkkzk9j7g1l5wy1d8qrm1jwk8s7ccndindw"; + name = "kmime-18.08.0.tar.xz"; }; }; kmines = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmines-18.04.3.tar.xz"; - sha256 = "0659cxj89mb1gd7ikxqrghb3ylp8wsp07jcp2hbj842zmgy0wl65"; - name = "kmines-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmines-18.08.0.tar.xz"; + sha256 = "0z0fidlcp0kf9vmdgfyzrwi9yk5mfwhkzlqlbfy1631xisz158yn"; + name = "kmines-18.08.0.tar.xz"; }; }; kmix = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmix-18.04.3.tar.xz"; - sha256 = "0gcfy4p4csxdqscyclm3z5ahbrlpyrlbw8p7kci6h0gjpv605fv1"; - name = "kmix-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmix-18.08.0.tar.xz"; + sha256 = "084l5dpms26jwd894xnqr054hxjzlxcp2wm2rq37y3cbriia2xgh"; + name = "kmix-18.08.0.tar.xz"; }; }; kmousetool = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmousetool-18.04.3.tar.xz"; - sha256 = "106hqam2fhnhdzvsb79171v3fjw8rlcb04j9w5xs7q3j9avwk044"; - name = "kmousetool-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmousetool-18.08.0.tar.xz"; + sha256 = "0lcr8hpflaw5lrfydwi5sf069hfb19qifb7wh7qxh7j1b2z8w4gf"; + name = "kmousetool-18.08.0.tar.xz"; }; }; kmouth = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmouth-18.04.3.tar.xz"; - sha256 = "0hffqqcz4j3mp4vp5kc280ywq36r3y80q24i37swiqdd3fzyrlzq"; - name = "kmouth-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmouth-18.08.0.tar.xz"; + sha256 = "0naqn9pl7jldfna9l3i3kdv8rkw0nky4ppsvqghlrb9jf4dy8lfm"; + name = "kmouth-18.08.0.tar.xz"; }; }; kmplot = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kmplot-18.04.3.tar.xz"; - sha256 = "0j9ax6b2v0w7crjy8c9a84a2zcph7zx0ap0wwq7lnw45xwhynllv"; - name = "kmplot-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kmplot-18.08.0.tar.xz"; + sha256 = "0lvw351iz2gdzkphrf8hxgqbjqi4pqvxqk2zjbly4fzwbgk261bd"; + name = "kmplot-18.08.0.tar.xz"; }; }; knavalbattle = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/knavalbattle-18.04.3.tar.xz"; - sha256 = "1i6c5i0r2icpbn010k5jc6cb45ha7dgqhhvbbcgcsdqjcq042czx"; - name = "knavalbattle-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knavalbattle-18.08.0.tar.xz"; + sha256 = "0b21z3qqhsyafsa6rx9mc560hrw0046npqjmi5jpmczl6y9mr78q"; + name = "knavalbattle-18.08.0.tar.xz"; }; }; knetwalk = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/knetwalk-18.04.3.tar.xz"; - sha256 = "1r17c8hfj6qh1rx7apmpmb0cca0gsnq7jvjhz98if3kyy9m1fk50"; - name = "knetwalk-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knetwalk-18.08.0.tar.xz"; + sha256 = "04yfxxihfdqhrs126796k498v8valhd73q2bagcx59lj7iymxszj"; + name = "knetwalk-18.08.0.tar.xz"; }; }; knotes = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/knotes-18.04.3.tar.xz"; - sha256 = "02lx0vm34kcr6mix5d1i0dcaf229yafx58b915y3vjwml8n5v17w"; - name = "knotes-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/knotes-18.08.0.tar.xz"; + sha256 = "0dvjafmf57z10lx8fb4y4na73qq3dfmqfa2w01b3sdzns0nzaqig"; + name = "knotes-18.08.0.tar.xz"; }; }; kolf = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kolf-18.04.3.tar.xz"; - sha256 = "1k3z3nk6bgl9rlwjvc9jxwpyhd88amc2l1yg8f4rs6w0pbaldmwb"; - name = "kolf-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kolf-18.08.0.tar.xz"; + sha256 = "0bcd4k7v5sid98h95xbqm5l0dcjkv367mdgzhr6yizlqpyg6c132"; + name = "kolf-18.08.0.tar.xz"; }; }; kollision = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kollision-18.04.3.tar.xz"; - sha256 = "11czb7j0dzla5c9c4nk1qb5ljgci7x6ggyn6ffm2wvff4lm880m8"; - name = "kollision-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kollision-18.08.0.tar.xz"; + sha256 = "029pwgwmsm9m284m1sbi2zzhhwbz6rlq68jd783ir6cq2z3llvjp"; + name = "kollision-18.08.0.tar.xz"; }; }; kolourpaint = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kolourpaint-18.04.3.tar.xz"; - sha256 = "17jkyih99pqs2nqsf0rq35iks3y2kmnya71ihnw8930qgjakggxp"; - name = "kolourpaint-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kolourpaint-18.08.0.tar.xz"; + sha256 = "0p08xc8ai1cllbdwmv46xzcpv70mn6zwd4f62xsh71hhpg8fbqpi"; + name = "kolourpaint-18.08.0.tar.xz"; }; }; kompare = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kompare-18.04.3.tar.xz"; - sha256 = "1csjhnsic7h943kjrzixc0k79kn6w9ck29kw9qaz29khpi5bmn6v"; - name = "kompare-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kompare-18.08.0.tar.xz"; + sha256 = "0md4qw29q5mnsz0k4a3dl6fdgff33w4kg59qy02kp3pvqav9r1zx"; + name = "kompare-18.08.0.tar.xz"; }; }; konqueror = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/konqueror-18.04.3.tar.xz"; - sha256 = "08sw3vz57klr6wp1k2kjfj8hj02k4si39ncngvy005x2dkprkgc2"; - name = "konqueror-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konqueror-18.08.0.tar.xz"; + sha256 = "12zw4bgmmc35vghi8phm93x9lmhfgpxxfvz0grxa4gxcxqjyzzcq"; + name = "konqueror-18.08.0.tar.xz"; }; }; konquest = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/konquest-18.04.3.tar.xz"; - sha256 = "0pd3yxj3fmjp9p4gm4a3r107cx0rwgqg2pnwyfrdlrvppcc4is0g"; - name = "konquest-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konquest-18.08.0.tar.xz"; + sha256 = "0pvx4ss8dpxd6q4jnxim3pwyxjvhcy1xihn7s3513hy0h4wabv6s"; + name = "konquest-18.08.0.tar.xz"; }; }; konsole = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/konsole-18.04.3.tar.xz"; - sha256 = "00m0z9fjprnnnp7blr9nyz8s8xb781ry7qxd68c261ar5fajys1p"; - name = "konsole-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/konsole-18.08.0.tar.xz"; + sha256 = "1p119ky78zxi8l08xnfklrg21c6124q1fbjvbybf6l0qq3mzwy77"; + name = "konsole-18.08.0.tar.xz"; }; }; kontact = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kontact-18.04.3.tar.xz"; - sha256 = "1h8a9mdldq8hai3f2al56rs063s46lnsnmgbvd8dyk51si084aab"; - name = "kontact-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kontact-18.08.0.tar.xz"; + sha256 = "0027zinl9s92vxhlzv9mak9fgzygqw5ml6i6x659pl3mc889fr7j"; + name = "kontact-18.08.0.tar.xz"; }; }; kontactinterface = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kontactinterface-18.04.3.tar.xz"; - sha256 = "194g0y5kkax4c9ivc5yll5rqzpvd97s897agkzmr05wvk82gjrz6"; - name = "kontactinterface-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kontactinterface-18.08.0.tar.xz"; + sha256 = "0mcvpmvczqpsqj83vqfv9zwz7jj3az65nq45xg1l476j8sva278n"; + name = "kontactinterface-18.08.0.tar.xz"; }; }; kopete = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kopete-18.04.3.tar.xz"; - sha256 = "0c2s3qq9k4654q38q4gy6j3mkj1nnrc6jb4sk04hz3w5d9i6c82b"; - name = "kopete-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kopete-18.08.0.tar.xz"; + sha256 = "0g79zv187pj7c2p33qsnkpmvrxpcx1iiy9lcrdz3acgzgvpfh5dk"; + name = "kopete-18.08.0.tar.xz"; }; }; korganizer = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/korganizer-18.04.3.tar.xz"; - sha256 = "1bcmqki7491g8q9gaif346afrsn5k2zxp6xzwllaifxrbckzqaj1"; - name = "korganizer-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/korganizer-18.08.0.tar.xz"; + sha256 = "0qifd6l93jjj7sxf3kllm3dq13p738zlvbpxg24wzc3gllyq4ip1"; + name = "korganizer-18.08.0.tar.xz"; }; }; kpat = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kpat-18.04.3.tar.xz"; - sha256 = "0adx0720k296k0fzzsv4k32i0yii9snczsiir8gl3jj5ngk5hias"; - name = "kpat-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kpat-18.08.0.tar.xz"; + sha256 = "0dm9alimp2ibf5fpgbafiaz3lh9irvq2539jp6l61jqcv7801fml"; + name = "kpat-18.08.0.tar.xz"; }; }; kpimtextedit = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kpimtextedit-18.04.3.tar.xz"; - sha256 = "0fqlf4l05iybdnrzpp48wrg7qj9x303cfq2105d3p2zvwwkyrr41"; - name = "kpimtextedit-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kpimtextedit-18.08.0.tar.xz"; + sha256 = "0ciivvpfcsjzpc620zalx7k5ybh6bf53y19lvr1dgad29j6j871q"; + name = "kpimtextedit-18.08.0.tar.xz"; + }; + }; + kpkpass = { + version = "18.08.0"; + src = fetchurl { + url = "${mirror}/stable/applications/18.08.0/src/kpkpass-18.08.0.tar.xz"; + sha256 = "1wgycyx8nn9kaqbxvlps44g1nzr2qpr6mb7m22q5qcykly0i5wzl"; + name = "kpkpass-18.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kqtquickcharts-18.04.3.tar.xz"; - sha256 = "0zjy05kvl30j8nlwfpqyf4qqimbfagk9s3f92b9bxk7njnxjzhd9"; - name = "kqtquickcharts-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kqtquickcharts-18.08.0.tar.xz"; + sha256 = "0ykf5xfzjsanj5rmn5qrhhqfb93i19mrwzsqq8pngaimcqb70cdk"; + name = "kqtquickcharts-18.08.0.tar.xz"; }; }; krdc = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/krdc-18.04.3.tar.xz"; - sha256 = "0r57nfskwn1gwm4ig7z6cv04y4rhy5mq9bdd4ci8d9gq0s1rc13x"; - name = "krdc-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/krdc-18.08.0.tar.xz"; + sha256 = "03j3cn088mr8cd6vjkv19k5ayrhgh9mbyr0lkj9rr16z6861avmr"; + name = "krdc-18.08.0.tar.xz"; }; }; kreversi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kreversi-18.04.3.tar.xz"; - sha256 = "09zcl0vzzwc4crzlrrvi7kmbk9xh0h5hy9yyv9bk661pw66nv980"; - name = "kreversi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kreversi-18.08.0.tar.xz"; + sha256 = "18qqfaxb34b0z6cdz9h2z0hkmr1vv85j7ra8gzhy35k40dgvhgqm"; + name = "kreversi-18.08.0.tar.xz"; }; }; krfb = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/krfb-18.04.3.tar.xz"; - sha256 = "0i36lj7lggl83khds009wp12d21rin60ai2a24isyplvcq8p2slk"; - name = "krfb-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/krfb-18.08.0.tar.xz"; + sha256 = "1zaran8lbhrnlr2nz12xis4b7q0krynzqyix14diiiysrfsmnwqm"; + name = "krfb-18.08.0.tar.xz"; }; }; kross-interpreters = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kross-interpreters-18.04.3.tar.xz"; - sha256 = "04wrary04sznjaw2n3d2fjnnhzf1fykj9l3r9dry1irj9ysx45yd"; - name = "kross-interpreters-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kross-interpreters-18.08.0.tar.xz"; + sha256 = "1g3fgva8h0s1ld38m38iawjr04bsh572lazizr9a460nwk60nmsi"; + name = "kross-interpreters-18.08.0.tar.xz"; }; }; kruler = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kruler-18.04.3.tar.xz"; - sha256 = "014c0m388kjfpynvh14m463jl3vj288lcdiz3xfphlmxqlhhvhcd"; - name = "kruler-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kruler-18.08.0.tar.xz"; + sha256 = "0fv3186xhyvfi9zz48r4facy9x8m8y53qfl7x1rs0y1hq2d2k3nh"; + name = "kruler-18.08.0.tar.xz"; }; }; kshisen = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kshisen-18.04.3.tar.xz"; - sha256 = "04xzg2v957wx68wmf1ri30vajd5pr9xz2fh7f5xg394m134cxc9r"; - name = "kshisen-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kshisen-18.08.0.tar.xz"; + sha256 = "11q717m7m37902bchbgpdgsward4w2c9bwjns3xs4c3pyx1w7mg4"; + name = "kshisen-18.08.0.tar.xz"; }; }; ksirk = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksirk-18.04.3.tar.xz"; - sha256 = "1p08f9w3vi1z31fydnvp9d069z82kv8fn9lwlw1mxkqaggv54jhs"; - name = "ksirk-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksirk-18.08.0.tar.xz"; + sha256 = "1wxf1g5vfcnvz9n28ja17iawc1997vhz6p75bq84jmls51pxjkzn"; + name = "ksirk-18.08.0.tar.xz"; }; }; ksmtp = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksmtp-18.04.3.tar.xz"; - sha256 = "0p8rnqpb0q26iwjk4k9pj4krfqipijg90bv0hd4wa3d2plkvzmcy"; - name = "ksmtp-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksmtp-18.08.0.tar.xz"; + sha256 = "13jkxrlycgk9qqw5v16i1rax8lwany7fd1n6m2875saxmjm9qi0s"; + name = "ksmtp-18.08.0.tar.xz"; }; }; ksnakeduel = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksnakeduel-18.04.3.tar.xz"; - sha256 = "1mhgdd0hnv0y36af3rikdibc0hgp1sjdxbx543vlxi25l8dfsw6q"; - name = "ksnakeduel-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksnakeduel-18.08.0.tar.xz"; + sha256 = "0ixbv4b9ngb82f4s58hzjvmmifkjy5v59g76kpb5dv9nqb9x8833"; + name = "ksnakeduel-18.08.0.tar.xz"; }; }; kspaceduel = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kspaceduel-18.04.3.tar.xz"; - sha256 = "06mzg1hmhwisd0vc99qdrxp7jgay4cqda2x142i2a1v5qs48ilk4"; - name = "kspaceduel-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kspaceduel-18.08.0.tar.xz"; + sha256 = "0qw3lkiwwrzicyqqr6fs78ljhn5z4vsvcvcn9l5j18qkmi2fd2dk"; + name = "kspaceduel-18.08.0.tar.xz"; }; }; ksquares = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksquares-18.04.3.tar.xz"; - sha256 = "1w4x8br9g5dlw7mc8n118lqq0g5p4n2lqijp17xcgznbllivf79g"; - name = "ksquares-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksquares-18.08.0.tar.xz"; + sha256 = "01g9jkd5cq1ga9k9brr8yiny3idmj88c4n1cm2qi10d9n1vd4fja"; + name = "ksquares-18.08.0.tar.xz"; }; }; ksudoku = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksudoku-18.04.3.tar.xz"; - sha256 = "095i8s3ggl51xncra66vhdrz494r5q55d57j53pqnc4cwnfl5glj"; - name = "ksudoku-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksudoku-18.08.0.tar.xz"; + sha256 = "0fc7d6bs0ba51nypx4bn5hylfx9h6xlam7wjw1i7fr2yr8fdv9id"; + name = "ksudoku-18.08.0.tar.xz"; }; }; ksystemlog = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ksystemlog-18.04.3.tar.xz"; - sha256 = "117gxwlimqp7sslrkaf6jazhprplqqkbqrfrjdwm54l84dldfi34"; - name = "ksystemlog-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ksystemlog-18.08.0.tar.xz"; + sha256 = "1m5y8rawhi03vnpdw75npdd7hc830a5b2kkrz1112g959psv00ah"; + name = "ksystemlog-18.08.0.tar.xz"; }; }; kteatime = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kteatime-18.04.3.tar.xz"; - sha256 = "12fikkj87yz8xj8l3girsfqkbngvg0jjw661hihgnjz6jg7jdq0k"; - name = "kteatime-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kteatime-18.08.0.tar.xz"; + sha256 = "18pm15s7q4xwzi61m2l8k6qplf948lq36iv9nh5sf4p6vp6syay2"; + name = "kteatime-18.08.0.tar.xz"; }; }; ktimer = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktimer-18.04.3.tar.xz"; - sha256 = "1bf3r4kfg85hgmsszpz57fhws7mw79wxkb6qigfcq4vv165axjd2"; - name = "ktimer-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktimer-18.08.0.tar.xz"; + sha256 = "0g81daqdmfsmbnzjq74zxrbnjxjbi6nd6kl0acmjg7832l30m4js"; + name = "ktimer-18.08.0.tar.xz"; }; }; ktnef = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktnef-18.04.3.tar.xz"; - sha256 = "08zdl982gkk619gi05xvs28q26xjsrvawgpbmrmkwikj5m80asf4"; - name = "ktnef-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktnef-18.08.0.tar.xz"; + sha256 = "007gjmjyi5r8110w4fv7n5gl67ddn1dg0pb119qr3r82iba8qiqi"; + name = "ktnef-18.08.0.tar.xz"; }; }; ktouch = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktouch-18.04.3.tar.xz"; - sha256 = "1j6byxhprwrsd4bb3g3mwps5v1cc73h447dxzrd84ghk3jv687jl"; - name = "ktouch-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktouch-18.08.0.tar.xz"; + sha256 = "0pgckza5cn52aapa39d12dighx698jzb877iiml2n9870whifkms"; + name = "ktouch-18.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-accounts-kcm-18.04.3.tar.xz"; - sha256 = "0dlgammp5j1idlmv69dq54fyc2dm6cd2gv5spimydznxp5bcfl3v"; - name = "ktp-accounts-kcm-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-accounts-kcm-18.08.0.tar.xz"; + sha256 = "16k7dprj75g2lgsmnnmn9n6zgwnp64zsjci5y2vk0cp8ndlr1j54"; + name = "ktp-accounts-kcm-18.08.0.tar.xz"; }; }; ktp-approver = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-approver-18.04.3.tar.xz"; - sha256 = "0f2y86khv4ps2xnh8aizf3q52s0c1nxnvkrpii5qm9vk8agp8yfz"; - name = "ktp-approver-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-approver-18.08.0.tar.xz"; + sha256 = "1nh75yzprhbn0af33qsrs81vxk1brlxjf1jal7p8fpr47qdwhzvd"; + name = "ktp-approver-18.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-auth-handler-18.04.3.tar.xz"; - sha256 = "07apdk2zf0mqii8khphf6whblwals8p1yqjs6vxry89mmr5znni7"; - name = "ktp-auth-handler-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-auth-handler-18.08.0.tar.xz"; + sha256 = "0akmbrn9z0ind3jmz2azixyvr9glai66j6dynszn59svvjxp0fiz"; + name = "ktp-auth-handler-18.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-call-ui-18.04.3.tar.xz"; - sha256 = "1zkvkskfparc1bfvn1xhymz2pm50iws6k098bxrz86a6cgrqxw75"; - name = "ktp-call-ui-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-call-ui-18.08.0.tar.xz"; + sha256 = "0z23vcvz6nyc6klqqys4ivh33j21kww4fgcm5dvvlf940cc9gr3h"; + name = "ktp-call-ui-18.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-common-internals-18.04.3.tar.xz"; - sha256 = "1j5avk09xakh0g84lnxz3p11fhjb5lf1sxic423hamwgwlr181nl"; - name = "ktp-common-internals-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-common-internals-18.08.0.tar.xz"; + sha256 = "1sj1k8x8d2lk8xsqckjzg6zz01gqh3yj52yar56lngn1cjnnf6ak"; + name = "ktp-common-internals-18.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-contact-list-18.04.3.tar.xz"; - sha256 = "0zyl1d4k74lrdx3hsib7miijjk2zj3x1yakryrym4lk3pmllrd78"; - name = "ktp-contact-list-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-list-18.08.0.tar.xz"; + sha256 = "0yx64rz6k5dv6s4wsadjqc0fcx6j7blhy15cbnh8r2pbwf0ilk2w"; + name = "ktp-contact-list-18.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-contact-runner-18.04.3.tar.xz"; - sha256 = "1nzz88m8mb2xwpl5fzh7srslzrci2265n759kczjlzj7w1wym504"; - name = "ktp-contact-runner-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-contact-runner-18.08.0.tar.xz"; + sha256 = "0i4zc6bksnb4iajz91wbw140dh7p0rg3hzhi563pn3siy9id442s"; + name = "ktp-contact-runner-18.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-desktop-applets-18.04.3.tar.xz"; - sha256 = "1y0g3922km9a71splnx91nhvpwi2gj1jqxbzzsqsckblh2gzf0m3"; - name = "ktp-desktop-applets-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-desktop-applets-18.08.0.tar.xz"; + sha256 = "0i5sniidcgkvq2scf76pkshrj89gvkzjjslgqaxvqrgvyagsaski"; + name = "ktp-desktop-applets-18.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-filetransfer-handler-18.04.3.tar.xz"; - sha256 = "165mfk1ld1py2rp3j0xah1zi2f5b73ic53a043mmhs4lws5fw3f9"; - name = "ktp-filetransfer-handler-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-filetransfer-handler-18.08.0.tar.xz"; + sha256 = "15mifrbxxr8lvq7nflxwsz46ywnqmjv1d3irzq1xfcpl47907qhg"; + name = "ktp-filetransfer-handler-18.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-kded-module-18.04.3.tar.xz"; - sha256 = "1z2103q6lx4f51ipm2kmla5h8civhf0wy0yk0zg4akynshqjhr6n"; - name = "ktp-kded-module-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-kded-module-18.08.0.tar.xz"; + sha256 = "12rnnf2nm2kn2904b475qh9ql50yx583jga31389l012whm4gqqf"; + name = "ktp-kded-module-18.08.0.tar.xz"; }; }; ktp-send-file = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-send-file-18.04.3.tar.xz"; - sha256 = "1d1ha9nigipr7khaymp7jiixj27d18qk7ghf1zaywyrrf2sav286"; - name = "ktp-send-file-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-send-file-18.08.0.tar.xz"; + sha256 = "0m8p8w4hqanccf7g0za5yh30z2nxv8dxi09mg1fniypqaw4cp2n7"; + name = "ktp-send-file-18.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktp-text-ui-18.04.3.tar.xz"; - sha256 = "0xglzifmqcrjxd3iz0v8a0rv2kaldsz12rn0hjh905j53s69xqic"; - name = "ktp-text-ui-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktp-text-ui-18.08.0.tar.xz"; + sha256 = "04ygny9m823h30hi5qgjz1nk7dj44hdqa9ga0ai9cazxnavvsx57"; + name = "ktp-text-ui-18.08.0.tar.xz"; }; }; ktuberling = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/ktuberling-18.04.3.tar.xz"; - sha256 = "0a7i3k386nr5gmmgpqp2gjpca8qh6w30x69w2w46mcw9qffm3s4b"; - name = "ktuberling-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/ktuberling-18.08.0.tar.xz"; + sha256 = "1m9mdv7hdsrnzjcdnmqrl82mafa9psbr5k7b6m3llh95f61b4jpn"; + name = "ktuberling-18.08.0.tar.xz"; }; }; kturtle = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kturtle-18.04.3.tar.xz"; - sha256 = "1iaklkzfcrqhxh7jwgxg8kvpcxhia8l0hm6q14wc4nf3k72cgz8l"; - name = "kturtle-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kturtle-18.08.0.tar.xz"; + sha256 = "0mwhnsbwj92zrgyjdfi18pxsfyaxa8pzdmh5k20m0jrh76gkhjr0"; + name = "kturtle-18.08.0.tar.xz"; }; }; kubrick = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kubrick-18.04.3.tar.xz"; - sha256 = "1da3n4sgpx1k90cn90558yjfqp8wyirvmi1dzicy8l0jfl4rwr1d"; - name = "kubrick-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kubrick-18.08.0.tar.xz"; + sha256 = "1affzpwq45r1cqb9ra8w24rrszvvzxiik4ng6jf54dik8sk7wrnn"; + name = "kubrick-18.08.0.tar.xz"; }; }; kwalletmanager = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kwalletmanager-18.04.3.tar.xz"; - sha256 = "1n5f150mxx4i3aq62xi67c99p68nwwsiih3i36i1rrmy87w44iyi"; - name = "kwalletmanager-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwalletmanager-18.08.0.tar.xz"; + sha256 = "10yri44d68n6hc4dn78wgqzw394krwjqr6azwd6qgxjp6asc8n69"; + name = "kwalletmanager-18.08.0.tar.xz"; }; }; kwave = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kwave-18.04.3.tar.xz"; - sha256 = "1h6lqyxzccbsprap2lypan2bs451vyp1z0d4ipbim1ayqyqi5zw9"; - name = "kwave-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwave-18.08.0.tar.xz"; + sha256 = "0aimhn8hgjnwhv0j2hiyiqgh5bslm7rs13yc8sk0kh1vix6909mp"; + name = "kwave-18.08.0.tar.xz"; }; }; kwordquiz = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/kwordquiz-18.04.3.tar.xz"; - sha256 = "0vl8afd3186w51p3bhlqzi0wipm0p6bl40vm298473ixgpbxbaj6"; - name = "kwordquiz-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/kwordquiz-18.08.0.tar.xz"; + sha256 = "1aghybg72anwj6vz3s3zr5i5wflackvfwl9n39mvxddm4ajnw1km"; + name = "kwordquiz-18.08.0.tar.xz"; }; }; libgravatar = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libgravatar-18.04.3.tar.xz"; - sha256 = "0s8y6v5b6b5lmyjxwhwl3fnn94z8v17q765xiq0g73i7lp5jz0bq"; - name = "libgravatar-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libgravatar-18.08.0.tar.xz"; + sha256 = "0yqd99lax1w5r1fy4rmbv9lk988zvq2yydkrdgh8vymxjljg5xa4"; + name = "libgravatar-18.08.0.tar.xz"; }; }; libkcddb = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkcddb-18.04.3.tar.xz"; - sha256 = "0nk7d6apl57rdnfma525yn3xrgw01hhj08gb3cylvysl5nf8nn0m"; - name = "libkcddb-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkcddb-18.08.0.tar.xz"; + sha256 = "1ns90vcbp21mwsbvndmk97fpd8n7152iw783q7bqfy1n3ggzkz5x"; + name = "libkcddb-18.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkcompactdisc-18.04.3.tar.xz"; - sha256 = "00xw6ggc4lgyw88jv52wxw2kig7ass1f7fbdd644cbhq2dvx7khd"; - name = "libkcompactdisc-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkcompactdisc-18.08.0.tar.xz"; + sha256 = "0pgn65knay7fgk2zdgqd29wfhqk9x4zlpp4ywjwb2zsvzz51j9f8"; + name = "libkcompactdisc-18.08.0.tar.xz"; }; }; libkdcraw = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkdcraw-18.04.3.tar.xz"; - sha256 = "1mkrr0bb89k13chy1y9r6aqsjrdvm125k0ms3pjf7gc3xa6g7vk7"; - name = "libkdcraw-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdcraw-18.08.0.tar.xz"; + sha256 = "0xpkkgxsmvrldnprzqrxaz67jb5cv6vndg8flbkagvp0s7mnw56x"; + name = "libkdcraw-18.08.0.tar.xz"; }; }; libkdegames = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkdegames-18.04.3.tar.xz"; - sha256 = "0nnr9rnsgpc13hj4ii126lpss8d7d18wnrr9n85yf6ngcg9h3gk7"; - name = "libkdegames-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdegames-18.08.0.tar.xz"; + sha256 = "1jl3snqyg3p3l4hddg7ag2mkgi49qvzml8p82zdn3sf5fhka1g70"; + name = "libkdegames-18.08.0.tar.xz"; }; }; libkdepim = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkdepim-18.04.3.tar.xz"; - sha256 = "0mqrjhmv1g2ch4jgihcg1d8fn7qxjkxnw2fh6a2cnn4b827n3v2l"; - name = "libkdepim-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkdepim-18.08.0.tar.xz"; + sha256 = "1gfwfmr5iqkwb490d3mm32892q47pc73b6c8zygm7mn5cjb5376l"; + name = "libkdepim-18.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkeduvocdocument-18.04.3.tar.xz"; - sha256 = "1x2dpbpd7f71ws11zrrinyydg25728niglypa4dwvl09d5v0lhwz"; - name = "libkeduvocdocument-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkeduvocdocument-18.08.0.tar.xz"; + sha256 = "1i5vmjfczd71654cpxd11djwk852aqg5lkn98pa8qvjy7v85jynn"; + name = "libkeduvocdocument-18.08.0.tar.xz"; }; }; libkexiv2 = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkexiv2-18.04.3.tar.xz"; - sha256 = "095ijxk55zw07j5y678dz1pipd0va4p57r9zvkqlfzd41bsi0a3c"; - name = "libkexiv2-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkexiv2-18.08.0.tar.xz"; + sha256 = "0cdh5wd2lvm9m4nyz2yv5ksszk1pc8ajzwq9c467m74lvb1p2had"; + name = "libkexiv2-18.08.0.tar.xz"; }; }; libkgapi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkgapi-18.04.3.tar.xz"; - sha256 = "0ixpnmli4z8qahw9br931b6py3wybqzlrnm3n7gms287phc11yjc"; - name = "libkgapi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkgapi-18.08.0.tar.xz"; + sha256 = "1aax7djyp1104b8sbrpfhf5c8j30g3hac973lpblfqg0yhkd9lw0"; + name = "libkgapi-18.08.0.tar.xz"; }; }; libkgeomap = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkgeomap-18.04.3.tar.xz"; - sha256 = "0kicd6s6gfz3q1q45adnp6ri03sd69phs7ag3pnssyagk0y51igl"; - name = "libkgeomap-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkgeomap-18.08.0.tar.xz"; + sha256 = "00hjz7amg2rf5s74465s44ac6kd33q4mvsa9ynpljisll5avlhan"; + name = "libkgeomap-18.08.0.tar.xz"; }; }; libkipi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkipi-18.04.3.tar.xz"; - sha256 = "1lyh9kg9s17nrc61bv6xzal5fd5y2shwn2d69xrlxh17akajbi7i"; - name = "libkipi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkipi-18.08.0.tar.xz"; + sha256 = "1g34ryzr4vx5657c4j4w3b57n5ir6miwp1k60qk7av73qsik7a7d"; + name = "libkipi-18.08.0.tar.xz"; }; }; libkleo = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkleo-18.04.3.tar.xz"; - sha256 = "0m9sgksxr47lhh7810n3fprj08vk62cradl5zwf0c89dsbicap5a"; - name = "libkleo-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkleo-18.08.0.tar.xz"; + sha256 = "0vscfz794yp9hnrn4r4phbip2mqi3jvi41m5mpjd5pw11644d66c"; + name = "libkleo-18.08.0.tar.xz"; }; }; libkmahjongg = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkmahjongg-18.04.3.tar.xz"; - sha256 = "16m1jid7d920bn1s1zbd44mhl07db4n921fcxv95j5rswndb7lwn"; - name = "libkmahjongg-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkmahjongg-18.08.0.tar.xz"; + sha256 = "0xzv7vawwq0gm10h9mfrsy5m5zpk1n3s338al0h9vskvhznphy83"; + name = "libkmahjongg-18.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libkomparediff2-18.04.3.tar.xz"; - sha256 = "1ks9cajyvwnfxr829arkz8ajf3j2vw2rqfj2mfha6l0hap6ha6p1"; - name = "libkomparediff2-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libkomparediff2-18.08.0.tar.xz"; + sha256 = "0nx66198vn6zrv012i4p2ghc2slxqccfb3fhd9zszzpnyd08zs27"; + name = "libkomparediff2-18.08.0.tar.xz"; }; }; libksane = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libksane-18.04.3.tar.xz"; - sha256 = "0qfal3d8bbq61v7zfcb8hqiki6z6qx7p59xnkbgqfaif77nhnwwj"; - name = "libksane-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libksane-18.08.0.tar.xz"; + sha256 = "09wx6haaw0rjcjdh2c05b2zrpz57zlhx9x9jy9hw28byrf71i0k0"; + name = "libksane-18.08.0.tar.xz"; }; }; libksieve = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/libksieve-18.04.3.tar.xz"; - sha256 = "0ckncvccf02agvs0m7s9xxjmcjwh3fpywig25pk2ji8va1y5z5yl"; - name = "libksieve-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/libksieve-18.08.0.tar.xz"; + sha256 = "0xnjw2q1hlmrlzdi776459v5w3l88bxpzzpqc93xmq39xh7xqq7b"; + name = "libksieve-18.08.0.tar.xz"; }; }; lokalize = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/lokalize-18.04.3.tar.xz"; - sha256 = "052aqw0z3ap34c9r7r0imidn9iqn0fd2vg7yjpqvi4yy3zv8wjc4"; - name = "lokalize-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/lokalize-18.08.0.tar.xz"; + sha256 = "17h634abxzg3kx182qxdx6gyz0knl61yn32nlf76l0cv0bqc2xz5"; + name = "lokalize-18.08.0.tar.xz"; }; }; lskat = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/lskat-18.04.3.tar.xz"; - sha256 = "1qi8d06qjjz16ra6svmcl6dfvknls0r42man20nm439nchk4m58y"; - name = "lskat-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/lskat-18.08.0.tar.xz"; + sha256 = "05ckhh8270hjj94ks9zg6pypa2dm1d2r4l219gq456rrhyj9zv13"; + name = "lskat-18.08.0.tar.xz"; }; }; mailcommon = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/mailcommon-18.04.3.tar.xz"; - sha256 = "0g2skri3kajyb5hh0c6qakhbqapnd1zh5labrpi38cygq8b6pnfh"; - name = "mailcommon-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mailcommon-18.08.0.tar.xz"; + sha256 = "06j66326wbvgnmacmbhvszbhdcw6h3pzxwcnbbz66n0zz2y4m5gd"; + name = "mailcommon-18.08.0.tar.xz"; }; }; mailimporter = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/mailimporter-18.04.3.tar.xz"; - sha256 = "1pzib2m8048x174wzf1r67x0mjqwhpkv2jsbirlvwiwsyvvia7ix"; - name = "mailimporter-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mailimporter-18.08.0.tar.xz"; + sha256 = "0gywzd882mkjf9q07wg2hi4js4gqvyjxf3y0lgq22k5bd5gpfxbs"; + name = "mailimporter-18.08.0.tar.xz"; }; }; marble = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/marble-18.04.3.tar.xz"; - sha256 = "1psg2qyzmqg1yvxn33rb10ybby0fs3njmrcjbjw58yvqv9q78lkz"; - name = "marble-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/marble-18.08.0.tar.xz"; + sha256 = "1ylcdnf0rw0a51jcy183p9xcir4j7jlm6dmhk4k13zvzv16pcwvf"; + name = "marble-18.08.0.tar.xz"; }; }; mbox-importer = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/mbox-importer-18.04.3.tar.xz"; - sha256 = "0jjdrl5a1jp3al2vqilaba5239vi3l3s5f0rwk853k0c2gqsm79j"; - name = "mbox-importer-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/mbox-importer-18.08.0.tar.xz"; + sha256 = "08n46q2xxvjbbcr4754x7qw4p3yffmrpvzxi7k2i48ifxhs2awqj"; + name = "mbox-importer-18.08.0.tar.xz"; }; }; messagelib = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/messagelib-18.04.3.tar.xz"; - sha256 = "025b2ldpayasa6hyfd0zy5hca1cq6xs3pc7j992rv9xwkgmb47wn"; - name = "messagelib-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/messagelib-18.08.0.tar.xz"; + sha256 = "0d1bb0n9izwlk9fbwyf1hvwkrng1b6im574fxpkgk73ivb72ppfx"; + name = "messagelib-18.08.0.tar.xz"; }; }; minuet = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/minuet-18.04.3.tar.xz"; - sha256 = "1r4ipkda2jibs0p1xq1s8aggzr5fz0sll94dqrqb7hgfihhmz052"; - name = "minuet-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/minuet-18.08.0.tar.xz"; + sha256 = "0gvla9ig912wrg6vvdmqv2hyybr08a45crx69l31hcd13h9pmyg6"; + name = "minuet-18.08.0.tar.xz"; }; }; okular = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/okular-18.04.3.tar.xz"; - sha256 = "0jjmqbwwbrg2svy487dln1lgc0ch80qpnsx8z1ksai3i015ns7f5"; - name = "okular-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/okular-18.08.0.tar.xz"; + sha256 = "11wwh0vb1l2dw2zhcg6f92y7vb5i5kaqwi8kszz8sd874ydpp8pn"; + name = "okular-18.08.0.tar.xz"; }; }; palapeli = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/palapeli-18.04.3.tar.xz"; - sha256 = "08llmn4g119fr0ar733xsjwfznk62qz0d0cxjz5h06nz4l06rzzz"; - name = "palapeli-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/palapeli-18.08.0.tar.xz"; + sha256 = "1a1k44q62raw1kxkyg8cspvwxzr1islbwzcb7sj63cmzsmwfhkg1"; + name = "palapeli-18.08.0.tar.xz"; }; }; parley = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/parley-18.04.3.tar.xz"; - sha256 = "1ynwlzj20vybzmgxb50v7dxkm7hjjc58lw82lvwhh94igklq6mjv"; - name = "parley-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/parley-18.08.0.tar.xz"; + sha256 = "1cy58fs1jaz1zga4dwfr80m0p6cgzc5ip26ds2x2lpygx7pbjcc6"; + name = "parley-18.08.0.tar.xz"; }; }; picmi = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/picmi-18.04.3.tar.xz"; - sha256 = "0x3mg8s0dm0p2vzqvcc9ini7af8pdg3y28y02bqs7v2z9gml0hfl"; - name = "picmi-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/picmi-18.08.0.tar.xz"; + sha256 = "1x2ya0vwxwc56rfskl3l83nw0vpdh1lzshh0sdal3rfw0s8w895x"; + name = "picmi-18.08.0.tar.xz"; }; }; pimcommon = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/pimcommon-18.04.3.tar.xz"; - sha256 = "0v3glgpvymddmdkfs1gcqmlh4ifk9kyhsqz2nyvyr7b8f38drjdj"; - name = "pimcommon-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pimcommon-18.08.0.tar.xz"; + sha256 = "1j6pj7f52ya0jgzq97g65zl3mpv7hn002flv35qlg5srzdllm3pd"; + name = "pimcommon-18.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/pim-data-exporter-18.04.3.tar.xz"; - sha256 = "1ky6igdfr15vhfpjg1nv60zbc4fwi8b5vwkign911qimk9alga7j"; - name = "pim-data-exporter-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pim-data-exporter-18.08.0.tar.xz"; + sha256 = "1spbkwv9kqzky958nymr5plz8rgzxbn6xzgy7k9pkpvynd1a54hz"; + name = "pim-data-exporter-18.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/pim-sieve-editor-18.04.3.tar.xz"; - sha256 = "1pa4z67chyacds6adi53ccdfmr5jhsd3vgpgk0wdmkn82353nvzn"; - name = "pim-sieve-editor-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/pim-sieve-editor-18.08.0.tar.xz"; + sha256 = "0nqv530rlamlngxwy3cpbyjj75akx3k9lcifgymlbm4ipp9k125c"; + name = "pim-sieve-editor-18.08.0.tar.xz"; }; }; poxml = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/poxml-18.04.3.tar.xz"; - sha256 = "0wi7m1021vj2lama6iqkpsdzx5d4s5h0sbwnf7y5p5k59g7la7rf"; - name = "poxml-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/poxml-18.08.0.tar.xz"; + sha256 = "04sy8v3n12asz8hfh107y5irhxzlpkzgc3zjw8qfygflzg9a48cz"; + name = "poxml-18.08.0.tar.xz"; }; }; print-manager = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/print-manager-18.04.3.tar.xz"; - sha256 = "1ml3jdpz60dhgrcpd05bzs736a65mqkglvvzikkaai0r9wwv4n3k"; - name = "print-manager-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/print-manager-18.08.0.tar.xz"; + sha256 = "1mi2aqsh5irlnlgkajkkxhazyafhpndrxckcc2kmrh00d4cxhivn"; + name = "print-manager-18.08.0.tar.xz"; }; }; rocs = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/rocs-18.04.3.tar.xz"; - sha256 = "1wx5h09vkpkyg4h3wcnkq8ks6mg9f1h7l5dzv1dpq8shyr9bnnr8"; - name = "rocs-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/rocs-18.08.0.tar.xz"; + sha256 = "1c3i11mg6xs64wjyph51hqr6j428hh71ljdq4ajhysql7l5kbhhx"; + name = "rocs-18.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/signon-kwallet-extension-18.04.3.tar.xz"; - sha256 = "1f8x0lf0zy18mxkjc11k1j0llqnc3mrn0fnd4ag6qfvx7bhz16fd"; - name = "signon-kwallet-extension-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/signon-kwallet-extension-18.08.0.tar.xz"; + sha256 = "024ay0z9inbf7k54iq5v78cxh4q8x1ypvd8r3w80dyygjw2dw743"; + name = "signon-kwallet-extension-18.08.0.tar.xz"; }; }; spectacle = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/spectacle-18.04.3.tar.xz"; - sha256 = "1qjvq5df0syl7syqdwfl3xh38gz1fysib2a0mnigv1hnln1w0p2b"; - name = "spectacle-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/spectacle-18.08.0.tar.xz"; + sha256 = "1gc2qza529jld1zngzs98zmd3734h13phviswqpg93qnbr9hxskr"; + name = "spectacle-18.08.0.tar.xz"; }; }; step = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/step-18.04.3.tar.xz"; - sha256 = "0a370sp71xk8s091qsal3jg4f23wydfy4fccf38craz0wdy6km4q"; - name = "step-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/step-18.08.0.tar.xz"; + sha256 = "15hjbisv3adsn0vavlcl3iy3vz6mf1fv0qj4ykmxckblcyhm1mgg"; + name = "step-18.08.0.tar.xz"; }; }; svgpart = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/svgpart-18.04.3.tar.xz"; - sha256 = "1c2j3p2blvzwlaipgjby7pzaflpzp0pbnnda81lgwbh7blin9k0k"; - name = "svgpart-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/svgpart-18.08.0.tar.xz"; + sha256 = "0q71nn1xsdh7ag60szl836lif9ywnv3dlv8w0sn3zfa7yv0cbraa"; + name = "svgpart-18.08.0.tar.xz"; }; }; sweeper = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/sweeper-18.04.3.tar.xz"; - sha256 = "0v86pil9krziz2wbvzj6x7ivq505iy4lx4zjrgpxw2dxmyyp338c"; - name = "sweeper-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/sweeper-18.08.0.tar.xz"; + sha256 = "1j87cb9bbfn42f2xn9k6j8ailgn18b5ribjf4sgglx2h1l3vpq51"; + name = "sweeper-18.08.0.tar.xz"; }; }; syndication = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/syndication-18.04.3.tar.xz"; - sha256 = "1gfimm9x1j079j4q4d51z9nz4x3khlwzjywrip2paxmfrsjcca0g"; - name = "syndication-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/syndication-18.08.0.tar.xz"; + sha256 = "17j3ks7bmr3p71lvrm8bzbfai5sw3frwrwl0ckbg1rwhkbsi3d71"; + name = "syndication-18.08.0.tar.xz"; }; }; umbrello = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/umbrello-18.04.3.tar.xz"; - sha256 = "1w46dys13cl29xh3d1fjp2xh09vmsq45bdifwsa1zjlqi0iiw0h1"; - name = "umbrello-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/umbrello-18.08.0.tar.xz"; + sha256 = "0rs92l6disjha8w5nx05qjbidib4a9yyab7f4cd4sjnjfcw3i1px"; + name = "umbrello-18.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "18.04.3"; + version = "18.08.0"; src = fetchurl { - url = "${mirror}/stable/applications/18.04.3/src/zeroconf-ioslave-18.04.3.tar.xz"; - sha256 = "0mi0kx6gklddj37qzz04n399ijqpzl536z9x1al427mxi53h1xbw"; - name = "zeroconf-ioslave-18.04.3.tar.xz"; + url = "${mirror}/stable/applications/18.08.0/src/zeroconf-ioslave-18.08.0.tar.xz"; + sha256 = "05j8k8la4gcydazzhhxq8700w1l4q57yylcar1wzs108icp03rkm"; + name = "zeroconf-ioslave-18.08.0.tar.xz"; }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 74d62f70fa3a..ad0996eba146 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16939,7 +16939,7 @@ with pkgs; inherit (kdeApplications) akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks - kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole + kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle; okteta = libsForQt5.callPackage ../applications/editors/okteta { }; From 7229b8db0847fb1daed853b9f9c7fc6172a9f66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 24 Aug 2018 00:05:55 +0200 Subject: [PATCH 32/79] kdevelop: 5.1.2 -> 5.2.4 --- .../editors/kdevelop5/kdevelop.nix | 24 +++++----- .../editors/kdevelop5/kdevplatform.nix | 44 ------------------- .../libraries/kde-frameworks/default.nix | 1 + .../libraries/kde-frameworks/purpose.nix | 14 ++++++ pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 29 insertions(+), 58 deletions(-) delete mode 100644 pkgs/applications/editors/kdevelop5/kdevplatform.nix create mode 100644 pkgs/development/libraries/kde-frameworks/purpose.nix diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix index 41d1a6262ed5..f0ac79e2d22c 100644 --- a/pkgs/applications/editors/kdevelop5/kdevelop.nix +++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix @@ -1,23 +1,23 @@ { mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules -, qtquickcontrols, qtwebkit, qttools, kde-cli-tools +, qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons -, plasma-framework, krunner, kdevplatform, kdevelop-pg-qt, shared-mime-info -, libksysguard, konsole, llvmPackages, makeWrapper +, plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2 +, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost }: let pname = "kdevelop"; - version = "5.1.2"; - + version = "5.2.4"; + qtVersion = "5.${lib.versions.minor qtbase.version}"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "af54e807847d145fe5f3eb55962ed0d22e6363c2bc6c32167e51ca4823c00ac7"; + sha256 = "1jbks7nh9rybz4kg152l39hfj2x0p6mjins8x9mz03bbv8jf8gic"; }; nativeBuildInputs = [ @@ -30,20 +30,22 @@ mkDerivation rec { ]; propagatedBuildInputs = [ - qtquickcontrols qtwebkit + qtquickcontrols qtwebkit boost libkomparediff2 kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner - kdevplatform shared-mime-info libksysguard konsole kcrash karchive kguiaddons + shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose ]; postInstall = '' # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH. - wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" + wrapProgram "$out/bin/kdevelop!" \ + --prefix PATH ":" "${lib.makeBinPath [ qttools kde-cli-tools ]}" + + wrapProgram "$out/bin/kdevelop" \ + --prefix QT_PLUGIN_PATH : $out/lib/qt-${qtVersion}/plugins # Fix the (now wrapped) kdevelop! to find things in right places: - # - Make KDEV_BASEDIR point to bin directory of kdevplatform. - kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|" # - Fixup the one use where KDEV_BASEDIR is assumed to contain kdevelop. kdev_fixup_sed+=";s|\\\$KDEV_BASEDIR/kdevelop|$out/bin/kdevelop|" sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped" diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix deleted file mode 100644 index 88164c2c4585..000000000000 --- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules -, boost, subversion, apr, aprutil, kwindowsystem -, qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n -, kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications -, knotifyconfig, ktexteditor, threadweaver, kdeclarative, libkomparediff2 }: - -let - pname = "kdevplatform"; - version = "5.1.2"; - -in -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - src = fetchurl { - url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz"; - sha256 = "e622ddad552a678baaf1166d5cbdc5fd1192d2324300c52ef2d25f1c6778664a"; - }; - - nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ]; - - buildInputs = [ - boost subversion apr aprutil kwindowsystem - qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes - ki18n kitemmodels kitemviews kio kparts sonnet kcmutils knewstuff - knotifications knotifyconfig ktexteditor threadweaver kdeclarative - libkomparediff2 - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - maintainers = [ maintainers.ambrop72 ]; - platforms = platforms.linux; - description = "KDE libraries for IDE-like programs"; - longDescription = '' - A free, opensource set of libraries that can be used as a foundation for - IDE-like programs. It is programing-language independent, and is planned - to be used by programs like: KDevelop, Quanta, Kile, KTechLab ... etc." - ''; - homepage = https://www.kdevelop.org; - license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ]; - }; -} diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index d780fc30a4c2..ea8f30f0bba2 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -173,6 +173,7 @@ let kxmlgui = callPackage ./kxmlgui.nix {}; kxmlrpcclient = callPackage ./kxmlrpcclient.nix {}; plasma-framework = callPackage ./plasma-framework.nix {}; + kpurpose = callPackage ./purpose.nix {}; # TIER 4 frameworkintegration = callPackage ./frameworkintegration.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix new file mode 100644 index 000000000000..147c4123a105 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -0,0 +1,14 @@ +{ + mkDerivation, lib, extra-cmake-modules, qtbase +, qtdeclarative, kconfig, kcoreaddons, ki18n, kio +}: + +mkDerivation { + name = "purpose"; + meta = { maintainers = [ lib.maintainers.bkchr ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ + qtbase qtdeclarative kconfig kcoreaddons + ki18n kio + ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad0996eba146..0613481b3914 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11578,7 +11578,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver kirigami2 kholidays; + threadweaver kirigami2 kholidays kpurpose; ### KDE PLASMA 5 @@ -16956,8 +16956,6 @@ with pkgs; llvmPackages = llvmPackages_38; }; - kdevplatform = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix { }; - keepnote = callPackage ../applications/office/keepnote { }; kega-fusion = pkgsi686Linux.callPackage ../misc/emulators/kega-fusion { }; From c331750258928a09f759e5dddec538733f78003a Mon Sep 17 00:00:00 2001 From: edef Date: Fri, 24 Aug 2018 16:22:58 +0000 Subject: [PATCH 33/79] minijail: android-8.0.0_r34 -> android-9.0.0_r3 --- pkgs/tools/system/minijail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/minijail/default.nix b/pkgs/tools/system/minijail/default.nix index c47d40cef2b2..74f0a84716a1 100644 --- a/pkgs/tools/system/minijail/default.nix +++ b/pkgs/tools/system/minijail/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { shortname = "minijail"; name = "${shortname}-${version}"; - version = "android-8.0.0_r34"; + version = "android-9.0.0_r3"; src = fetchgit { url = "https://android.googlesource.com/platform/external/minijail"; rev = version; - sha256 = "1d0q08cgks6h6ffsw3zw8dz4rm9y2djj2pwwy3xi6flx7vwy0psf"; + sha256 = "1g1g52s3q61amcnx8cv1332sbixpck1bmjzgsrjiw5ix7chrzkp2"; }; buildInputs = [ libcap ]; From 3af49c963ddd3036378d935bab83ec944bd2c7f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 10:51:10 -0700 Subject: [PATCH 34/79] firehol: 3.1.5 -> 3.1.6 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/firehol/versions. --- pkgs/applications/networking/firehol/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/firehol/default.nix b/pkgs/applications/networking/firehol/default.nix index 9efe20b3ee95..335f393bc077 100644 --- a/pkgs/applications/networking/firehol/default.nix +++ b/pkgs/applications/networking/firehol/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "firehol-${version}"; - version = "3.1.5"; + version = "3.1.6"; src = fetchFromGitHub { owner = "firehol"; repo = "firehol"; rev = "v${version}"; - sha256 = "15cy1zxfpprma2zkmhj61zzhmw1pfnyhln7pca5lzvr1ifn2d0y0"; + sha256 = "0l7sjpsb300kqv21hawd26a7jszlmafplacpn5lfj64m4yip93fd"; }; patches = [ From d01c4fe3fc2f353334e3af283a150f6f066131db Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 Aug 2018 11:21:59 -0700 Subject: [PATCH 35/79] duplicity: 0.7.17 -> 0.7.18 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/duplicity/versions. --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index ee14f2d6781d..e0c3ea4cf018 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -2,11 +2,11 @@ python2Packages.buildPythonApplication rec { name = "duplicity-${version}"; - version = "0.7.17"; + version = "0.7.18"; src = fetchurl { url = "http://code.launchpad.net/duplicity/${stdenv.lib.versions.majorMinor version}-series/${version}/+download/${name}.tar.gz"; - sha256 = "0jmh3h09680xyf33hzxxxl74bwz66zqhzvjlj7j89r9rz3qwa91p"; + sha256 = "1qlika4l1k1nx8zr657ihcy0yzr1c1cdnjlbs325l5krvc3zbc5b"; }; buildInputs = [ librsync makeWrapper python2Packages.wrapPython ]; From da0ce8ca52e425b548ace5e118c0dc9c0aafa90f Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 25 Aug 2018 01:00:05 +0200 Subject: [PATCH 36/79] munin: fix build fallout from perl 5.24 -> 5.28 update --- pkgs/servers/monitoring/munin/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 8bf9da22e728..2fec42edff33 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { perlPackages.IOStringy ]; + # needs to find a local perl module during build + PERL_USE_UNSAFE_INC = stdenv.lib.optionalString (stdenv.lib.versionAtLeast (stdenv.lib.getVersion perl) "5.26") "1"; + # TODO: tests are failing http://munin-monitoring.org/ticket/1390#comment:1 # NOTE: important, test command always exits with 0, think of a way to abort the build once tests pass doCheck = false; From 4ad6873c84bc1e4f8c5c82d35ac5b17e6908d0a8 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Sat, 25 Aug 2018 01:19:18 +0200 Subject: [PATCH 37/79] google-play-music-desktop-player: 4.5.0 -> 4.6.1 --- .../audio/google-play-music-desktop-player/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix index 6c7d6dba455c..5951572dd246 100644 --- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix +++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix @@ -1,10 +1,10 @@ { stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype -, fetchurl, GConf, gdk_pixbuf, glib, gtk2, libpulseaudio, makeWrapper, nspr +, fetchurl, GConf, gdk_pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr , nss, pango, udev, xorg }: let - version = "4.5.0"; + version = "4.6.1"; deps = [ alsaLib @@ -19,6 +19,7 @@ let gdk_pixbuf glib gtk2 + gtk3 libpulseaudio nspr nss @@ -46,7 +47,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/MarshallOfSound/Google-Play-Music-Desktop-Player-UNOFFICIAL-/releases/download/v${version}/google-play-music-desktop-player_${version}_amd64.deb"; - sha256 = "06h9g1yhd5q7gg8v55q143fr65frxg0khfgckr03gsaw0swin51q"; + sha256 = "0dyn2fxhcri9d9nmcprszs6yg79gsr09bjfzzb1p10yjmi77cj2g"; }; dontBuild = true; From 7b1f5f70c07ccb0a210126ec437432f0538162ed Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 25 Aug 2018 01:21:00 +0200 Subject: [PATCH 38/79] mesos: fix build was broken due to missing dependencies --- pkgs/applications/networking/cluster/mesos/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 6e2089f99352..8cff2494bf8f 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -4,6 +4,7 @@ , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent , ethtool, coreutils, which, iptables, maven , bash, autoreconfHook +, utf8proc, lz4 , withJava ? !stdenv.isDarwin }: @@ -50,6 +51,7 @@ in stdenv.mkDerivation rec { makeWrapper curl sasl python wrapPython boto setuptools leveldb subversion apr glog openssl libevent + utf8proc lz4 ] ++ lib.optionals stdenv.isLinux [ libnl ] ++ lib.optionals withJava [ From a2a3a41db6f48fed9fc0c9e316cdb9f54c0eb9c1 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 25 Aug 2018 08:35:57 +0200 Subject: [PATCH 39/79] sequeler: 0.5.9 -> 0.6.0 Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.0 --- pkgs/applications/misc/sequeler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index be4a0388daa5..35242822d4a0 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -4,7 +4,7 @@ let - version = "0.5.9"; + version = "0.6.0"; sqlGda = libgda.override { mysqlSupport = true; postgresSupport = true; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "Alecaddd"; repo = "sequeler"; rev = "v${version}"; - sha256 = "08dgir1prjfh7kxdxksabia5093gcjyy2yy7s57yizszplw2v07v"; + sha256 = "04x3fg665201g3zy66sicfna4vac4n1pmrahbra90gvfzaia1cai"; }; nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection gettext wrapGAppsHook desktop-file-utils ]; From a098cc98d9da60692cb41d5f3f417708de00a9e4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 24 Aug 2018 23:17:18 +0200 Subject: [PATCH 40/79] nixos/gitea: Symlink gitea locales to match running gitea version This prevents issues when gitea adds new locales etc. And if they change locale values in future versions. Or if you rollback to a previous version of gitea it might be a good idea to use the previous locale files. --- nixos/modules/services/misc/gitea.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 5d664728e0b5..dc63f1a6c052 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -261,7 +261,8 @@ in runConfig = "${cfg.stateDir}/custom/conf/app.ini"; secretKey = "${cfg.stateDir}/custom/conf/secret_key"; in '' - mkdir -p ${cfg.stateDir} + # Make sure that the stateDir exists, as well as the conf dir in there + mkdir -p ${cfg.stateDir}/conf # copy custom configuration and generate a random secret key if needed ${optionalString (cfg.useWizard == false) '' @@ -290,11 +291,13 @@ in sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS fi - if [ ! -d ${cfg.stateDir}/conf/locale ] + # If we have a folder or symlink with gitea locales, remove it + if [ -e ${cfg.stateDir}/conf/locale ] then - mkdir -p ${cfg.stateDir}/conf - cp -r ${gitea.out}/locale ${cfg.stateDir}/conf/locale + rm -r ${cfg.stateDir}/conf/locale fi + # And symlink the current gitea locales in place + ln -s ${gitea.out}/locale ${cfg.stateDir}/conf/locale # update command option in authorized_keys if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] then From 2c1e736ae8ea308cecc6b6f2cf44638280393363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 25 Aug 2018 10:36:52 +0200 Subject: [PATCH 41/79] gnome3.libgda: build with gcc6 on aarch64 Fixes #45618. I don't know what's the matter. Feel free to come with a better fix. --- pkgs/desktops/gnome-3/misc/libgda/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/misc/libgda/default.nix b/pkgs/desktops/gnome-3/misc/libgda/default.nix index a10675ab8033..069c769efaa2 100644 --- a/pkgs/desktops/gnome-3/misc/libgda/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgda/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl, gnome3 +, overrideCC, gcc6 , mysqlSupport ? false, mysql ? null , postgresSupport ? false, postgresql ? null }: @@ -6,7 +7,7 @@ assert mysqlSupport -> mysql != null; assert postgresSupport -> postgresql != null; -stdenv.mkDerivation rec { +(if stdenv.isAarch64 then overrideCC stdenv gcc6 else stdenv).mkDerivation rec { name = "libgda-${version}"; version = "5.2.4"; From 93ed13f86b624dc3214f58d09c3f3318f9900afa Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 12:20:21 +0200 Subject: [PATCH 42/79] libtensorflow: fix hashes for darwin and cuda downloads --- pkgs/development/libraries/libtensorflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtensorflow/default.nix b/pkgs/development/libraries/libtensorflow/default.nix index 2bc83b31423a..b4e616409c4f 100644 --- a/pkgs/development/libraries/libtensorflow/default.nix +++ b/pkgs/development/libraries/libtensorflow/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { sha256 = if system == "linux-x86_64" then if cudaSupport - then "1q3mh06x344im25z7r3vgrfksfdsi8fh8ldn6y2mf86h4d11yxc3" + then "0v66sscxpyixjrf9yjshl001nix233i6chc61akx0kx7ial4l1wn" else "11sbpcbgdzj8v17mdppfv7v1fn3nbzkdad60gc42y2j6knjbmwxb" else if system == "darwin-x86_64" then if cudaSupport then unavailable - else "1qj0v1706w6mczycdsh38h2glyv5d25v62kdn98wxd5rw8f9v657" + else "11p0f77m4wycpc024mh7jx0kbdhgm0wp6ir6dsa8lkcpdb59bn59" else unavailable; }; From 268bb4ea3c2d0c43518927b17bb4417bbdc4d8a1 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Sat, 25 Aug 2018 14:27:41 +0200 Subject: [PATCH 43/79] nixos/tests/munin: fix non-deterministic failure - wait for node to listen before starting munin-cron - increase timeout for munin-cron startup - disable a failing plugin to remove irrelevant error message --- nixos/tests/munin.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/nixos/tests/munin.nix b/nixos/tests/munin.nix index eb91d4d630bc..9f66005292ab 100644 --- a/nixos/tests/munin.nix +++ b/nixos/tests/munin.nix @@ -12,16 +12,23 @@ import ./make-test.nix ({ pkgs, ...} : { { config, ... }: { services = { - munin-node.enable = true; - munin-cron = { + munin-node = { enable = true; - hosts = '' - [${config.networking.hostName}] - address localhost + # disable a failing plugin to prevent irrelevant error message, see #23049 + extraConfig = '' + ignore_file ^apc_nis$ ''; }; + munin-cron = { + enable = true; + hosts = '' + [${config.networking.hostName}] + address localhost + ''; + }; }; - systemd.services.munin-node.serviceConfig.TimeoutStartSec = "3min"; + # long timeout to prevent hydra failure on high load + systemd.services.munin-node.serviceConfig.TimeoutStartSec = "10min"; }; }; @@ -29,7 +36,10 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $one->waitForUnit("munin-node.service"); + # make sure the node is actually listening + $one->waitForOpenPort(4949); $one->succeed('systemctl start munin-cron'); + # wait for munin-cron output $one->waitForFile("/var/lib/munin/one/one-uptime-uptime-g.rrd"); $one->waitForFile("/var/www/munin/one/index.html"); ''; From f0f94aaad00b526dccd33942c56d6f6bb7fe1d63 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 25 Aug 2018 15:35:16 +0200 Subject: [PATCH 44/79] androidStudioPackages.beta: 3.2.0.23 -> 3.2.0.24 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 8a45604824c0..f8b9b32bcb4d 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0xx6yprylmcb32ipmwdcfkgddlm1nrxi1w68miclvgrbk015brf2"; }; betaVersion = { - version = "3.2.0.23"; # "Android Studio 3.2 RC 1" - build = "181.4963425"; - sha256Hash = "0b3mmafpnc07chiy3fv3vlrarkiwbb0c62x3qk26kpxq1l6m8bgw"; + version = "3.2.0.24"; # "Android Studio 3.2 RC 2" + build = "181.4974118"; + sha256Hash = "0sj848pzpsbmnfi2692gg73v6m72hr1pwlk5x8q912w60iypi3pz"; }; latestVersion = { # canary & dev version = "3.3.0.6"; # "Android Studio 3.3 Canary 7" From 9c066735d548733061f0a18b19d2267227206ccb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Aug 2018 17:20:20 +0200 Subject: [PATCH 45/79] =?UTF-8?q?gnome3.gnome-bluetooth:=203.28.1=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/gnome-bluetooth/default.nix | 43 +++++++++++++------ 1 file changed, 31 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index d65f282e03b8..e7acbe8706ec 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,28 +1,47 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib -, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection }: +, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobjectIntrospection +, gtk-doc, docbook_xsl, docbook_xml_dtd_43 }: -stdenv.mkDerivation rec { - name = "gnome-bluetooth-${version}"; - version = "3.28.1"; +let + pname = "gnome-bluetooth"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "3.28.2"; + + # TODO: split out "lib" + outputs = [ "out" "dev" "devdoc" "man" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1g3yrq5792qvc5rxnf26cgciawrca27hqn6wxfcf63bpa2dsjcsn"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "0ch7lll5n8v7m26y6y485gnrik19ml42rsh1drgcxydm6fn62j8z"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-bluetooth"; attrPath = "gnome3.gnome-bluetooth"; }; - }; + nativeBuildInputs = [ + meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection + gtk-doc docbook_xsl docbook_xml_dtd_43 + ]; + buildInputs = [ + glib gtk3 udev libnotify libcanberra-gtk3 + gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas + ]; - nativeBuildInputs = [ meson ninja intltool itstool pkgconfig libxml2 wrapGAppsHook gobjectIntrospection ]; - buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.defaultIconTheme gnome3.gsettings-desktop-schemas ]; + mesonFlags = [ + "-Dicon_update=false" + "-Dgtk_doc=true" + ]; postPatch = '' chmod +x meson_post_install.py # patchShebangs requires executable file patchShebangs meson_post_install.py ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; description = "Application that let you manage Bluetooth in the GNOME destkop"; From ede0b56cae4619fedf5d0d22febfd90dff446d92 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Aug 2018 11:02:41 +0200 Subject: [PATCH 46/79] =?UTF-8?q?gnome3.libgnome-games-support:=201.4.1=20?= =?UTF-8?q?=E2=86=92=201.4.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index 7e28c90813a0..9a55864dfcc2 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -3,13 +3,13 @@ let pname = "libgnome-games-support"; - version = "1.4.1"; + version = "1.4.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1j7lfcnc29lgn8ppn13wkn9w2y1n3lsapagwp91zh3bf0h2h4hv1"; + sha256 = "02hirpk885jndwarbl3cl5fk7w2z5ziv677csyv1wi2n6rmpn088"; }; nativeBuildInputs = [ pkgconfig intltool ]; From ae756f9d02a9636d907aa324412b5216a3872da2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 20 Aug 2018 00:18:56 +0200 Subject: [PATCH 47/79] libgrss: init at 0.7.0 --- .../development/libraries/libgrss/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/libraries/libgrss/default.nix diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix new file mode 100644 index 000000000000..548114b642fa --- /dev/null +++ b/pkgs/development/libraries/libgrss/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, vala, gobjectIntrospection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, libxml2, libsoup, gnome3 }: + +let + version = "0.7.0"; + pname = "libgrss"; +in +stdenv.mkDerivation { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" "devdoc" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1nalslgyglvhpva3px06fj6lv5zgfg0qmj0sbxyyl5d963vc02b7"; + }; + + nativeBuildInputs = [ pkgconfig vala gobjectIntrospection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; + buildInputs = [ glib libxml2 libsoup ]; + + configureFlags = [ + "--enable-gtk-doc" + ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; + homepage = https://wiki.gnome.org/Projects/Libgrss; + license = licenses.lgpl3Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 885bce6480b9..a78f01a373d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10321,6 +10321,8 @@ with pkgs; libgroove = callPackage ../development/libraries/libgroove { }; + libgrss = callPackage ../development/libraries/libgrss { }; + libseccomp = callPackage ../development/libraries/libseccomp { }; libsecret = callPackage ../development/libraries/libsecret { }; From c219d313ddcf5eb93654e4d1c02e1946ec9da4c0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Aug 2018 13:19:13 +0200 Subject: [PATCH 48/79] =?UTF-8?q?gnome3.tracker:=202.0.4=20=E2=86=92=202.1?= =?UTF-8?q?.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desktops/gnome-3/core/tracker/default.nix | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker/default.nix b/pkgs/desktops/gnome-3/core/tracker/default.nix index 649960c0bf3f..a0da1b7147d2 100644 --- a/pkgs/desktops/gnome-3/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker/default.nix @@ -1,39 +1,53 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gobjectIntrospection -, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt +{ stdenv, fetchurl, intltool, meson, ninja, pkgconfig, gobjectIntrospection, python2 +, gtk-doc, docbook_xsl, docbook_xml_dtd_412, docbook_xml_dtd_43, glibcLocales +, libxml2, upower, glib, wrapGAppsHook, vala, sqlite, libxslt, libstemmer , gnome3, icu, libuuid, networkmanager, libsoup, json-glib }: let pname = "tracker"; - version = "2.0.4"; + version = "2.1.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1mfc5lv820kr7ssi7hldn25gmshh65k19kh478qjsnb64sshsbyf"; + sha256 = "1sf923f3ya3gj5s90da8qkqqvjj3fdll7xrjgscpb6yhgv0kzqsi"; }; - enableParallelBuilding = true; - - nativeBuildInputs = [ vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection ]; - # TODO: add libstemmer - buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib + nativeBuildInputs = [ + meson ninja vala pkgconfig intltool libxslt wrapGAppsHook gobjectIntrospection + gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales + python2 # for data-generators ]; - # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - configureFlags = [ "--disable-unit-tests" ]; + buildInputs = [ + glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer + ]; + + LC_ALL = "en_US.UTF-8"; + + mesonFlags = [ + "-Ddbus_services=share/dbus-1/services" + # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas + "-Dfunctional_tests=false" + ]; postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge + patchShebangs utils/data-generators/cc/generate + ''; + + postInstall = '' + ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; passthru = { updateScript = gnome3.updateScript { packageName = pname; attrPath = "gnome3.${pname}"; + versionPolicy = "none"; }; }; From 21e9b859287aed48e62382ed35163f6aa73ee607 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 18 Aug 2018 15:55:14 +0200 Subject: [PATCH 49/79] =?UTF-8?q?gnome3.tracker-miners:=202.0.5=20?= =?UTF-8?q?=E2=86=92=202.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/core/tracker-miners/default.nix | 39 +++++++++---------- .../core/tracker-miners/fix-paths.patch | 24 +++++++++++- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix index dc55fa9a7b4a..67c43311123c 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/tracker-miners/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt, makeWrapper +{ stdenv, fetchurl, substituteAll, intltool, itstool, libxslt , meson, ninja, pkgconfig, vala, wrapGAppsHook, bzip2, dbus, evolution-data-server , exempi, flac, giflib, glib, gnome3, gst_all_1, icu, json-glib, libcue, libexif -, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid +, libgrss, libgsf, libiptcdata, libjpeg, libpng, libseccomp, libsoup, libtiff, libuuid , libvorbis, libxml2, poppler, taglib, upower }: -stdenv.mkDerivation rec { - name = "${pname}-${version}"; +let pname = "tracker-miners"; - version = "2.0.5"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + version = "2.1.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "00k8nb8dbkjnqjk12gcs5n2cm6yny553qildsm5b2c8nfs1w16b4"; + sha256 = "107638773mihxdi194wf3saacqrr4cp9xn3qjfmx60bwq5451ma0"; }; nativeBuildInputs = [ intltool itstool libxslt - makeWrapper meson ninja pkgconfig @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - # TODO: add libgrss, libenca, libosinfo + # TODO: add libenca, libosinfo buildInputs = [ bzip2 dbus @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { json-glib libcue libexif + libgrss libgsf libiptcdata libjpeg @@ -60,7 +61,8 @@ stdenv.mkDerivation rec { ]; mesonFlags = [ - "-Dminer_rss=false" # needs libgrss + # TODO: tests do not like our sandbox + "-Dfunctional_tests=false" ]; patches = [ @@ -75,13 +77,7 @@ stdenv.mkDerivation rec { }) ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - attrPath = "gnome3.${pname}"; - }; - }; - + # Symlinks require absolute path and we still cannot use placeholders # https://github.com/NixOS/nixpkgs/pull/39534#discussion_r184339131 # https://github.com/NixOS/nixpkgs/pull/37693 preConfigure = '' @@ -92,10 +88,13 @@ stdenv.mkDerivation rec { ${glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas ''; - # https://bugzilla.gnome.org/show_bug.cgi?id=796145 - postFixup = '' - rm $out/share/tracker/miners/org.freedesktop.Tracker1.Miner.RSS.service - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + versionPolicy = "none"; + }; + }; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; diff --git a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch index 847e3bf204dd..74da929c5642 100644 --- a/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch +++ b/pkgs/desktops/gnome-3/core/tracker-miners/fix-paths.patch @@ -1,3 +1,25 @@ +--- a/meson.build ++++ b/meson.build +@@ -37,15 +37,15 @@ + # + # This check acts as a guard to make sure we are being configured with the + # right prefix, among other things. +- tracker_store = find_program(join_paths(get_option('prefix'), get_option('libexecdir'), 'tracker-store')) ++ tracker_store = find_program(join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'libexec', 'tracker-store')) + tracker_store_path = tracker_store.path() + + # If we are building against an installed version of tracker core rather than + # having it as a subproject, these 'uninstalled' locations point to the actual + # installed locations. +- tracker_uninstalled_domain_rule = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'domain-ontologies', 'default.rule') +- tracker_uninstalled_nepomuk_ontologies_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'ontologies', 'nepomuk') +- tracker_uninstalled_stop_words_dir = join_paths(get_option('prefix'), get_option('datadir'), 'tracker', 'stop-words', 'default.rule') ++ tracker_uninstalled_domain_rule = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'domain-ontologies', 'default.rule') ++ tracker_uninstalled_nepomuk_ontologies_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'ontologies', 'nepomuk') ++ tracker_uninstalled_stop_words_dir = join_paths(tracker_miner.get_pkgconfig_variable('prefix'), 'share', 'tracker', 'stop-words', 'default.rule') + endif + + avcodec = dependency('libavcodec', version: '>= 0.8.4', required: false) --- a/src/libtracker-miners-common/tracker-domain-ontology.c +++ b/src/libtracker-miners-common/tracker-domain-ontology.c @@ -313,7 +313,7 @@ @@ -9,7 +31,7 @@ DEFAULT_RULE, NULL); if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { -@@ -372,7 +372,7 @@ +@@ -378,7 +378,7 @@ if (!priv->ontology_location) { gchar *ontology_path; From 05992b9b1b61f75765064e0faebe303ea716209f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Aug 2018 14:35:32 +0200 Subject: [PATCH 50/79] gtk-vnc: rename from gtkvnc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream uses gtk-vnc, let’s be consistent. --- pkgs/applications/virtualization/virt-manager/default.nix | 4 ++-- pkgs/applications/virtualization/virt-viewer/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/vinagre/default.nix | 4 ++-- pkgs/desktops/gnome-3/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index c7d86ad9fd60..40395568f4ba 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python2Packages, intltool, file -, wrapGAppsHook, gtkvnc, vte, avahi, dconf +, wrapGAppsHook, gtk-vnc, vte, avahi, dconf , gobjectIntrospection, libvirt-glib, system-libvirt , gsettings-desktop-schemas, glib, libosinfo, gnome3, gtk3 , spiceSupport ? true, spice-gtk ? null @@ -24,7 +24,7 @@ python2Packages.buildPythonApplication rec { ]; buildInputs = - [ libvirt-glib vte dconf gtkvnc gnome3.defaultIconTheme avahi + [ libvirt-glib vte dconf gtk-vnc gnome3.defaultIconTheme avahi gsettings-desktop-schemas libosinfo gtk3 ] ++ optional spiceSupport spice-gtk; diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index beecf72fd0b0..2296d7217ec1 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp +{ stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen , gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl , libapparmor, gst_all_1 @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; buildInputs = [ - glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info + glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 6d55cbe8ee79..aee315124f8e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, wrapGAppsHook, pkgconfig, gettext, itstool, libvirt-glib -, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice-gtk +, glib, gobjectIntrospection, libxml2, gtk3, gtk-vnc, libvirt, spice-gtk , spice-protocol, libsoup, libosinfo, systemd, tracker, tracker-miners, vala , libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg, desktop-file-utils , mtools, cdrkit, libcdio, libusb, libarchive, acl, libgudev, qemu, libsecret @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ spice-gtk ]; buildInputs = [ - libvirt-glib glib gtk3 gtkvnc libxml2 + libvirt-glib glib gtk3 gtk-vnc libxml2 libvirt spice-gtk spice-protocol libsoup json-glib webkitgtk libosinfo systemd tracker tracker-miners libcap yajl gmp gdbm cyrus_sasl libusb libarchive gnome3.defaultIconTheme librsvg acl libgudev libsecret diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 566624431dc6..2299aa1fb26d 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool , libsecret, itstool, makeWrapper, librsvg }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 vte libxml2 gtkvnc intltool libsecret + buildInputs = [ gtk3 vte libxml2 gtk-vnc intltool libsecret itstool makeWrapper gnome3.defaultIconTheme librsvg ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 18db0e5ba812..b4bbdb385de3 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -43,7 +43,7 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) atk glib gobjectIntrospection gspell webkitgtk gtk3 gtkmm3 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage - clutter clutter-gst clutter-gtk cogl gtkvnc libdazzle; + clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a78f01a373d3..390702597388 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2963,7 +2963,7 @@ with pkgs; gtkperf = callPackage ../development/tools/misc/gtkperf { }; - gtkvnc = callPackage ../tools/admin/gtk-vnc {}; + gtk-vnc = callPackage ../tools/admin/gtk-vnc {}; gtmess = callPackage ../applications/networking/instant-messengers/gtmess { }; From c59f165771178cd5c209d35b13def33fcea58f9c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Aug 2018 14:36:54 +0200 Subject: [PATCH 51/79] =?UTF-8?q?gtk-vnc:=200.7.0=20=E2=86=92=200.9.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/gtk-vnc/default.nix | 47 ++++++++++++---------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index cd6cf90a5aa5..bd3b2392c7e4 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,49 +1,42 @@ { stdenv, fetchurl, gobjectIntrospection , gnutls, cairo, libtool, glib, pkgconfig -, libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, libgcrypt, gtk3, vala_0_32 -, libogg, libgpgerror, pythonPackages }: +, cyrus_sasl, intltool, libpulseaudio +, libgcrypt, gtk3, vala, gnome3 +, python3 }: -let - inherit (pythonPackages) pygobject3 python; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; - version = "0.7.0"; + version = "0.9.0"; + + outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.strings.substring 0 3 version}/${name}.tar.xz"; - sha256 = "0gj8dpy3sj4dp810gy67spzh5f0jd8aqg69clcwqjcskj1yawbiw"; + url = "mirror://gnome/sources/gtk-vnc/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; + sha256 = "1dya1wc9vis8h0fv625pii1n70cckf1xjg1m2hndz989d118i6is"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ + python3 pkgconfig intltool libtool gobjectIntrospection vala + ]; buildInputs = [ - python gnutls cairo libtool glib libffi libgcrypt - intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV - gobjectIntrospection libogg libgpgerror - gtk3 vala_0_32 pygobject3 + gnutls cairo glib libgcrypt cyrus_sasl libpulseaudio gtk3 ]; - NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ - "--with-python" "--with-examples" ]; - # Fix broken .la files - preFixup = '' - sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gtk-vnc"; + }; + }; meta = with stdenv.lib; { description = "A GTK VNC widget"; + homepage = https://wiki.gnome.org/Projects/gtk-vnc; + license = licenses.lgpl21; maintainers = with maintainers; [ raskin offline ]; platforms = platforms.linux; - license = licenses.lgpl21; - }; - - passthru = { - updateInfo = { - downloadPage = "http://ftp.gnome.org/pub/GNOME/sources/gtk-vnc"; - }; }; } From 7a0dfc93bc27d9e4dd29ddf126bdd3715048e8ee Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Aug 2018 14:59:47 +0200 Subject: [PATCH 52/79] virtviewer: clean up --- .../virtualization/virt-viewer/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index 2296d7217ec1..cbdecb322882 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtk-vnc, gmp , libgcrypt, gnupg, cyrus_sasl, shared-mime-info, libvirt, yajl, xen -, gsettings-desktop-schemas, makeWrapper, libvirt-glib, libcap_ng, numactl +, gsettings-desktop-schemas, wrapGAppsHook, libvirt-glib, libcap_ng, numactl , libapparmor, gst_all_1 , spiceSupport ? true , spice-gtk ? null, spice-protocol ? null, libcap ? null, gdbm ? null @@ -21,10 +21,10 @@ stdenv.mkDerivation rec { sha256 = "00y9vi69sja4pkrfnvrkwsscm41bqrjzvp8aijb20pvg6ymczhj7"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool wrapGAppsHook ]; buildInputs = [ glib libxml2 gtk3 gtk-vnc gmp libgcrypt gnupg cyrus_sasl shared-mime-info - libvirt yajl gsettings-desktop-schemas makeWrapper libvirt-glib + libvirt yajl gsettings-desktop-schemas libvirt-glib libcap_ng numactl libapparmor ] ++ optionals stdenv.isx86_64 [ xen @@ -33,14 +33,6 @@ stdenv.mkDerivation rec { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ]; - postInstall = '' - for f in "$out"/bin/*; do - wrapProgram "$f" \ - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" - done - ''; - meta = { description = "A viewer for remote virtual machines"; maintainers = [ maintainers.raskin ]; From 40535ced631b3d7ef95a3235b7a64b20a97aecca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Aug 2018 15:00:10 +0200 Subject: [PATCH 53/79] gnome3.vinagre: clean up --- .../desktops/gnome-3/apps/vinagre/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index 2299aa1fb26d..a8fe76ee03f9 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtk-vnc, intltool -, libsecret, itstool, makeWrapper, librsvg }: +, libsecret, itstool, wrapGAppsHook, librsvg }: stdenv.mkDerivation rec { name = "vinagre-${version}"; @@ -10,25 +10,25 @@ stdenv.mkDerivation rec { sha256 = "cd1cdbacca25c8d1debf847455155ee798c3e67a20903df8b228d4ece5505e82"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "vinagre"; attrPath = "gnome3.vinagre"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 vte libxml2 gtk-vnc intltool libsecret - itstool makeWrapper gnome3.defaultIconTheme librsvg ]; + nativeBuildInputs = [ pkgconfig intltool itstool wrapGAppsHook ]; + buildInputs = [ + gtk3 vte libxml2 gtk-vnc libsecret gnome3.defaultIconTheme librsvg + ]; NIX_CFLAGS_COMPILE = "-Wno-format-nonliteral"; - preFixup = '' - wrapProgram "$out/bin/vinagre" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" - ''; + passthru = { + updateScript = gnome3.updateScript { + packageName = "vinagre"; + attrPath = "gnome3.vinagre"; + }; + }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Vinagre; description = "Remote desktop viewer for GNOME"; - platforms = platforms.linux; + homepage = https://wiki.gnome.org/Apps/Vinagre; + license = licenses.gpl2Plus; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; } From d6a6f9eb95a778b3267c180d959984bdb1763f19 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Aug 2018 13:42:17 +0200 Subject: [PATCH 54/79] gnome3.caribou: fix on GNOME Flashback --- .../desktops/gnome-3/core/caribou/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index 48be01faf33f..acfd6dfb3745 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -1,11 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, python3Packages, libxml2 +{ fetchurl, stdenv, pkgconfig, gnome3, glib, gtk3, clutter, dbus, python3, libxml2 , libxklavier, libXtst, gtk2, intltool, libxslt, at-spi2-core, autoreconfHook , wrapGAppsHook }: let pname = "caribou"; version = "0.4.21"; - pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] ); + pythonEnv = python3.withPackages ( ps: with ps; [ pygobject3 ] ); in stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,11 +14,21 @@ in stdenv.mkDerivation rec { sha256 = "0mfychh1q3dx0b96pjz9a9y112bm9yqyim40yykzxx1hppsdjhww"; }; + patches = [ + # Fix crash in GNOME Flashback + # https://bugzilla.gnome.org/show_bug.cgi?id=791001 + (fetchurl { + url = https://bugzilla.gnome.org/attachment.cgi?id=364774; + sha256 = "15k1455grf6knlrxqbjnk7sals1730b0whj30451scp46wyvykvd"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool libxslt libxml2 autoreconfHook wrapGAppsHook ]; - buildInputs = with gnome3; - [ glib gtk clutter at-spi2-core dbus pythonEnv python3Packages.pygobject3 - libXtst gtk2 ]; + buildInputs = [ + glib gtk3 clutter at-spi2-core dbus pythonEnv python3.pkgs.pygobject3 + libXtst gtk2 + ]; propagatedBuildInputs = [ gnome3.libgee libxklavier ]; @@ -37,9 +47,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "An input assistive technology intended for switch and pointer users"; homepage = https://wiki.gnome.org/Projects/Caribou; - platforms = platforms.linux; license = licenses.lgpl21; maintainers = gnome3.maintainers; + platforms = platforms.linux; }; - } From f3f68540337f2694e22588966958fef8c1f7fa3d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Aug 2018 13:42:37 +0200 Subject: [PATCH 55/79] =?UTF-8?q?gnome3.gnome-nibbles:=203.24.0=20?= =?UTF-8?q?=E2=86=92=203.24.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/games/gnome-nibbles/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 7390108953f7..c871fbbf9160 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -4,29 +4,31 @@ stdenv.mkDerivation rec { name = "gnome-nibbles-${version}"; - version = "3.24.0"; + version = "3.24.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f"; + sha256 = "19g44cnrb191v50bdvy2qkrfhvyfsahd0kx9hz95x9gkjfn2nn35"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "gnome-nibbles"; attrPath = "gnome3.gnome-nibbles"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool itstool libxml2 ]; buildInputs = [ - gtk3 wrapGAppsHook intltool itstool libxml2 - librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme + gtk3 librsvg libcanberra-gtk3 clutter-gtk gnome3.defaultIconTheme libgee libgnome-games-support ]; + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-nibbles"; + attrPath = "gnome3.gnome-nibbles"; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Nibbles; description = "Guide a worm around a maze"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Nibbles; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } From 5e3c1c2e327c1109f2bb9d615a0d0358fbb296f6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Aug 2018 15:53:05 +0200 Subject: [PATCH 56/79] =?UTF-8?q?gnome3.gnome-documents:=203.28.1=20?= =?UTF-8?q?=E2=86=92=203.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index a7d4288c9eb5..9948f9d909b2 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -2,17 +2,17 @@ , pkgconfig, gtk3, glib, tracker, tracker-miners , itstool, libxslt, webkitgtk, libgdata , gnome-desktop, libzapojit, libgepub -, gnome3, gdk_pixbuf, libsoup, docbook_xsl +, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42 , gobjectIntrospection, inkscape, poppler_utils , desktop-file-utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-documents-${version}"; - version = "3.28.1"; + version = "3.28.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-documents/${gnome3.versionBranch version}/${name}.tar.xz"; - sha256 = "1i0s246bg9xcjxgbajph744pn65bq5gk6r9kkl3f5iwdq3rjc0pm"; + sha256 = "0aannnq39gjg6jnjm4kr8fqigg5npjvd8dyxw7k4hy4ny0ffxwjq"; }; doCheck = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dgetting-started=true" ]; nativeBuildInputs = [ - meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl wrapGAppsHook + meson ninja pkgconfig gettext itstool libxslt desktop-file-utils docbook_xsl docbook_xml_dtd_42 wrapGAppsHook inkscape poppler_utils # building getting started ]; buildInputs = [ From 374446758928f6101df8a609de6cc614afbd24f3 Mon Sep 17 00:00:00 2001 From: David Smith Date: Wed, 1 Aug 2018 17:21:10 +0100 Subject: [PATCH 57/79] nixos/curator: init elasticsearch curator https://www.elastic.co/guide/en/elasticsearch/client/curator/5.5/index.html --- .../services/search/elasticsearch-curator.nix | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 nixos/modules/services/search/elasticsearch-curator.nix diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix new file mode 100644 index 000000000000..c694f812caf6 --- /dev/null +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -0,0 +1,94 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.elasticsearch-curator; + curatorConfig = pkgs.writeTextFile { + name = "config.yaml"; + text = '' + --- + # Remember, leave a key empty if there is no value. None will be a string, + # not a Python "NoneType" + client: + hosts: ${builtins.toJSON cfg.hosts} + port: ${cfg.port} + url_prefix: + use_ssl: False + certificate: + client_cert: + client_key: + ssl_no_validate: False + http_auth: + timeout: 30 + master_only: False + logging: + loglevel: INFO + logfile: + logformat: default + blacklist: ['elasticsearch', 'urllib3'] + ''; + }; + curatorAction = pkgs.writeTextFile { + name = "action.yaml"; + text = cfg.actionYAML; + }; +in { + + options.services.elasticsearch-curator = { + + enable = mkEnableOption "elasticsearch curator"; + interval = mkOption { + description = "The frequency to run curator, a systemd.time such as 'hourly'"; + default = "hourly"; + type = types.str; + }; + hosts = mkOption { + description = "a list of elasticsearch hosts to connect to"; + type = types.listOf types.str; + default = ["localhost"]; + }; + port = mkOption { + description = "the port that elasticsearch is listening on"; + type = types.int; + default = 9200; + }; + actionYAML = mkOption { + description = "curator action.yaml file contents, alternatively use curator-cli which takes a simple action command"; + example = '' + --- + actions: + 1: + action: delete_indices + description: >- + Delete indices older than 45 days (based on index name), for logstash- + prefixed indices. Ignore the error if the filter does not result in an + actionable list of indices (ignore_empty_list) and exit cleanly. + options: + ignore_empty_list: True + disable_action: False + filters: + - filtertype: pattern + kind: prefix + value: logstash- + - filtertype: age + source: name + direction: older + timestring: '%Y.%m.%d' + unit: days + unit_count: 45 + ''; + }; + }; + + config = mkIf cfg.enable { + + systemd.services.elasticsearch-curator = { + enable = cfg.enable; + startAt = cfg.interval; + serviceConfig = { + ExecStart = ''${pkgs.python36Packages.elasticsearch-curator}/bin/curator --config ${curatorConfig} ${curatorAction}''; + }; + }; + }; +} From 2ec33f527b604ae438e34fc598d85c50d88e4a61 Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 21 Aug 2018 09:39:12 +0100 Subject: [PATCH 58/79] elasticsearch-curator: don't need to add enable to elasticsearch-curator service --- nixos/modules/services/search/elasticsearch-curator.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix index c694f812caf6..63ffe10d21f0 100644 --- a/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -84,7 +84,6 @@ in { config = mkIf cfg.enable { systemd.services.elasticsearch-curator = { - enable = cfg.enable; startAt = cfg.interval; serviceConfig = { ExecStart = ''${pkgs.python36Packages.elasticsearch-curator}/bin/curator --config ${curatorConfig} ${curatorAction}''; From 842000566b5d7cab0a7ed5b1cd1ee00962175a2b Mon Sep 17 00:00:00 2001 From: David Smith Date: Tue, 21 Aug 2018 09:39:25 +0100 Subject: [PATCH 59/79] elasticsearch-curator: add test --- nixos/tests/elk.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 4c5c441ca265..665e27a05534 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -63,6 +63,33 @@ let package = elk.kibana; elasticsearch.url = esUrl; }; + + elasticsearch-curator = { + enable = true; + actionYAML = '' + --- + actions: + 1: + action: delete_indices + description: >- + Delete indices older than 1 minute (based on index name), for logstash- + prefixed indices. Ignore the error if the filter does not result in an + actionable list of indices (ignore_empty_list) and exit cleanly. + options: + ignore_empty_list: True + disable_action: False + filters: + - filtertype: pattern + kind: prefix + value: logstash- + - filtertype: age + source: name + direction: older + timestring: '%Y.%m.%d' + unit: minutes + unit_count: 1 + ''; + }; }; }; }; @@ -91,6 +118,9 @@ let # See if logstash messages arive in elasticsearch. $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + $one->systemctl("stop logstash"); + $one->systemctl("start elasticsearch-curator"); + $one->waitUntilSucceeds("! curl --silent --show-error '${esUrl}/_cat/indices' | grep logstash | grep -q ^$1"); ''; }; in mapAttrs mkElkTest { From 32200033a632c3eed1edab14b832297a1b2e0df6 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 21 Aug 2018 17:24:52 +0200 Subject: [PATCH 60/79] elasticsearch-curator: include the module in the module-list & fix bug --- nixos/modules/module-list.nix | 1 + nixos/modules/services/search/elasticsearch-curator.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2846afea8fbc..85440a8025c9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -623,6 +623,7 @@ ./services/scheduling/fcron.nix ./services/scheduling/marathon.nix ./services/search/elasticsearch.nix + ./services/search/elasticsearch-curator.nix ./services/search/hound.nix ./services/search/kibana.nix ./services/search/solr.nix diff --git a/nixos/modules/services/search/elasticsearch-curator.nix b/nixos/modules/services/search/elasticsearch-curator.nix index 63ffe10d21f0..43785c392fee 100644 --- a/nixos/modules/services/search/elasticsearch-curator.nix +++ b/nixos/modules/services/search/elasticsearch-curator.nix @@ -12,7 +12,7 @@ let # not a Python "NoneType" client: hosts: ${builtins.toJSON cfg.hosts} - port: ${cfg.port} + port: ${toString cfg.port} url_prefix: use_ssl: False certificate: From 16ce3c8f74c753633d320a59a6cc95f361eee101 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Tue, 21 Aug 2018 17:41:26 +0200 Subject: [PATCH 61/79] elasticsearch-curator: include missing boto3 dependency TODO: we're still missing the requests-aws4auth>=0.9 dependency --- .../python-modules/elasticsearch-curator/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index 4b0aba45cd7a..c3e6df2da475 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, boto3 , click , certifi , voluptuous @@ -33,6 +34,7 @@ buildPythonPackage rec { voluptuous pyyaml elasticsearch + boto3 ]; checkInputs = [ From 61b646741c5d4b43009e1abf17770b0d3047cfad Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 16:34:56 +0200 Subject: [PATCH 62/79] pythonPackages.requests-aws4auth: init at 0.9 Needed by elasticsearch-curator. --- .../elasticsearch-curator/default.nix | 2 ++ .../requests-aws4auth/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/requests-aws4auth/default.nix diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index c3e6df2da475..7df3049a493a 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -4,6 +4,7 @@ , boto3 , click , certifi +, requests-aws4auth , voluptuous , pyyaml , elasticsearch @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click certifi + requests-aws4auth voluptuous pyyaml elasticsearch diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix new file mode 100644 index 000000000000..05a15841c42b --- /dev/null +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, requests }: +buildPythonPackage rec { + pname = "requests-aws4auth"; + version = "0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0g52a1pm53aqkc9qb5q1m918c1qy6q47c1qz63p5ilynfbs3m5y9"; + }; + + propagatedBuildInputs = [ requests ]; + + doCheck = false; + + meta = with lib; { + description = "Amazon Web Services version 4 authentication for the Python Requests library."; + homepage = https://github.com/sam-washington/requests-aws4auth; + license = licenses.mit; + maintainers = [ maintainers.basvandijk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 322f831b4b50..3ba335146ce3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2009,6 +2009,8 @@ in { requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; + requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; + howdoi = callPackage ../development/python-modules/howdoi {}; neurotools = callPackage ../development/python-modules/neurotools {}; From 8aa331874175dc3d35c9211ea2e627c8194f40d4 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 16:44:27 +0200 Subject: [PATCH 63/79] elasticsearch-curator: disable test-suite because it hangs --- .../python-modules/elasticsearch-curator/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index 7df3049a493a..3b882c5f8731 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -24,10 +24,7 @@ buildPythonPackage rec { sha256 = "e75abeb7f7be939b1c64c071898760dc10ab5f08307c253fc074abf8a41a76f0"; }; - # The integration tests require a running elasticsearch cluster. - postUnpackPhase = '' - rm -r test/integration - ''; + doCheck = false; propagatedBuildInputs = [ click From 241377ee76b0f3c8f9a852756689ec01fe05764a Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 16:46:39 +0200 Subject: [PATCH 64/79] nixos/tests/elk.nix: make sure the test doesn't wait for too long on elasticsearch-curator --- nixos/tests/elk.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 665e27a05534..15be72b80bba 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -72,7 +72,7 @@ let 1: action: delete_indices description: >- - Delete indices older than 1 minute (based on index name), for logstash- + Delete indices older than 1 second (based on index name), for logstash- prefixed indices. Ignore the error if the filter does not result in an actionable list of indices (ignore_empty_list) and exit cleanly. options: @@ -86,7 +86,7 @@ let source: name direction: older timestring: '%Y.%m.%d' - unit: minutes + unit: seconds unit_count: 1 ''; }; @@ -118,6 +118,8 @@ let # See if logstash messages arive in elasticsearch. $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"flowers\"}}}' | jq .hits.total | grep -v 0"); $one->waitUntilSucceeds("curl --silent --show-error '${esUrl}/_search' -H 'Content-Type: application/json' -d '{\"query\" : { \"match\" : { \"message\" : \"dragons\"}}}' | jq .hits.total | grep 0"); + + # Test elasticsearch-curator. $one->systemctl("stop logstash"); $one->systemctl("start elasticsearch-curator"); $one->waitUntilSucceeds("! curl --silent --show-error '${esUrl}/_cat/indices' | grep logstash | grep -q ^$1"); From 228705fc3358ab9e6eeee44e623fae406a45f8d6 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sat, 25 Aug 2018 18:59:32 +0200 Subject: [PATCH 65/79] elasticsearch-curator: add note to the NixOS release notes --- nixos/doc/manual/release-notes/rl-1809.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 8ee2a5f16238..d190394b9887 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -111,6 +111,12 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' stroke configuration interface. + + + The new services.elasticsearch-curator service + periodically curates or manages, your Elasticsearch indices and snapshots. + + From 9f0eb759a40143770e24e801cc16415cf71ee04c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 24 Aug 2018 12:51:10 +0200 Subject: [PATCH 66/79] gnome3.gconf: re-add as a pointer to the removal PR MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/NixOS/nixpkgs/pull/43268 removed GConf from GNOME 3 package set, let’s add an error for a little while to save people digging through the commit log. --- pkgs/desktops/gnome-3/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 18db0e5ba812..ff0937642674 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -399,6 +399,8 @@ lib.makeScope pkgs.newScope (self: with self; { gnome-packagekit = callPackage ./misc/gnome-packagekit { }; + # TODO: remove this after 18.09 has forked off + gconf = throw "gconf is deprecated since 2009 and has been removed from the package set. Use gnome2.GConf instead. For more details see https://github.com/NixOS/nixpkgs/pull/43268"; } // lib.optionalAttrs (config.allowAliases or true) { #### Legacy aliases From 32c3cbdadd288a906f66c9828516868e71d21e63 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Fri, 24 Aug 2018 16:54:50 +0300 Subject: [PATCH 67/79] nftables: enable works in linux kernel 4.17 and 4.18 --- pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 548c66e87e63..dd3186bc8760 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -146,6 +146,14 @@ let # needed for iwd WPS support (wpa_supplicant replacement) KEY_DH_OPERATIONS = whenAtLeast "4.7" yes; + + # needed for nftables + NF_TABLES_INET = whenAtLeast "4.17" yes; + NF_TABLES_NETDEV = whenAtLeast "4.17" yes; + NF_TABLES_IPV4 = whenAtLeast "4.17" yes; + NF_TABLES_ARP = whenAtLeast "4.17" yes; + NF_TABLES_IPV6 = whenAtLeast "4.17" yes; + NF_TABLES_BRIDGE = whenAtLeast "4.17" yes; }; wireless = { From d5e7d48f5e10d58bdb2ed08214b4e33333e69763 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 26 Aug 2018 01:12:16 +0200 Subject: [PATCH 68/79] requests-aws4auth: only disable tests on python >= 3 --- .../python-modules/requests-aws4auth/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 05a15841c42b..b7010eccf0b3 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -1,4 +1,5 @@ -{ lib, buildPythonPackage, fetchPypi, requests }: +{ lib, buildPythonPackage, fetchPypi, fetchzip, isPy3k, requests }: +with lib; buildPythonPackage rec { pname = "requests-aws4auth"; version = "0.9"; @@ -8,11 +9,17 @@ buildPythonPackage rec { sha256 = "0g52a1pm53aqkc9qb5q1m918c1qy6q47c1qz63p5ilynfbs3m5y9"; }; + postPatch = optionalString isPy3k '' + sed "s/path_encoding_style/'path_encoding_style'/" \ + -i requests_aws4auth/service_parameters.py + ''; + propagatedBuildInputs = [ requests ]; - doCheck = false; + # The test fail on Python >= 3 because of module import errors. + doCheck = !isPy3k; - meta = with lib; { + meta = { description = "Amazon Web Services version 4 authentication for the Python Requests library."; homepage = https://github.com/sam-washington/requests-aws4auth; license = licenses.mit; From 9364a931e98fbd1182954e69ccb9baf1c2f95d59 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Aug 2018 00:57:15 +0200 Subject: [PATCH 69/79] gnome3.quadrapassel: clean up --- .../gnome-3/games/quadrapassel/default.nix | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index b0572f981ded..7ae226b3f8e5 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -2,8 +2,10 @@ , librsvg, libcanberra-gtk3 , intltool, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook }: -stdenv.mkDerivation rec { - name = "quadrapassel-${version}"; +let + pname = "quadrapassel"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; version = "3.22.0"; src = fetchurl { @@ -11,22 +13,26 @@ stdenv.mkDerivation rec { sha256 = "0ed44ef73c8811cbdfc3b44c8fd80eb6e2998d102d59ac324e4748f5d9dddb55"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "quadrapassel"; attrPath = "gnome3.quadrapassel"; }; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg - libcanberra-gtk3 itstool intltool clutter - libxml2 clutter-gtk wrapGAppsHook ]; + nativeBuildInputs = [ pkgconfig itstool intltool wrapGAppsHook ]; + buildInputs = [ + gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libcanberra-gtk3 clutter libxml2 clutter-gtk + ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "gnome3.${pname}"; + }; + }; + meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Apps/Quadrapassel; description = "Classic falling-block game, Tetris"; - maintainers = gnome3.maintainers; + homepage = https://wiki.gnome.org/Apps/Quadrapassel; license = licenses.gpl2; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; } From ce3584860c2683bf2e5df36c7aa5c0231dfa88b1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 26 Aug 2018 01:03:59 +0200 Subject: [PATCH 70/79] libmanette: init at 0.2.1 --- .../libraries/libmanette/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/libraries/libmanette/default.nix diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix new file mode 100644 index 000000000000..51d2e49eb350 --- /dev/null +++ b/pkgs/development/libraries/libmanette/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, ninja, meson, pkgconfig, vala, gobjectIntrospection +, glib, libgudev, libevdev, gnome3 }: + +let + version = "0.2.1"; + pname = "libmanette"; +in +stdenv.mkDerivation { + name = "${pname}-${version}"; + + outputs = [ "out" "dev" ]; + + src = fetchurl { + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "14vqz30p4693yy3yxs0gj858x25sl2kawib1g9lj8g5frgl0hd82"; + }; + + nativeBuildInputs = [ meson ninja pkgconfig vala gobjectIntrospection ]; + buildInputs = [ glib libgudev libevdev ]; + + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + + meta = with stdenv.lib; { + description = "A simple GObject game controller library"; + homepage = https://wiki.gnome.org/Apps/Builder; + license = licenses.lgpl21Plus; + maintainers = gnome3.maintainers; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58810084202d..60dcc9b17a97 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10625,6 +10625,8 @@ with pkgs; libmad = callPackage ../development/libraries/libmad { }; + libmanette = callPackage ../development/libraries/libmanette { }; + libmatchbox = callPackage ../development/libraries/libmatchbox { }; libmatheval = callPackage ../development/libraries/libmatheval { From 954eb34a5363877e5efed27ddc2bc748f6265019 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 26 Aug 2018 01:20:15 +0200 Subject: [PATCH 71/79] elasticsearch-curator: explain why we disable the test-suite --- .../development/python-modules/elasticsearch-curator/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/elasticsearch-curator/default.nix b/pkgs/development/python-modules/elasticsearch-curator/default.nix index 3b882c5f8731..1ea6e4cabad8 100644 --- a/pkgs/development/python-modules/elasticsearch-curator/default.nix +++ b/pkgs/development/python-modules/elasticsearch-curator/default.nix @@ -24,6 +24,7 @@ buildPythonPackage rec { sha256 = "e75abeb7f7be939b1c64c071898760dc10ab5f08307c253fc074abf8a41a76f0"; }; + # The test hangs so we disable it. doCheck = false; propagatedBuildInputs = [ From 85d5d714443afd64b24c44e236b00ea056de223a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 25 Aug 2018 19:02:48 -0500 Subject: [PATCH 72/79] fwupdate: 10 -> 12 (#44710) --- .../linux/firmware/fwupdate/default.nix | 6 +- .../linux/firmware/fwupdate/fix-paths.patch | 116 ------------------ 2 files changed, 2 insertions(+), 120 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index fd0d222eaac8..5b14546c90fd 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -1,16 +1,14 @@ { efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: let - version = "10"; + version = "12"; in stdenv.mkDerivation { name = "fwupdate-${version}"; src = fetchurl { url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; - sha256 = "0fpk3q0msq2l0bs2mvk0cqp8jbwnmi17ggc81r4v96h4jxh2rx3k"; + sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; }; patches = [ - # https://github.com/rhboot/fwupdate/pull/99 - ./fix-paths.patch ./do-not-create-sharedstatedir.patch ]; diff --git a/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch b/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch deleted file mode 100644 index b01dfa355ef7..000000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/fix-paths.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/Make.defaults -+++ b/Make.defaults -@@ -18,19 +18,20 @@ - ABIDIFF := abidiff - ABIDW := abidw - prefix ?= /usr/ --prefix := $(abspath $(prefix))/ -+prefix := $(abspath $(prefix)) -+exec_prefix ?= $(prefix) - ARCH = $(shell $(CC) -dumpmachine | cut -f1 -d- | sed s,i[3456789]86,ia32,) - ifeq ($(ARCH),x86_64) -- LIBDIR ?= $(prefix)lib64 -+ LIBDIR ?= $(exec_prefix)/lib64 - endif - ifeq ($(ARCH),ia32) -- LIBDIR ?= $(prefix)lib -+ LIBDIR ?= $(exec_prefix)/lib - endif - ifeq ($(ARCH),aarch64) -- LIBDIR ?= $(prefix)lib64 -+ LIBDIR ?= $(exec_prefix)/lib64 - endif - ifeq ($(ARCH),arm) -- LIBDIR ?= $(prefix)lib -+ LIBDIR ?= $(exec_prefix)/lib - endif - LIBDIR ?= unknown - ifeq ($(LIBDIR),unknown) -@@ -45,13 +46,13 @@ - GNUEFIDIR ?= $(LIBDIR)/gnuefi - libdir ?= $(LIBDIR) - pcdir ?= $(libdir)/pkgconfig --mandir ?= $(prefix)share/man --includedir ?= $(prefix)include --bindir ?= $(prefix)bin --datadir ?= $(prefix)share -+mandir ?= $(prefix)/share/man -+includedir ?= $(prefix)/include -+bindir ?= $(exec_prefix)/bin -+datadir ?= $(prefix)/share - localedir ?= $(datadir)/locale --libexecdir ?= $(prefix)libexec --libdatadir ?= $(prefix)lib -+libexecdir ?= $(exec_prefix)/libexec -+libdatadir ?= $(exec_prefix)/lib - sharedstatedir ?= /var/lib - - EFIDIR ?= $(shell x=$$(which --skip-alias --skip-functions git 2>/dev/null) ; [ -n "$$x" ] && git config --get fwupdate.efidir) -@@ -63,8 +64,8 @@ - ESPMOUNTPOINT = "/boot/efi" - endif - --DEBUGINFO ?= $(prefix)lib/debug --DEBUGSOURCE ?= $(prefix)src/debug -+DEBUGINFO ?= $(exec_prefix)/lib/debug -+DEBUGSOURCE ?= $(prefix)/src/debug - TARGETDIR ?= $(ESPMOUNTPOINT)/EFI/$(EFIDIR) - - .PHONY: check_efidir_error ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -93,16 +93,19 @@ - sed -e "s,@@VERSION@@,$(VERSION),g" \ - -e "s,@@FWUP_MAJOR_VERSION@@,$(MAJOR_VERSION),g" \ - -e "s,@@FWUP_MINOR_VERSION@@,$(MINOR_VERSION),g" \ -+ -e "s,@@PREFIX@@,$(prefix),g" \ -+ -e "s,@@EXEC_PREFIX@@,$(exec_prefix),g" \ - -e "s,@@SHAREDSTATEDIR@@,$(sharedstatedir),g" \ - -e "s,@@ESPMOUNTPOINT@@,$(ESPMOUNTPOINT),g" \ - -e "s,@@EFIDIR@@,$(EFIDIR),g" \ - -e "s,@@LIBDIR@@,$(libdir),g" \ - -e "s,@@LIBEXECDIR@@,$(libexecdir),g" \ -+ -e "s,@@INCLUDEDIR@@,$(includedir),g" \ - $< > $@ - - tester : tester.c -- $(CC) -Wall -Werror -ggdb -L. -I./include -I/usr/include/efivar \ -- -lefivar -lfwup -o $@ $^ -+ $(CC) -Wall -Werror -ggdb -L. -I./include $(shell $(PKG_CONFIG) --cflags efivar) \ -+ $(shell $(PKG_CONFIG) --libs efivar) -lfwup -o $@ $^ - - test : tester - LD_LIBRARY_PATH=$(shell pwd) ./tester -@@ -134,6 +137,6 @@ - $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system - $(INSTALL) -m 644 cleanup.service \ - $(DESTDIR)$(libdatadir)/systemd/system/fwupdate-cleanup.service -- $(INSTALL) -d -m 755 $(DESTDIR)/usr/share/bash-completion/completions/ -+ $(INSTALL) -d -m 755 $(DESTDIR)$(datadir)/bash-completion/completions/ - $(INSTALL) -m 755 $(VPATH)/bash-completion \ -- $(DESTDIR)/usr/share/bash-completion/completions/fwupdate -+ $(DESTDIR)$(datadir)/bash-completion/completions/fwupdate ---- a/linux/fwup.pc.in -+++ b/linux/fwup.pc.in -@@ -1,7 +1,7 @@ --prefix=/usr --exec_prefix=/usr -+prefix=@@PREFIX@@ -+exec_prefix=@@EXEC_PREFIX@@ - libdir=@@LIBDIR@@ --includedir=/usr/include -+includedir=@@INCLUDEDIR@@ - - Name: fwup - Description: Library for deployment of UEFI firmware updates. ---- a/linux/libfwup.c -+++ b/linux/libfwup.c -@@ -35,7 +35,7 @@ - - #include - #ifdef FWUPDATE_HAVE_LIBSMBIOS__ --#include -+#include - #include - #endif - From 0fd58ed0997009431306e9b0ad36016f8bdab73e Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sun, 26 Aug 2018 02:23:32 +0200 Subject: [PATCH 73/79] 20kly: init at 1.4 (#45056) --- pkgs/games/20kly/default.nix | 40 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/games/20kly/default.nix diff --git a/pkgs/games/20kly/default.nix b/pkgs/games/20kly/default.nix new file mode 100644 index 000000000000..37cb96f2cfdb --- /dev/null +++ b/pkgs/games/20kly/default.nix @@ -0,0 +1,40 @@ +{ stdenv +, fetchurl +, python }: + +python.pkgs.buildPythonApplication rec { + pname = "20kly"; + version = "1.4"; + format = "other"; + disabled = !(python.isPy2 or false); + + src = fetchurl { + url = "http://jwhitham.org.uk/20kly/lightyears-${version}.tar.bz2"; + sha256 = "13h73cmfjqkipffimfc4iv0hf89if490ng6vd6xf3wcalpgaim5d"; + }; + + patchPhase = '' + substituteInPlace lightyears \ + --replace \ + "LIGHTYEARS_DIR = \".\"" \ + "LIGHTYEARS_DIR = \"$out/share\"" + ''; + + propagatedBuildInputs = with python.pkgs; [ pygame ]; + + buildPhase = "python -O -m compileall ."; + + installPhase = '' + mkdir -p "$out/share" + cp -r audio code data lightyears "$out/share" + install -Dm755 lightyears "$out/bin/lightyears" + ''; + + meta = with stdenv.lib; { + description = "A steampunk-themed strategy game where you have to manage a steam supply network"; + homepage = http://jwhitham.org.uk/20kly/; + license = licenses.gpl2; + maintainers = with maintainers; [ fgaz ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f979846d773..a434aee6c189 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19572,6 +19572,8 @@ with pkgs; _2048-in-terminal = callPackage ../games/2048-in-terminal { }; + _20kly = callPackage ../games/20kly { }; + _90secondportraits = callPackage ../games/90secondportraits { love = love_0_10; }; adom = callPackage ../games/adom { }; From 81d5061a192bad28661e979cee080524b202005c Mon Sep 17 00:00:00 2001 From: Emmanuel Rosa Date: Sat, 18 Aug 2018 09:14:25 +0700 Subject: [PATCH 74/79] skypeforlinux: 8.24.0.2 -> 8.28.0.41 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 9fe03b274cff..d728c8d95cca 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -6,7 +6,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.24.0.2"; + version = "8.28.0.41"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -56,7 +56,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "079bv0wilwwd9gqykcyfs4bj8za140788dxi058k4275h1jlvrww"; + sha256 = "1kydf71qbz35dx4674h3nxfx8a88k620217906i54ic4qq2mgy2x"; } else throw "Skype for linux is not supported on ${stdenv.system}"; From b7e0c40d299cfefca2e68db5ab9d3d26b013bdf8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 26 Aug 2018 09:31:39 +0200 Subject: [PATCH 75/79] docs python: `python.buildEnv` does not include `buildPythonApplication` modules Clarify the issue encountered at https://github.com/NixOS/nixpkgs/issues/45503 --- doc/languages-frameworks/python.section.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 93eb5af0f2cc..d825823d01a2 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -645,9 +645,15 @@ in python.withPackages(ps: [ps.blaze])).env #### `buildPythonApplication` function -The `buildPythonApplication` function is practically the same as `buildPythonPackage`. -The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. -Because this is irrelevant for applications, the prefix is omitted. +The `buildPythonApplication` function is practically the same as +`buildPythonPackage`. The main purpose of this function is to build a Python +package where one is interested only in the executables, and not importable +modules. For that reason, when adding this package to a `python.buildEnv`, the +modules won't be made available. + +Another difference is that `buildPythonPackage` by default prefixes the names of +the packages with the version of the interpreter. Because this is irrelevant for +applications, the prefix is omitted. #### `toPythonApplication` function From 30504063883a4bc341dd49be07be4bdbfd196ee3 Mon Sep 17 00:00:00 2001 From: xeji <36407913+xeji@users.noreply.github.com> Date: Sun, 26 Aug 2018 10:38:52 +0200 Subject: [PATCH 76/79] nixos/tests/matrix-synapse: fix test (#45596) Since matrix-synapse 0.33.0 underscores in server names are rejected by server name validation, causing the test to fail: valueError: Server name 'server_sqlite' contains invalid characters Relevant upstream change: https://github.com/matrix-org/synapse/commit/546bc9e28b3d7758c732df8e120639d58d455164 --- nixos/tests/matrix-synapse.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index 113fb622588b..8504a7c0d057 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -6,12 +6,13 @@ import ./make-test.nix ({ pkgs, ... } : { }; nodes = { - server_postgres = args: { + # Since 0.33.0, matrix-synapse doesn't allow underscores in server names + serverpostgres = args: { services.matrix-synapse.enable = true; services.matrix-synapse.database_type = "psycopg2"; }; - server_sqlite = args: { + serversqlite = args: { services.matrix-synapse.enable = true; services.matrix-synapse.database_type = "sqlite3"; }; @@ -19,12 +20,12 @@ import ./make-test.nix ({ pkgs, ... } : { testScript = '' startAll; - $server_postgres->waitForUnit("matrix-synapse.service"); - $server_postgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); - $server_postgres->requireActiveUnit("postgresql.service"); - $server_sqlite->waitForUnit("matrix-synapse.service"); - $server_sqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); - $server_sqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); + $serverpostgres->waitForUnit("matrix-synapse.service"); + $serverpostgres->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serverpostgres->requireActiveUnit("postgresql.service"); + $serversqlite->waitForUnit("matrix-synapse.service"); + $serversqlite->waitUntilSucceeds("curl -Lk https://localhost:8448/"); + $serversqlite->mustSucceed("[ -e /var/lib/matrix-synapse/homeserver.db ]"); ''; }) From 16f4076c7056288c99cbecceadf98b81dc32efc0 Mon Sep 17 00:00:00 2001 From: Augustin Borsu Date: Sun, 21 Jan 2018 19:11:33 +0100 Subject: [PATCH 77/79] jupyter-kernel: init This is a meta package for creating a jupyter notebook kernel definition folder. It must be used in conjunction with jupyter or jupyterhub to make different environements availables. --- pkgs/applications/editors/jupyter/kernel.nix | 74 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/applications/editors/jupyter/kernel.nix diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix new file mode 100644 index 000000000000..cdb6b6212bd3 --- /dev/null +++ b/pkgs/applications/editors/jupyter/kernel.nix @@ -0,0 +1,74 @@ +{ lib, stdenv, python3}: + +let + + default = { + python3 = let + env = (python3.withPackages (ps: with ps; [ ipykernel ])); + in { + displayName = "Python 3"; + argv = [ + "${env.interpreter}" + "-m" + "ipykernel_launcher" + "-f" + "{connection_file}" + ]; + language = "python"; + logo32 = "${env.sitePackages}/ipykernel/resources/logo-32x32.png"; + logo64 = "${env.sitePackages}/ipykernel/resources/logo-64x64.png"; + }; + }; + +in +{ + inherit default; + + # Definitions is an attribute set. + + create = { definitions ? default }: with lib; stdenv.mkDerivation rec { + + name = "jupyter-kernels"; + + src = "/dev/null"; + + unpackCmd = "mkdir jupyter_kernels"; + + installPhase = '' + mkdir kernels + + ${concatStringsSep "\n" (mapAttrsToList (kernelName: kernel: + let + config = builtins.toJSON { + display_name = if (kernel.displayName != "") + then kernel.displayName + else kernelName; + argv = kernel.argv; + language = kernel.language; + }; + logo32 = + if (kernel.logo32 != null) + then "ln -s ${kernel.logo32} 'kernels/${kernelName}/logo-32x32.png';" + else ""; + logo64 = + if (kernel.logo64 != null) + then "ln -s ${kernel.logo64} 'kernels/${kernelName}/logo-64x64.png';" + else ""; + in '' + mkdir 'kernels/${kernelName}'; + echo '${config}' > 'kernels/${kernelName}/kernel.json'; + ${logo32} + ${logo64} + '') definitions)} + + mkdir $out + cp -r kernels $out + ''; + + meta = { + description = "Wrapper to create jupyter notebook kernel definitions"; + homepage = http://jupyter.org/; + maintainers = with maintainers; [ aborsu ]; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a434aee6c189..472155ac265a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3383,6 +3383,8 @@ with pkgs; jupp = callPackage ../applications/editors/jupp { }; + jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; From 359368f76ff02a7f7229f2104d66de7643017f2d Mon Sep 17 00:00:00 2001 From: Augustin Borsu Date: Thu, 11 Jan 2018 21:52:29 +0100 Subject: [PATCH 78/79] jupyter: init Top-level jupyter package that, given kernel definitions, can be used with various kernels. --- pkgs/applications/editors/jupyter/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/editors/jupyter/default.nix diff --git a/pkgs/applications/editors/jupyter/default.nix b/pkgs/applications/editors/jupyter/default.nix new file mode 100644 index 000000000000..2bca120c1deb --- /dev/null +++ b/pkgs/applications/editors/jupyter/default.nix @@ -0,0 +1,18 @@ +# Jupyter notebook with the given kernel definitions + +{ python3 +, jupyter-kernel +, definitions ? jupyter-kernel.default +}: + +let + + jupyterPath = (jupyter-kernel.create { inherit definitions; }); + +in + +with python3.pkgs; toPythonModule ( + notebook.overridePythonAttrs(oldAttrs: { + makeWrapperArgs = ["--set JUPYTER_PATH ${jupyterPath}"]; + }) +) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 472155ac265a..4d2bf622e44e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3383,6 +3383,8 @@ with pkgs; jupp = callPackage ../applications/editors/jupp { }; + jupyter = callPackage ../applications/editors/jupyter { }; + jupyter-kernel = callPackage ../applications/editors/jupyter/kernel.nix { }; jwhois = callPackage ../tools/networking/jwhois { }; From 4d3ce5ca36a145748a4938cb0127c115d8fbacf0 Mon Sep 17 00:00:00 2001 From: Augustin Borsu Date: Fri, 12 Jan 2018 00:13:55 +0100 Subject: [PATCH 79/79] nixos/jupyter: init service --- nixos/modules/module-list.nix | 1 + .../services/development/jupyter/default.nix | 184 ++++++++++++++++++ .../development/jupyter/kernel-options.nix | 60 ++++++ 3 files changed, 245 insertions(+) create mode 100644 nixos/modules/services/development/jupyter/default.nix create mode 100644 nixos/modules/services/development/jupyter/kernel-options.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 85440a8025c9..12944857af4e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -250,6 +250,7 @@ ./services/desktops/zeitgeist.nix ./services/development/bloop.nix ./services/development/hoogle.nix + ./services/development/jupyter/default.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix new file mode 100644 index 000000000000..9fcc00431865 --- /dev/null +++ b/nixos/modules/services/development/jupyter/default.nix @@ -0,0 +1,184 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.jupyter; + + # NOTE: We don't use top-level jupyter because we don't + # want to pass in JUPYTER_PATH but use .environment instead, + # saving a rebuild. + package = pkgs.python3.pkgs.notebook; + + kernels = (pkgs.jupyter-kernel.create { + definitions = if cfg.kernels != null + then cfg.kernels + else pkgs.jupyter-kernel.default; + }); + + notebookConfig = pkgs.writeText "jupyter_config.py" '' + ${cfg.notebookConfig} + + c.NotebookApp.password = ${cfg.password} + ''; + +in { + meta.maintainers = with maintainers; [ aborsu ]; + + options.services.jupyter = { + enable = mkEnableOption "Jupyter development server"; + + ip = mkOption { + type = types.str; + default = "localhost"; + description = '' + IP address Jupyter will be listening on. + ''; + }; + + port = mkOption { + type = types.int; + default = 8888; + description = '' + Port number Jupyter will be listening on. + ''; + }; + + notebookDir = mkOption { + type = types.str; + default = "~/"; + description = '' + Root directory for notebooks. + ''; + }; + + user = mkOption { + type = types.str; + default = "jupyter"; + description = '' + Name of the user used to run the jupyter service. + For security reason, jupyter should really not be run as root. + If not set (jupyter), the service will create a jupyter user with appropriate settings. + ''; + example = "aborsu"; + }; + + group = mkOption { + type = types.str; + default = "jupyter"; + description = '' + Name of the group used to run the jupyter service. + Use this if you want to create a group of users that are able to view the notebook directory's content. + ''; + example = "users"; + }; + + password = mkOption { + type = types.str; + description = '' + Password to use with notebook. + Can be generated using: + In [1]: from notebook.auth import passwd + In [2]: passwd('test') + Out[2]: 'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba' + NOTE: you need to keep the single quote inside the nix string. + Or you can use a python oneliner: + "open('/path/secret_file', 'r', encoding='utf8').read().strip()" + It will be interpreted at the end of the notebookConfig. + ''; + example = [ + "'sha1:1b961dc713fb:88483270a63e57d18d43cf337e629539de1436ba'" + "open('/path/secret_file', 'r', encoding='utf8').read().strip()" + ]; + }; + + notebookConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Raw jupyter config. + ''; + }; + + kernels = mkOption { + type = types.nullOr (types.attrsOf(types.submodule (import ./kernel-options.nix { + inherit lib; + }))); + + default = null; + example = literalExample '' + { + python3 = let + env = (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [ + ipykernel + pandas + scikitlearn + ])); + in { + displayName = "Python 3 for machine learning"; + argv = [ + "$ {env.interpreter}" + "-m" + "ipykernel_launcher" + "-f" + "{connection_file}" + ]; + language = "python"; + logo32 = "$ {env.sitePackages}/ipykernel/resources/logo-32x32.png"; + logo64 = "$ {env.sitePackages}/ipykernel/resources/logo-64x64.png"; + }; + } + ''; + description = "Declarative kernel config + + Kernels can be declared in any language that supports and has the required + dependencies to communicate with a jupyter server. + In python's case, it means that ipykernel package must always be included in + the list of packages of the targeted environment. + "; + }; + }; + + config = mkMerge [ + (mkIf cfg.enable { + systemd.services.jupyter = { + description = "Jupyter development server"; + + wantedBy = [ "multi-user.target" ]; + + # TODO: Patch notebook so we can explicitly pass in a shell + path = [ pkgs.bash ]; # needed for sh in cell magic to work + + environment = { + JUPYTER_PATH = toString kernels; + }; + + serviceConfig = { + Restart = "always"; + ExecStart = ''${package}/bin/jupyter-notebook \ + --no-browser \ + --ip=${cfg.ip} \ + --port=${toString cfg.port} --port-retries 0 \ + --notebook-dir=${cfg.notebookDir} \ + --NotebookApp.config_file=${notebookConfig} + ''; + User = cfg.user; + Group = cfg.group; + WorkingDirectory = "~"; + }; + }; + }) + (mkIf (cfg.enable && (cfg.group == "jupyter")) { + users.groups.jupyter = {}; + }) + (mkIf (cfg.enable && (cfg.user == "jupyter")) { + users.extraUsers.jupyter = { + extraGroups = [ cfg.group ]; + home = "/var/lib/jupyter"; + createHome = true; + useDefaultShell = true; # needed so that the user can start a terminal. + }; + }) + ]; +} diff --git a/nixos/modules/services/development/jupyter/kernel-options.nix b/nixos/modules/services/development/jupyter/kernel-options.nix new file mode 100644 index 000000000000..03547637449a --- /dev/null +++ b/nixos/modules/services/development/jupyter/kernel-options.nix @@ -0,0 +1,60 @@ +# Options that can be used for creating a jupyter kernel. +{lib }: + +with lib; + +{ + options = { + + displayName = mkOption { + type = types.str; + default = ""; + example = [ + "Python 3" + "Python 3 for Data Science" + ]; + description = '' + Name that will be shown to the user. + ''; + }; + + argv = mkOption { + type = types.listOf types.str; + example = [ + "{customEnv.interpreter}" + "-m" + "ipykernel_launcher" + "-f" + "{connection_file}" + ]; + description = '' + Command and arguments to start the kernel. + ''; + }; + + language = mkOption { + type = types.str; + example = "python"; + description = '' + Language of the environment. Typically the name of the binary. + ''; + }; + + logo32 = mkOption { + type = types.nullOr types.path; + default = null; + example = "{env.sitePackages}/ipykernel/resources/logo-32x32.png"; + description = '' + Path to 32x32 logo png. + ''; + }; + logo64 = mkOption { + type = types.nullOr types.path; + default = null; + example = "{env.sitePackages}/ipykernel/resources/logo-64x64.png"; + description = '' + Path to 64x64 logo png. + ''; + }; + }; +}