From 6126e3add47eecfbbdedcd39db56c01dc0b96b31 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 8 Sep 2017 09:03:49 -0300 Subject: [PATCH 001/115] Moe: init at 1.9 Moe is a small text editor. --- pkgs/applications/editors/moe/default.nix | 36 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/applications/editors/moe/default.nix diff --git a/pkgs/applications/editors/moe/default.nix b/pkgs/applications/editors/moe/default.nix new file mode 100644 index 000000000000..a1506eb9d6cc --- /dev/null +++ b/pkgs/applications/editors/moe/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl +, lzip, ncurses +}: + +with stdenv.lib; +stdenv.mkDerivation rec { + + name = "moe-${version}"; + version = "1.9"; + + src = fetchurl { + url = "mirror://gnu/moe/${name}.tar.lz"; + sha256 = "1wsfzy0iia0c89wnx1ilzw54wqcmlp2nz8mkpvc393z0zagrx48q"; + }; + + nativeBuildInputs = [ lzip ]; + buildInputs = [ ncurses ]; + + meta = { + description = "A small, 8-bit clean editor"; + longDescription = '' + GNU moe is a powerful, 8-bit clean, console text editor for ISO-8859 and + ASCII character encodings. It has a modeless, user-friendly interface, + online help, multiple windows, unlimited undo/redo capability, unlimited + line length, unlimited buffers, global search/replace (on all buffers at + once), block operations, automatic indentation, word wrapping, file name + completion, directory browser, duplicate removal from prompt histories, + delimiter matching, text conversion from/to UTF-8, romanization, etc. + ''; + homepage = http://www.gnu.org/software/moe/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.linux; + }; +} +# TODO: a configurable, global moerc file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce213c8688a1..e405d1e58187 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14601,6 +14601,8 @@ with pkgs; mi2ly = callPackage ../applications/audio/mi2ly {}; + moe = callPackage ../applications/editors/moe { }; + praat = callPackage ../applications/audio/praat { }; quvi = callPackage ../applications/video/quvi/tool.nix { From f068f3f209a25a64a1932cccd8bfb5753dcf5ec6 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 9 Sep 2017 18:28:25 +0200 Subject: [PATCH 002/115] mupen64plus: 1.5 -> 2.5 --- pkgs/misc/emulators/mupen64plus/default.nix | 36 ++++++++------------- pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 15 insertions(+), 25 deletions(-) diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 0e3c156c16ae..ea35ee8ac54b 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,35 +1,27 @@ -{stdenv, fetchurl, which, pkgconfig, SDL, gtk2, mesa, SDL_ttf}: +{stdenv, lib, fetchurl, boost, dash, freetype, libpng, pkgconfig, SDL, which, zlib }: + +stdenv.mkDerivation rec { + name = "mupen64plus-${version}"; + version = "2.5"; -stdenv.mkDerivation { - name = "mupen64plus-1.5"; src = fetchurl { - url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz; - sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq"; + url = "https://github.com/mupen64plus/mupen64plus-core/releases/download/${version}/mupen64plus-bundle-src-${version}.tar.gz"; + sha256 = "0rmsvfn4zfvbhz6gf1xkb7hnwflv6sbklwjz2xk4dlpj4vcbjxcw"; }; - buildInputs = [ which pkgconfig SDL gtk2 mesa SDL_ttf ]; + buildInputs = [ boost dash freetype libpng pkgconfig SDL which zlib ]; - hardeningDisable = [ "format" ]; - - preConfigure = '' - # Some C++ incompatibility fixes - sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp - sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp - - # Fix some hardcoded paths - sed -i -e "s|/usr/local|$out|g" main/main.c - - # Remove PATH environment variable from install script - sed -i -e "s|export PATH=|#export PATH=|" ./install.sh + buildPhase = '' + dash m64p_build.sh PREFIX="$out" COREDIR="$out/lib/" PLUGINDIR="$out/lib/mupen64plus" SHAREDIR="$out/share/mupen64plus" + ''; + installPhase = '' + dash m64p_install.sh DESTDIR="$out" PREFIX="" ''; - - buildPhase = "make all"; - installPhase = "PREFIX=$out make install"; meta = { description = "A Nintendo 64 Emulator"; license = stdenv.lib.licenses.gpl2Plus; - homepage = http://code.google.com/p/mupen64plus; + homepage = http://www.mupen64plus.org/; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33532908ceb8..bcee00b1459d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18844,9 +18844,7 @@ with pkgs; mongoc = callPackage ../development/libraries/mongoc { }; - mupen64plus = callPackage ../misc/emulators/mupen64plus { - stdenv = overrideCC stdenv gcc49; - }; + mupen64plus = callPackage ../misc/emulators/mupen64plus { }; mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; From cf32537210014b55b69c2ad1f62db91b3a3ff000 Mon Sep 17 00:00:00 2001 From: timor Date: Sat, 9 Sep 2017 20:18:35 +0200 Subject: [PATCH 003/115] coin3d: include fix for newer compilers This manifests as a segfault in any applications that use the library. --- pkgs/development/libraries/coin3d/default.nix | 3 +++ .../libraries/coin3d/sbhashentry.patch | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/coin3d/sbhashentry.patch diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index 034d7d658e17..ce78a6fc1347 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation rec { sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20"; }) ./gcc-4.8.patch # taken from FC-17 source rpm + # see https://bitbucket.org/Coin3D/coin/issues/128/crash-in-cc_memalloc_deallocate + # patch adapted from https://bitbucket.org/Coin3D/coin/pull-requests/75/added-fix-for-issue-128-provided-by-fedora/diff + ./sbhashentry.patch ]; buildInputs = [ mesa ]; diff --git a/pkgs/development/libraries/coin3d/sbhashentry.patch b/pkgs/development/libraries/coin3d/sbhashentry.patch new file mode 100644 index 000000000000..88c9a5f02a25 --- /dev/null +++ b/pkgs/development/libraries/coin3d/sbhashentry.patch @@ -0,0 +1,25 @@ +diff -u --label /tmp/Coin-3.1.3/src/misc/SbHash.h --label \#\ /tmp/Coin-3.1.3/src/misc/SbHash.h /tmp/buffer-content-21756V0 +--- a/src/misc/SbHash.h ++++ b/src/misc/SbHash.h +@@ -88,8 +88,8 @@ + SbHashEntry * entry = static_cast *>( ptr); + cc_memalloc_deallocate(entry->memhandler, ptr); + } +- SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {} +- ++ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler) ++ : key(key), obj(obj), memhandler(memhandler) {} + Key key; + Type obj; + SbHashEntry * next; +@@ -218,7 +218,7 @@ + /* Key not already in the hash table; insert a new + * entry as the first element in the bucket + */ +- entry = new (this->memhandler) SbHashEntry(key, obj); ++ entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; + + +Diff finished. Sat Sep 9 19:50:32 2017 From 0a4a6f71cb37d2fb774d05ad83c7c1e03611be75 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 9 Sep 2017 21:11:39 +0200 Subject: [PATCH 004/115] bitcoin-classic: 1.2.5 -> 1.3.6 --- pkgs/applications/altcoins/bitcoin-classic.nix | 4 ++-- pkgs/applications/altcoins/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix index 5f17eb3a1cf6..d2878a17fb3a 100644 --- a/pkgs/applications/altcoins/bitcoin-classic.nix +++ b/pkgs/applications/altcoins/bitcoin-classic.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "1.2.5"; + version = "1.3.6"; src = fetchFromGitHub { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "00spils0gv8krx2nyxrf6j1dl81wmxk8xjkqc22cv7nsdnakzrvm"; + sha256 = "129gkg035gv7zmc463jl2spvdh0fl4q8v4jdaslfnp34hbwi1p07"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index a67e5559a53b..01e34a953bb3 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -8,8 +8,8 @@ rec { bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; boost = pkgs.boost; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = pkgs.boost; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; From 602e85105299f798c4da732712b006634fce6a74 Mon Sep 17 00:00:00 2001 From: timor Date: Sun, 10 Sep 2017 00:02:25 +0200 Subject: [PATCH 005/115] openafsClient: 1.6.20.2 -> 1.6.21 --- pkgs/servers/openafs-client/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index ebbd10e8fa2c..93c854d8e08b 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.20.2"; + version = "1.6.21"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "50234820c3da9752d2ca05fb7e83b7dc5c96a0e96a0b875ebc7ae3c835607614"; + sha256 = "ba9c1f615edd53b64fc271ad369c49a816acedca70cdd090975033469a84118f"; }; nativeBuildInputs = [ autoconf automake flex yacc perl which ]; @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.z77z ]; broken = - (builtins.compareVersions kernel.version "3.18" == -1); + (builtins.compareVersions kernel.version "3.18" == -1) || + (builtins.compareVersions kernel.version "4.13" == 0); }; } From 21bac5cbfb3b622cb689e81d5b372b8cccb0fad5 Mon Sep 17 00:00:00 2001 From: Itai Zukerman Date: Sat, 9 Sep 2017 15:46:01 -0700 Subject: [PATCH 006/115] plex: 1.7.5 -> 1.8.4 --- pkgs/servers/plex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 0e5cb3e697f5..9b2278fe3667 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -6,9 +6,9 @@ let plexPass = throw "Plex pass has been removed at upstream's request; please unset nixpkgs.config.plex.pass"; plexpkg = if enablePlexPass then plexPass else { - version = "1.7.5.4035"; - vsnHash = "313f93718"; - sha256 = "89b8585e561046a8422d520ebcdae784f5dc3c895aac8d313c435cc6b58795b8"; + version = "1.8.4.4249"; + vsnHash = "3497d6779"; + sha256 = "ca3db297f4dbc73a5a405ac032ff250e5df97b84da6dcac55165b13e6445ca80"; }; in stdenv.mkDerivation rec { From 405050b2cb3e4234a87576be49a706ddae819d7b Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 10 Sep 2017 11:25:29 +0800 Subject: [PATCH 007/115] znc: fix network example configuration s/ssl/useSSL/ --- nixos/modules/services/networking/znc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 2b9867ade10d..c408899a322e 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -261,7 +261,7 @@ in "freenode" = { server = "chat.freenode.net"; port = 6697; - ssl = true; + useSSL = true; modules = [ "simple_away" ]; }; }; From 83d89e9b22c631fb71c689321ff3a2d1a2571029 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 10 Sep 2017 11:30:46 +0800 Subject: [PATCH 008/115] znc: open firewall with configured port The configuration doesn't currently open the configured port, which is less convenient than opening it. --- nixos/modules/services/networking/znc.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 2b9867ade10d..2b4ca4a5fe52 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -350,6 +350,8 @@ in config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = [ cfg.port ]; + systemd.services.znc = { description = "ZNC Server"; wantedBy = [ "multi-user.target" ]; From 9b611844f1d9336f7ab20e576ebf045afe7696bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 Sep 2017 09:41:03 +0200 Subject: [PATCH 009/115] Agda: disable broken build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 020e1d446ca1..48b3108d0ed0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -899,8 +899,11 @@ self: super: { sha256 = "1vss7b99zrhw3r29krl1b60r4qk0m2mpwmrz8q8zdxrh33hb8pd7"; }); - # happy 1.19.6 and later break some packages. - Agda = super.Agda.override { happy = self.happy_1_19_5; }; + # happy 1.19.6+ broke the Agda build. Sticking with the previous version + # avoided that issue, but now the build fails with a segmentation fault + # during the install phase for no apparent reason: + # https://hydra.nixos.org/build/60678124 + Agda = markBroken (super.Agda.override { happy = self.happy_1_19_5; }); # https://github.com/jtdaugherty/text-zipper/issues/11 text-zipper = dontCheck super.text-zipper; From bb0f86be4315e1d0095c83d899a01cb6953afbd5 Mon Sep 17 00:00:00 2001 From: dywedir Date: Sun, 10 Sep 2017 10:43:11 +0300 Subject: [PATCH 010/115] fd: 2.0.0 -> 3.0.0 --- pkgs/tools/misc/fd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 763ca668d181..047840c5a18d 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { name = "fd-${version}"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - sha256 = "1xs4y9zf5m0ykl95787jv98xg0a60gkcyyh7kg7qg4xrcgf4qz4j"; + sha256 = "0d6xfcsz2xxggk4k7xsjhhzrkd5lj6h36h97krwdxpj4n0w6py93"; }; - depsSha256 = "1hxf3j4584jgpwrwykx6yil6q6ka9l81qvx6zrbprdxk3pslp049"; + depsSha256 = "1icfv3v2s4wgpnp2n74ws6xl449ilgdm08balxb0m1cq9ypy744f"; meta = { description = "A simple, fast and user-friendly alternative to find"; From 2dff799a10b8ba5d8424947c01fd10fad3d45f36 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 10 Sep 2017 15:44:52 +0800 Subject: [PATCH 011/115] sane-backends: support parallel building --- pkgs/applications/graphics/sane/backends/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix index ff3ebfad484a..3ef23142b2ed 100644 --- a/pkgs/applications/graphics/sane/backends/generic.nix +++ b/pkgs/applications/graphics/sane/backends/generic.nix @@ -20,12 +20,13 @@ stdenv.mkDerivation { outputs = [ "out" "doc" "man" ]; configureFlags = [] - ++ stdenv.lib.optional (avahi != null) "--enable-avahi" + ++ stdenv.lib.optional (avahi != null) "--enable-avahi" ++ stdenv.lib.optional (libusb1 != null) "--enable-libusb_1_0" ; buildInputs = [ avahi libusb1 libv4l net_snmp ]; nativeBuildInputs = [ gettext pkgconfig ]; + enableParallelBuilding = true; postInstall = let From 67c949a8b6367236867782fe6aa6ec2900ef9894 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 10 Sep 2017 15:45:09 +0800 Subject: [PATCH 012/115] sane-backends: 1.0.25 -> 1.0.27 Use a proper upstream as well. --- pkgs/applications/graphics/sane/backends/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index a3ca7fdd55df..20d5629b83a9 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -1,13 +1,11 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "1.0.25"; + version = "1.0.27"; src = fetchurl { - sha256 = "0b3fvhrxl4l82bf3v0j47ypjv6a0k5lqbgknrq1agpmjca6vmmx4"; + sha256 = "1j9nbqspaj0rlgalafb5z6r606k0i22kz0rcpd744p176yzlfdr9"; urls = [ - "http://pkgs.fedoraproject.org/repo/pkgs/sane-backends/sane-backends-${version}.tar.gz/f9ed5405b3c12f07c6ca51ee60225fe7/sane-backends-${version}.tar.gz" - "https://alioth.debian.org/frs/download.php/file/4146/sane-backends-${version}.tar.gz" + "https://alioth.debian.org/frs/download.php/latestfile/176/sane-backends-${version}.tar.gz" ]; - curlOpts = "--insecure"; }; }) From af1f99143f456fb768c88544d299964fc1cadfd9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 10 Sep 2017 15:45:41 +0800 Subject: [PATCH 013/115] sane-frontends: boy scout cleanups --- pkgs/applications/graphics/sane/frontends.nix | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index a956db400521..f6994db81e4b 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }: stdenv.mkDerivation rec { - name = "sane-frontends-1.0.14"; + name = "sane-frontends-${version}"; + version = "1.0.14"; src = fetchurl { - url = "https://alioth.debian.org/frs/download.php/file/1140/${name}.tar.gz"; + url = "https://alioth.debian.org/frs/download.php/latestfile/175/${name}.tar.gz"; sha256 = "1ad4zr7rcxpda8yzvfkq1rfjgx9nl6lan5a628wvpdbh3fn9v0z7"; }; @@ -12,15 +13,17 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c ''; - buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++ - (if libusb != null then [libusb] else []); + buildInputs = [ sane-backends libX11 gtk2 ] + ++ stdenv.lib.optional (libusb != null) libusb; + nativeBuildInputs = [ pkgconfig ]; - meta = { - homepage = http://www.sane-project.org/; + enableParallelBuilding = true; + + meta = with stdenv.lib; { description = "Scanner Access Now Easy"; - license = stdenv.lib.licenses.gpl2Plus; - - maintainers = [ stdenv.lib.maintainers.peti ]; - platforms = stdenv.lib.platforms.linux; + homepage = http://www.sane-project.org/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peti ]; + platforms = platforms.linux; }; } From 398b36431d6f08b4b9902a8e2d2d4eb0bd34e435 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 10 Sep 2017 09:46:26 +0200 Subject: [PATCH 014/115] ghc: remove obsolete 8.0.1 version --- pkgs/development/compilers/ghc/8.0.1.nix | 91 ------------------------ pkgs/top-level/haskell-packages.nix | 9 --- 2 files changed, 100 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/8.0.1.nix diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix deleted file mode 100644 index 6e47ee92630a..000000000000 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, ncurses, libiconv, binutils, coreutils -, hscolour, patchutils, sphinx - - # If enabled GHC will be build with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. -, enableIntegerSimple ? false, gmp -}: - -let - inherit (bootPkgs) ghc; - - fetchFilteredPatch = args: fetchurl (args // { - downloadToTemp = true; - postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" - ''; - }); -in -stdenv.mkDerivation rec { - version = "8.0.1"; - name = "ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/~ghc/8.0.1/${name}-src.tar.xz"; - sha256 = "1lniqy29djhjkddnailpaqhlqh4ld2mqvb1fxgxw1qqjhz6j1ywh"; - }; - - patches = [ - ./relocation.patch - - # Fix https://ghc.haskell.org/trac/ghc/ticket/12130 - (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/4d71cc89b4e9648f3fbb29c8fcd25d725616e265; sha256 = "0syaxb4y4s2dc440qmrggb4vagvqqhb55m6mx12rip4i9qhxl8k0"; }) - (fetchFilteredPatch { url = https://git.haskell.org/ghc.git/patch/2f8cd14fe909a377b3e084a4f2ded83a0e6d44dd; sha256 = "06zvlgcf50ab58bw6yw3krn45dsmhg4cmlz4nqff8k4z1f1bj01v"; }) - ] ++ stdenv.lib.optional stdenv.isLinux ./ghc-no-madv-free.patch; - - buildInputs = [ ghc perl hscolour sphinx]; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - preConfigure = '' - sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure - '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - '' + stdenv.lib.optionalString enableIntegerSimple '' - echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk - ''; - - configureFlags = [ - "--with-gcc=${stdenv.cc}/bin/cc" - "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" - "--datadir=$doc/share/doc/ghc" - ] ++ stdenv.lib.optional (! enableIntegerSimple) [ - "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" - ] ++ stdenv.lib.optional stdenv.isDarwin [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" - ]; - - # required, because otherwise all symbols from HSffi.o are stripped, and - # that in turn causes GHCi to abort - stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols"; - - postInstall = '' - paxmark m $out/lib/${name}/bin/{ghc,haddock} - - # Install the bash completion file. - install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc - - # Patch scripts to include "readelf" and "cat" in $PATH. - for i in "$out/bin/"*; do - test ! -h $i || continue - egrep --quiet '^#!' <(head -n 1 $i) || continue - sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ binutils coreutils ]}"' $i - done - ''; - - passthru = { - inherit bootPkgs; - }; - - meta = { - homepage = http://haskell.org/ghc; - description = "The Glasgow Haskell Compiler"; - maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; - inherit (ghc.meta) license platforms; - }; - -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 09e3835712fe..b3bbb0d5b643 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -66,11 +66,6 @@ in rec { bootPkgs = packages.ghc784; inherit (bootPkgs) hscolour; }; - ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec { - bootPkgs = packages.ghc7103; - inherit (bootPkgs) hscolour; - sphinx = pkgs.python27Packages.sphinx; - }; ghc802 = callPackage ../development/compilers/ghc/8.0.2.nix rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) hscolour; @@ -163,10 +158,6 @@ in rec { ghc = compiler.ghc7103; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-7.10.x.nix { }; }; - ghc801 = callPackage ../development/haskell-modules { - ghc = compiler.ghc801; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; - }; ghc802 = callPackage ../development/haskell-modules { ghc = compiler.ghc802; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.0.x.nix { }; From 003833f1ce59207a082714ba88ccaa950a927138 Mon Sep 17 00:00:00 2001 From: "hiberno (Christian Lask)" Date: Sun, 10 Sep 2017 10:28:15 +0200 Subject: [PATCH 015/115] rofi-pass: 1.5.0 -> 1.5.1 --- pkgs/tools/security/pass/rofi-pass.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index 2f3fab6de816..44bc40d95914 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "carnager"; repo = "rofi-pass"; rev = version; - sha256 = "08chbn966140p3gmgalkhhm01ym64fvb6d2w5mbwpyl0986m89ba"; + sha256 = "1qv1yphfy2zmiibc92kq1m0k8plal5wcb6jymc3ks2wrl4v98iy4"; }; buildInputs = [ makeWrapper ]; From c910bbb13412ca367a2de19c8d51eab052e0a114 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 10 Sep 2017 10:36:40 +0200 Subject: [PATCH 016/115] haskell: fix build of attoparsec-data Fixes: https://hydra.nixos.org/build/60421889 --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48b3108d0ed0..df45ad815b93 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -15,6 +15,13 @@ with haskellLib; self: super: { + attoparsec-time_1 = super.attoparsec-time_1.override { + doctest = super.doctest_0_13_0; + }; + attoparsec-data = super.attoparsec-data.override { + attoparsec-time = self.attoparsec-time_1; + }; + # This used to be a core package provided by GHC, but then the compiler # dropped it. We define the name here to make sure that old packages which # depend on this library still evaluate (even though they won't compile From 7d714726a78fc81ee69fb2b7111e8f0936ce856d Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Sun, 10 Sep 2017 10:45:33 +0200 Subject: [PATCH 017/115] haskellPackages.ghc-proofs: Disable hydra builds for ghc<8.2 --- pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 +++ 8 files changed, 24 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix index 387754d674e2..47c8e7fa69ec 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix @@ -49,6 +49,9 @@ self: super: { transformers = self.transformers_0_4_3_0; xhtml = self.xhtml_3000_2_1; + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # We have no working cabal-install at the moment. cabal-install = markBroken super.cabal-install; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix index f2e09ee69d64..6bb96704cc20 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix @@ -43,6 +43,9 @@ self: super: { transformers = self.transformers_0_4_3_0; xhtml = self.xhtml_3000_2_1; + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 656d21c739f9..d71d829bcb59 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -48,6 +48,9 @@ self: super: { sha256 = "193i1xmq6z0jalwmq0mhqk1khz6zz0i1hs6lgfd7ybd6qyaqnf5f"; }); + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # haddock: No input file(s). nats = dontHaddock super.nats; bytestring-builder = dontHaddock super.bytestring-builder; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix index b72f9e4c69fd..de47086409be 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix @@ -44,6 +44,9 @@ self: super: { # https://github.com/haskell/cabal/issues/2322 Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_5_1; process = self.process_1_2_3_0; }; + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix index b81fd3e81766..4b6baed49737 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix @@ -46,6 +46,9 @@ self: super: { # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index 61d7e53be222..43a1b1b70bd1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -42,6 +42,9 @@ self: super: { # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'. cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_5_1; }); + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # https://github.com/tibbe/hashable/issues/85 hashable = dontCheck super.hashable; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index b4e975187cca..372155a8791c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -37,6 +37,9 @@ self: super: { unix = null; xhtml = null; + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # https://github.com/peti/jailbreak-cabal/issues/9 jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_20_0_4; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index ade4d5e915dc..1dee726dcf36 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -44,6 +44,9 @@ self: super: { sha256 = "026vv2k3ks73jngwifszv8l59clg88pcdr4mz0wr0gamivkfa1zy"; }); + # Requires ghc 8.2 + ghc-proofs = dontDistribute super.ghc-proofs; + # http://hub.darcs.net/dolio/vector-algorithms/issue/9#comment-20170112T145715 vector-algorithms = dontCheck super.vector-algorithms; From 79c9adce657dd6d3a73cc830fe4f5316fa9dcd26 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 10 Sep 2017 10:55:58 +0200 Subject: [PATCH 018/115] nifskope: Fix build https://hydra.nixos.org/build/60608938 --- pkgs/tools/graphics/nifskope/default.nix | 6 +- pkgs/tools/graphics/nifskope/gcc-6.patch | 123 +++++++++++++++++++++++ 2 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/graphics/nifskope/gcc-6.patch diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index f66d01ef7aa3..19aa7f00f14a 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -4,10 +4,12 @@ stdenv.mkDerivation rec { name = "nifskope-1.1.3"; src = fetchurl { - url = "mirror://sourceforge/niftools/${name}.tar.bz2"; + url = "https://github.com/niftools/nifskope/releases/download/${name}/${name}.tar.bz2"; sha256 = "0fcvrcjyvivww10sjhxamcip797b9ykbf5p3rm2k24xhkwdaqp72"; }; + patches = [ ./gcc-6.patch ]; + buildInputs = [ qt4 ]; nativeBuildInputs = [ qmake4Hook ]; @@ -46,7 +48,7 @@ stdenv.mkDerivation rec { ''; # */ meta = { - homepage = http://niftools.sourceforge.net/; + homepage = https://github.com/niftools/nifskope/; description = "A tool for analyzing and editing NetImmerse/Gamebryo '*.nif' files"; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/graphics/nifskope/gcc-6.patch b/pkgs/tools/graphics/nifskope/gcc-6.patch new file mode 100644 index 000000000000..2bb8af9cfe4c --- /dev/null +++ b/pkgs/tools/graphics/nifskope/gcc-6.patch @@ -0,0 +1,123 @@ +Based on https://github.com/niftools/nifskope/commit/7261b0a119a549b11006d8e41ba990d706171f1c + +diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp nifskope-1.1.3/gl/dds/ColorBlock.cpp +--- nifskope-1.1.3-orig/gl/dds/ColorBlock.cpp 2012-11-17 23:40:31.000000000 +0100 ++++ nifskope-1.1.3/gl/dds/ColorBlock.cpp 2017-09-10 10:50:36.766909836 +0200 +@@ -78,8 +78,8 @@ + + void ColorBlock::init(const Image * img, uint x, uint y) + { +- const uint bw = min(img->width() - x, 4U); +- const uint bh = min(img->height() - y, 4U); ++ const uint bw = std::min(img->width() - x, 4U); ++ const uint bh = std::min(img->height() - y, 4U); + + static int remainder[] = { + 0, 0, 0, 0, +diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/Common.h nifskope-1.1.3/gl/dds/Common.h +--- nifskope-1.1.3-orig/gl/dds/Common.h 2012-11-17 23:40:31.000000000 +0100 ++++ nifskope-1.1.3/gl/dds/Common.h 2017-09-10 10:48:08.462099032 +0200 +@@ -33,14 +33,10 @@ + #ifndef _DDS_COMMON_H + #define _DDS_COMMON_H + +-#ifndef min +-#define min(a,b) ((a) <= (b) ? (a) : (b)) +-#endif +-#ifndef max +-#define max(a,b) ((a) >= (b) ? (a) : (b)) +-#endif ++#include ++ + #ifndef clamp +-#define clamp(x,a,b) min(max((x), (a)), (b)) ++#define clamp(x,a,b) std::min( std::max( (x), (a) ), (b) ) + #endif + + template +diff -ru -x '*~' nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp +--- nifskope-1.1.3-orig/gl/dds/DirectDrawSurface.cpp 2012-11-17 23:40:31.000000000 +0100 ++++ nifskope-1.1.3/gl/dds/DirectDrawSurface.cpp 2017-09-10 10:48:45.912056969 +0200 +@@ -63,6 +63,7 @@ + #include "DirectDrawSurface.h" + #include "BlockDXT.h" + #include "PixelFormat.h" ++#include "Common.h" + + #include // printf + #include // sqrt +@@ -685,8 +686,8 @@ + // Compute width and height. + for (uint m = 0; m < mipmap; m++) + { +- w = max(1U, w / 2); +- h = max(1U, h / 2); ++ w = std::max(1U, w / 2); ++ h = std::max(1U, h / 2); + } + + img->allocate(w, h); +@@ -787,9 +788,9 @@ + readBlock(&block); + + // Write color block. +- for (uint y = 0; y < min(4U, h-4*by); y++) ++ for (uint y = 0; y < std::min(4U, h-4*by); y++) + { +- for (uint x = 0; x < min(4U, w-4*bx); x++) ++ for (uint x = 0; x < std::min(4U, w-4*bx); x++) + { + img->pixel(4*bx+x, 4*by+y) = block.color(x, y); + } +@@ -909,9 +910,9 @@ + + for (uint m = 0; m < mipmap; m++) + { +- w = max(1U, w / 2); +- h = max(1U, h / 2); +- d = max(1U, d / 2); ++ w = std::max(1U, w / 2); ++ h = std::max(1U, h / 2); ++ d = std::max(1U, d / 2); + } + + if (header.pf.flags & DDPF_FOURCC) +diff -ru -x '*~' nifskope-1.1.3-orig/gl/gltexloaders.cpp nifskope-1.1.3/gl/gltexloaders.cpp +--- nifskope-1.1.3-orig/gl/gltexloaders.cpp 2012-11-17 23:40:31.000000000 +0100 ++++ nifskope-1.1.3/gl/gltexloaders.cpp 2017-09-10 10:51:23.586839810 +0200 +@@ -1736,8 +1736,8 @@ + + // generate next offset, resize + mipmapOffset += mipmapWidth * mipmapHeight * 4; +- mipmapWidth = max( 1, mipmapWidth / 2 ); +- mipmapHeight = max( 1, mipmapHeight / 2 ); ++ mipmapWidth = std::max( 1, mipmapWidth / 2 ); ++ mipmapHeight = std::max( 1, mipmapHeight / 2 ); + } + + // set total pixel size +@@ -1932,11 +1932,11 @@ + { + if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT1 ) + { +- mipmapOffset += max( 8, ( mipmapWidth * mipmapHeight / 2 ) ); ++ mipmapOffset += std::max( 8, ( mipmapWidth * mipmapHeight / 2 ) ); + } + else if ( ddsHeader.ddsPixelFormat.dwFourCC == FOURCC_DXT5 ) + { +- mipmapOffset += max( 16, ( mipmapWidth * mipmapHeight ) ); ++ mipmapOffset += std::max( 16, ( mipmapWidth * mipmapHeight ) ); + } + } + else if ( ddsHeader.ddsPixelFormat.dwBPP == 24 ) +@@ -1947,8 +1947,8 @@ + { + mipmapOffset += ( mipmapWidth * mipmapHeight * 4 ); + } +- mipmapWidth = max( 1, mipmapWidth / 2 ); +- mipmapHeight = max( 1, mipmapHeight / 2 ); ++ mipmapWidth = std::max( 1, mipmapWidth / 2 ); ++ mipmapHeight = std::max( 1, mipmapHeight / 2 ); + } + + nif->set( iData, "Num Pixels", mipmapOffset ); From 0d206c0b6cb0c175c57c377aba4af8e92e660ff8 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 10 Sep 2017 11:00:58 +0200 Subject: [PATCH 019/115] nixos/release: xmonad isn't release-critical --- nixos/release-combined.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 7e1b01c3081b..6e921ba7fb9f 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -122,7 +122,6 @@ in rec { (all nixos.tests.sysctl) (all nixos.tests.udisks2) (all nixos.tests.xfce) - (all nixos.tests.xmonad) nixpkgs.tarball (all allSupportedNixpkgs.emacs) From 44ec317a13c23e0196a234b4373ceaf1d2b84a63 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 10 Sep 2017 11:11:03 +0200 Subject: [PATCH 020/115] riot-web: 1.12.2 -> 1.12.3 --- .../networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index ea6ec1676ec8..c57fd4136897 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name= "riot-web-${version}"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "0zyddpnng1vjli12hn1hd0w99g6sfsk80dn2ll5h9276nc677pnh"; + sha256 = "1v9k9rna9rziis5ld4x4lw3rhgm504cnnafiwk175jpjbbd8h4b3"; }; installPhase = '' From 08a3d802222476644ce0f5559416b422d25a9669 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 10 Sep 2017 09:05:14 +0000 Subject: [PATCH 021/115] Snapper: use gcc5, as there is not upstream patch for gcc6 (cherry picked from commit fbe46c7a2419c6896b875c39efaaf64e6be8cdee) --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2cb27852c5c3..e584af631784 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16269,6 +16269,7 @@ with pkgs; snapper = callPackage ../tools/misc/snapper { btrfs-progs = btrfs-progs_4_4_1; + stdenv = overrideCC stdenv gcc5; }; snd = callPackage ../applications/audio/snd { }; From 5dcf5d6d050ae1f155573631aa0305f34284118b Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 10 Sep 2017 09:10:24 +0000 Subject: [PATCH 022/115] gnupg: add gnupg2 alias/symlink for 2.2. Otherwise signing commits with git break. (cherry picked from commit c651a0ccbf5b17739390b56f91b656a7b920f643) --- pkgs/tools/security/gnupg/22.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 3cabf9e1e41b..7080cda57f41 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -45,6 +45,9 @@ stdenv.mkDerivation rec { substitute $f $out/lib/systemd/user/$(basename $f) \ --replace /usr/bin $out/bin done + + # add gpg2 symlink to make sure git does not break when signing commits + ln -s $out/bin/gpg $out/bin/gpg2 ''; meta = with stdenv.lib; { From 40b1516d39bc529f7fca82044b3b188a29004b31 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 10 Sep 2017 11:17:24 +0200 Subject: [PATCH 023/115] haskell: fix grakn-0.2.0 --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48b3108d0ed0..4b204ab75e98 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -908,4 +908,6 @@ self: super: { # https://github.com/jtdaugherty/text-zipper/issues/11 text-zipper = dontCheck super.text-zipper; + # https://github.com/graknlabs/grakn-haskell/pull/1 + grakn = dontCheck (doJailbreak super.grakn); } From 79f13f19f076df4b3f8e1d31b42449ee2c481353 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Sun, 10 Sep 2017 09:31:11 +0000 Subject: [PATCH 024/115] oprofile: 1.1.0 -> 1.2.0 Fixes build with newer gcc versions. --- pkgs/development/tools/profiling/oprofile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 063b0375fc7d..4c2a7b241b7f 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -5,11 +5,11 @@ assert withGUI -> qt4 != null; stdenv.mkDerivation rec { - name = "oprofile-1.1.0"; + name = "oprofile-1.2.0"; src = fetchurl { url = "mirror://sourceforge/oprofile/${name}.tar.gz"; - sha256 = "0v1nn38h227bgxjwqf22rjp2iqgjm4ls3gckzifks0x6w5nrlxfg"; + sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb"; }; buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ] From 01b4c3c13b9e17c3074e62e683f1da84ee458c5b Mon Sep 17 00:00:00 2001 From: Ioannis Koutras Date: Fri, 8 Sep 2017 20:35:12 +0300 Subject: [PATCH 025/115] sddm: 0.14.0 -> 0.15.0 --- pkgs/applications/display-managers/sddm/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 920e5ba9abd2..97f05f6a433c 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -5,13 +5,7 @@ let - version = "0.14.0"; - - /* Fix display of user avatars. */ - patchFixUserAvatars = fetchpatch { - url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch; - sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms"; - }; + version = "0.15.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -20,12 +14,11 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj"; + sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8"; }; patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ [ patchFixUserAvatars ]; + copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = # Module Qt5::Test must be included in `find_package` before it is used. From 78ddef2cae12989d38a5c9181c932d8a11e782c2 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Sun, 10 Sep 2017 11:45:24 +0200 Subject: [PATCH 026/115] haskellPackages.hol: Fixed build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48b3108d0ed0..2e8c161b4866 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -56,6 +56,13 @@ self: super: { # segfault due to missing return: https://github.com/haskell/c2hs/pull/184 c2hs = dontCheck super.c2hs; + # https://github.com/gilith/hol/pull/1 + hol = appendPatch (doJailbreak super.hol) (pkgs.fetchpatch { + name = "hol.patch"; + url = "https://github.com/gilith/hol/commit/a5171bdcacdbe93c46c9f82ec5a38f2a2b69e632.patch"; + sha256 = "0xkgbhc4in38hspxgz2wcvk56pjalw43gig7lzkjfhgavwxv3jyj"; + }); + # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; From a759faf60bdc578ea4723f2512be5fd24811f6cb Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 10 Sep 2017 11:56:48 +0200 Subject: [PATCH 027/115] haskell: fix build of hw-xml --- pkgs/development/haskell-modules/configuration-common.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48b3108d0ed0..da027a5e0597 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -95,6 +95,14 @@ self: super: { # https://github.com/froozen/kademlia/issues/2 kademlia = dontCheck super.kademlia; + # https://github.com/haskell-works/hw-xml/issues/23 + # Disable building the hw-xml-example executable: + hw-xml = (overrideCabal super.hw-xml (drv: { + postPatch = "sed -i 's/ hs-source-dirs: app/" + + " hs-source-dirs: app\\n" + + " buildable: false/' hw-xml.cabal"; + })); + hzk = dontCheck super.hzk; haskakafka = dontCheck super.haskakafka; From 18695b55864830a1ddb61e4a120ddb21955f52fe Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 10 Sep 2017 09:58:37 +0000 Subject: [PATCH 028/115] dmd: mark as broken (cherry picked from commit 8d5fc1beda9716c8b8015a7a5abccb70eee21448) --- pkgs/development/compilers/dmd/2.067.1.nix | 1 + pkgs/development/compilers/dmd/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dmd/2.067.1.nix b/pkgs/development/compilers/dmd/2.067.1.nix index 3cf530e9e5e8..7134aa6888b0 100644 --- a/pkgs/development/compilers/dmd/2.067.1.nix +++ b/pkgs/development/compilers/dmd/2.067.1.nix @@ -153,6 +153,7 @@ stdenv.mkDerivation rec { # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; platforms = platforms.unix; + broken = true; }; } diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 278a77f62903..80e9b34a5525 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -154,6 +154,6 @@ stdenv.mkDerivation rec { # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; platforms = platforms.unix; + broken = true; }; } - From 450685e46d53f5eb9e10bb12cf9200914b6542d0 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 10 Sep 2017 12:02:23 +0200 Subject: [PATCH 029/115] v8: remove unused old versions --- pkgs/development/libraries/v8/3.30.33.nix | 6 - pkgs/development/libraries/v8/4.5.nix | 145 ---------------------- pkgs/top-level/all-packages.nix | 8 -- 3 files changed, 159 deletions(-) delete mode 100644 pkgs/development/libraries/v8/3.30.33.nix delete mode 100644 pkgs/development/libraries/v8/4.5.nix diff --git a/pkgs/development/libraries/v8/3.30.33.nix b/pkgs/development/libraries/v8/3.30.33.nix deleted file mode 100644 index 6ae5c896efa1..000000000000 --- a/pkgs/development/libraries/v8/3.30.33.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "3.30.33.16"; - sha256 = "1azf1b36gqj4z5x0k9wq2dkp99zfyhwb0d6i2cl5fjm3k6js7l45"; -}) diff --git a/pkgs/development/libraries/v8/4.5.nix b/pkgs/development/libraries/v8/4.5.nix deleted file mode 100644 index 655ccf1ccf38..000000000000 --- a/pkgs/development/libraries/v8/4.5.nix +++ /dev/null @@ -1,145 +0,0 @@ -{ stdenv, lib, fetchgit, fetchFromGitHub, gyp, readline, python, which, icu -, patchelf, coreutils -, doCheck ? false -}: - -assert readline != null; - -let - arch = if stdenv.isArm - then if stdenv.is64bit - then"arm64" - else "arm" - else if stdenv.is64bit - then"x64" - else "ia32"; - git_url = "https://chromium.googlesource.com"; - clangFlag = if stdenv.isDarwin then "1" else "0"; - - deps = { - "build/gyp" = fetchgit { - url = "${git_url}/external/gyp.git"; - rev = "5122240c5e5c4d8da12c543d82b03d6089eb77c5"; - sha256 = "0mdrrhmfl4jrdmfrxmg7ywhdf9c7gv2x08fiq955fs9z8kvxqgdx"; - }; - "third_party/icu" = fetchgit { - url = "${git_url}/chromium/deps/icu.git"; - rev = "c81a1a3989c3b66fa323e9a6ee7418d7c08297af"; - sha256 = "0xrhig85vpw9hqjrhkxsr69m2xnig2bwmjhylzffrwz0783l7yhw"; - }; - "buildtools" = fetchgit { - url = "${git_url}/chromium/buildtools.git"; - rev = "ecc8e253abac3b6186a97573871a084f4c0ca3ae"; - sha256 = "1ccfnj3dp4i0z2bj09zy8aa4x749id6h058qa330li368417jwci"; - }; - "testing/gtest" = fetchgit { - url = "${git_url}/external/googletest.git"; - rev = "23574bf2333f834ff665f894c97bef8a5b33a0a9"; - sha256 = "1scyrk8d6xrsqma27q0wdrxqfa2n12k8mi9lfbsm5ivim9sr1d75"; - }; - "testing/gmock" = fetchgit { - url = "${git_url}/external/googlemock.git"; - rev = "29763965ab52f24565299976b936d1265cb6a271"; - sha256 = "0n2ajjac7myr5bgqk0x7j8281b4whkzgr1irv5nji9n3xz5i6gz4"; - }; - "tools/clang" = fetchgit { - url = "${git_url}/chromium/src/tools/clang.git"; - rev = "73ec8804ed395b0886d6edf82a9f33583f4a7902"; - sha256 = "0p2w4cgj3d4lqa8arss3j86lk0g8zhbbn5pzlcrhy5pl4xphjbk3"; - }; - }; - -in - -stdenv.mkDerivation rec { - name = "v8-${version}"; - version = "4.5.107"; - - inherit doCheck; - - src = fetchFromGitHub { - owner = "v8"; - repo = "v8"; - rev = version; - sha256 = "0wbzi4rhm4ygsm1k4x0vwfm42z3j8ww6wz7bcvd0m7mqzayn0bw4"; - }; - - postUnpack = '' - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList (n: v: '' - mkdir -p $sourceRoot/${n} - cp -r ${v}/* $sourceRoot/${n} - '') deps)} - ''; - - # Patches pulled from: - # https://github.com/cowboyd/libv8/tree/4.5/patches - patches = lib.optional (!doCheck) ./disable-building-tests.patch ++ [ - ./fPIC-for-static.patch - ./build-standalone-static-library.patch - ]; - - postPatch = '' - sed -i 's,#!/usr/bin/env python,#!${python}/bin/python,' build/gyp_v8 - sed -i 's,/bin/echo,${coreutils}/bin/echo,' build/standalone.gypi - sed -i '/CR_CLANG_REVISION/ d' build/standalone.gypi - sed -i 's/-Wno-format-pedantic//g' build/standalone.gypi - ''; - - configurePhase = '' - PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ - PYTHONPATH="$(toPythonPath ${gyp}):$PYTHONPATH" \ - build/gyp_v8 \ - -f make \ - --generator-output="out" \ - -Dflock_index=0 \ - -Dclang=${clangFlag} \ - -Dv8_enable_i18n_support=1 \ - -Duse_system_icu=1 \ - -Dcomponent=shared_library \ - -Dconsole=readline \ - -Dv8_target_arch=${arch} \ - -Dv8_use_external_startup_data=0 - ''; - - nativeBuildInputs = [ which ]; - buildInputs = [ readline python icu patchelf ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; - - buildFlags = [ - "LINK=g++" - "-C out" - "builddir=$(CURDIR)/Release" - "BUILDTYPE=Release" - ]; - - enableParallelBuilding = true; - - # the `libv8_libplatform` target is _only_ built as a static library, - # and is expected to be statically linked in when needed. - # see the following link for further commentary: - # https://github.com/cowboyd/therubyracer/issues/391 - installPhase = '' - install -vD out/Release/d8 "$out/bin/d8" - install -vD out/Release/mksnapshot "$out/bin/mksnapshot" - ${if stdenv.isDarwin then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.cc.lib}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib - '' else '' - install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" - ''} - mkdir -p "$out/include" - cp -vr include/*.h "$out/include" - cp -vr include/libplatform "$out/include" - cp -v out/Release/*.a "$out/lib" - ''; - - meta = with lib; { - description = "Google's open source JavaScript engine"; - maintainers = with maintainers; [ cstrahan proglodyte ]; - platforms = platforms.linux; - license = licenses.bsd3; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e584af631784..9d87f4707514 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10645,14 +10645,6 @@ with pkgs; inherit (python2Packages) python gyp; }; - v8_3_30_33 = callPackage ../development/libraries/v8/3.30.33.nix { - inherit (python2Packages) python gyp; - }; - - v8_4_5 = callPackage ../development/libraries/v8/4.5.nix { - inherit (python2Packages) python gyp; - }; - v8 = callPackage ../development/libraries/v8 { inherit (python2Packages) python gyp; cctools = darwin.cctools; From bcd382f032a5e380ffc0956e0a4539cf9cefe967 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 10 Sep 2017 12:06:01 +0200 Subject: [PATCH 030/115] tribler: 7.0.0-beta -> 7.0.0-rc2 Also, fix the xcb plugin error (https://github.com/NixOS/nixpkgs/issues/24256) and add service-identity which is a required dependency now. --- .../networking/p2p/tribler/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 8e99d5159f87..e5c0e30bce3a 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick -, enablePlayer ? true, vlc ? null }: +{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick +, enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { pname = "tribler"; name = "${pname}-${version}"; - version = "7.0.0-beta"; + version = "7.0.0-rc2"; revision = "1d3ddb8"; - src = fetchgit { - url = "https://github.com/Tribler/tribler"; - rev = revision; - sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845"; - fetchSubmodules = true; + src = fetchurl { + url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; + sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2"; }; buildInputs = [ @@ -41,6 +39,7 @@ stdenv.mkDerivation rec { pythonPackages.plyvel pythonPackages.decorator pythonPackages.feedparser + pythonPackages.service-identity ]; postPatch = '' @@ -58,6 +57,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms cp -prvd ./* $out/ makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ --set _TRIBLERPATH $out \ --set PYTHONPATH $out:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ From 09bdd6260fc3b4fdfacea10012bcf86f59d2b364 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 10 Sep 2017 12:24:24 +0200 Subject: [PATCH 031/115] haskell: fix build of LambdaHack --- pkgs/development/haskell-modules/configuration-common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 48b3108d0ed0..6ce5d6b9c0a7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -124,6 +124,8 @@ self: super: { extraLibraries = [ pkgs.openblasCompat ]; }); + LambdaHack = super.LambdaHack.override { sdl2-ttf = super.sdl2-ttf_2_0_1; }; + # The Haddock phase fails for one reason or another. acme-one = dontHaddock super.acme-one; attoparsec-conduit = dontHaddock super.attoparsec-conduit; From 4592a6d7445d7840d6114761037413349420671a Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 10 Sep 2017 12:35:39 +0200 Subject: [PATCH 032/115] v8: fix 5.4 build --- pkgs/development/libraries/v8/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 00fb037168ea..c2cd5a015168 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline python icu patchelf ] ++ stdenv.lib.optionals stdenv.isDarwin [ cctools ]; - NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow"; + NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow -Wno-error=unused-function -Wno-error=attributes"; buildFlags = [ "LINK=c++" From 72673e67f29c9183aec428e3f167cc7bf76b50a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 10 Sep 2017 11:39:48 +0100 Subject: [PATCH 033/115] arm-frc-linux-gnueabi-binutils: mark as broken --- .../tools/misc/arm-frc-linux-gnueabi-binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix index 4e3ad7ab8b08..fff91c6f7f38 100755 --- a/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix +++ b/pkgs/development/tools/misc/arm-frc-linux-gnueabi-binutils/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.colescott ]; platforms = stdenv.lib.platforms.linux; - + broken = true; # since 2017-09-10 priority = 3; }; } From c7dd5e146bd6cdaacffaa681e56dbd1c916ace17 Mon Sep 17 00:00:00 2001 From: Vaibhav Sagar Date: Sun, 10 Sep 2017 18:41:39 +0800 Subject: [PATCH 034/115] znc: add openFirewall configuration option --- nixos/modules/services/networking/znc.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 2b4ca4a5fe52..fd6d6e8e43b5 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -276,6 +276,14 @@ in ''; }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open ports in the firewall for ZNC. + ''; + }; + passBlock = mkOption { example = defaultPassBlock; type = types.string; @@ -350,7 +358,9 @@ in config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = [ cfg.port ]; + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; systemd.services.znc = { description = "ZNC Server"; From 11ccf69f75bf704d073463bcbaae7931c9570d60 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Sun, 10 Sep 2017 12:45:48 +0200 Subject: [PATCH 035/115] tests/elk: Fixed failing build on i686. Too much memory is required for the test. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index c43034ff44b4..34198a950647 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -240,7 +240,7 @@ in rec { tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; - tests.elk = callTest tests/elk.nix {}; + tests.elk = hydraJob (import tests/elk.nix { system = "x86_64-linux"; }); tests.env = callTest tests/env.nix {}; tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; From a26817b215b9df9e44f86282ed0b39005cd5603b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 10 Sep 2017 12:01:40 +0100 Subject: [PATCH 036/115] oprofile: fix hardcoded rm/cp paths --- pkgs/development/tools/profiling/oprofile/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index 4c2a7b241b7f..ac87870eb590 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders +{ stdenv, fetchurl, binutils, popt, zlib, pkgconfig, linuxHeaders, coreutils , libiberty_static, withGUI ? false , qt4 ? null}: # libX11 is needed because the Qt build stuff automatically adds `-lX11'. @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0zd5ih6gmm1pkqavd9laa93iff7qv5jkbfjznhlyxl5p826gk5gb"; }; + postPatch = '' + substituteInPlace opjitconv/opjitconv.c \ + --replace "/bin/rm" "${coreutils}/bin/rm" \ + --replace "/bin/cp" "${coreutils}/bin/cp" + ''; + buildInputs = [ binutils zlib popt pkgconfig linuxHeaders libiberty_static ] ++ stdenv.lib.optionals withGUI [ qt4 ]; From 6d6637549f9e6adeb6017e122362fcfc299a8e25 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 10 Sep 2017 13:04:13 +0200 Subject: [PATCH 037/115] radarr: 0.2.0.778 -> 0.2.0.846 --- pkgs/servers/radarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 088eef0830b9..3b86cf1758c0 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.778"; + version = "0.2.0.846"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0145nsdnhsd3nbg2nml5malm4kn28k2siaimqb41dcmc88fws015"; + sha256 = "1lpr05aaf6a9p2msmsh0j8krxk83sf5d3avrh5qpyjap5j3phvky"; }; buildInputs = [ makeWrapper ]; From b4ea459eabf7f52cfec0964d31354e3d6385151f Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Sun, 10 Sep 2017 13:09:52 +0200 Subject: [PATCH 038/115] haskell: introduce failOnAllWarnings Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the `-Wall` and `-Werror` GHC options to turn all warnings into build failures. --- doc/languages-frameworks/haskell.md | 13 +++++++++---- pkgs/development/haskell-modules/lib.nix | 4 +++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md index 8efc60f1e17a..da3fd770ce72 100644 --- a/doc/languages-frameworks/haskell.md +++ b/doc/languages-frameworks/haskell.md @@ -875,12 +875,17 @@ to your own Haskell packages and integrate that in a Continuous Integration server like [hydra](https://nixos.org/hydra/) to assure your packages maintain a minimum level of quality. This section discusses some of these functions. +#### failOnAllWarnings + +Applying `haskell.lib.failOnAllWarnings` to a Haskell package enables the +`-Wall` and `-Werror` GHC options to turn all warnings into build failures. + #### buildStrictly -Applying `haskell.lib.buildStrictly` to a Haskell package enables the `-Wall` -and `-Werror` GHC options to turn all warnings into build failures. Additionally -the source of your package is gotten from first invoking `cabal sdist` to ensure -all needed files are listed in the Cabal file. +Applying `haskell.lib.buildStrictly` to a Haskell package calls +`failOnAllWarnings` on the given package to turn all warnings into build +failures. Additionally the source of your package is gotten from first invoking +`cabal sdist` to ensure all needed files are listed in the Cabal file. #### checkUnusedPackages diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 48110cffabf8..fcb4258deb14 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -117,7 +117,9 @@ rec { ''; }); - buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror"); + buildStrictly = pkg: buildFromSdist (failOnAllWarnings pkg); + + failOnAllWarnings = drv: appendConfigureFlag drv "--ghc-option=-Wall --ghc-option=-Werror"; checkUnusedPackages = { ignoreEmptyImports ? false From 87eafdc88775c55446543db1b75c16df07beb782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 10 Sep 2017 12:26:40 +0100 Subject: [PATCH 039/115] perlPackages.Apache-Test: 1.38 -> 1.40 fixes #29155 --- pkgs/top-level/perl-packages.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a8282ba6f6bb..0a4818a51b80 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -224,11 +224,16 @@ let self = _self // overrides; _self = with self; { }; ApacheTest = buildPerlPackage { - name = "Apache-Test-1.38"; + name = "Apache-Test-1.40"; src = fetchurl { - url = mirror://cpan/authors/id/P/PH/PHRED/Apache-Test-1.38.tar.gz; - sha256 = "321717f58636ed0aa85cba6d69fc01e2ccbc90ba71ec2dcc2134d8401af65145"; + url = mirror://cpan/authors/id/S/SH/SHAY/Apache-Test-1.40.tar.gz; + sha256 = "0h5fsi0is6nhclsd3wwkkqx2hfgl3bpdazxycafm9sqxr3qkgx9w"; }; + checkPhase = '' + make test \ + NIX_REDIRECTS=/etc/protocols=${pkgs.iana-etc}/etc/protocols \ + LD_PRELOAD=${pkgs.libredirect}/lib/libredirect.so + ''; }; AppCLI = buildPerlPackage { From fd1e36220524dfdd9ec8e8792ffe07b75fcad3f9 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 10 Sep 2017 10:52:44 +0200 Subject: [PATCH 040/115] audacity: 2.1.2 -> 2.1.3 * Remove gcc-6 patch to make it compile * Add autoreconf call in preConfigure phase Inspired by https://git.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/audacity Suggested-by: Moritz Ulrich --- pkgs/applications/audio/audacity/default.nix | 21 +++++++------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 92e6adbaa965..3fb9faa26671 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, glib, zlib, perl, intltool, libogg, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, - expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ + expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ + autoconf, automake, libtool }: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.1.2"; + version = "2.1.3"; name = "audacity-${version}"; src = fetchurl { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "1ggr6g0mk36rqj7ahsg8b0b1r9kphwajzvxgn43md263rm87n04h"; + sha256 = "11mx7gb4dbqrgfp7hm0154x3m76ddnmhf2675q5zkxn7jc5qfc6b"; }; patches = [ (fetchpatch { @@ -20,19 +21,10 @@ stdenv.mkDerivation rec { + "/audacity-ffmpeg.patch?h=packages/audacity&id=0c1e35798d4d70692"; sha256 = "19fr674mw844zmkp1476yigkcnmb6zyn78av64ccdwi3p68i00rf"; }) - ] - ++ optional (hasPrefix "gcc-6" stdenv.cc.cc.name) - (fetchpatch { - name = "gcc6.patch"; - url = "https://github.com/audacity/audacity/commit/60f2322055756e8cacfe96530a12c63e9694482c.patch"; - sha256 = "07jlxr8y7ap3nsblx3zh8v9rcx7ajbcfnvwzhwykmbwbsyirgqf2"; - }); + ]; preConfigure = /* we prefer system-wide libs */ '' - mv lib-src lib-src-rm - mkdir lib-src - mv lib-src-rm/{Makefile*,lib-widget-extra,portaudio-v19,portmixer,portsmf,FileDialog,sbsms,libnyquist} lib-src/ - rm -r lib-src-rm/ + autoreconf -vi # use system libraries # we will get a (possibly harmless) warning during configure without this substituteInPlace configure \ @@ -63,6 +55,7 @@ stdenv.mkDerivation rec { pkgconfig file gettext wxGTK30 expat alsaLib libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2 ffmpeg libmad lame libvorbis flac soundtouch + autoconf automake libtool # for the preConfigure phase ]; #ToDo: detach sbsms enableParallelBuilding = true; From 0d8e157d61cc1e1050668e7c1801f0e1b6fe0111 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 10 Sep 2017 12:19:11 +0000 Subject: [PATCH 041/115] zsnes: restrict building to x86-based Linux platforms only, znses' core is written in x86 asm code --- pkgs/misc/emulators/zsnes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 6f3957379e53..ad80cb13f78c 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -58,6 +58,6 @@ in stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; homepage = http://www.zsnes.com; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } From b7ac21fe0d639f2305788fbc90949083e060d367 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 10 Sep 2017 12:37:55 +0000 Subject: [PATCH 042/115] shaderc: mark as broken (cherry picked from commit 2ccdac8c9e79030aca144137d0479065ce40fbb8) --- pkgs/development/compilers/shaderc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index df0c136d05f5..9df718694913 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A collection of tools, libraries and tests for shader compilation."; + broken = true; }; } From 5e5e57b57bc06119b63e07405a2550894e5bff83 Mon Sep 17 00:00:00 2001 From: Maarten Hoogendoorn Date: Sun, 10 Sep 2017 14:11:03 +0200 Subject: [PATCH 043/115] mcrl2: force use of gcc5 to prevent compilation errors --- pkgs/applications/science/logic/mcrl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index c9016a5ee0ce..ce368a77c2b4 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, +{stdenv, gcc5, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, python27, python27Packages}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake mesa qt5.qtbase boost ]; + buildInputs = [ gcc5 cmake mesa qt5.qtbase boost ]; enableParallelBuilding = true; From 70fe7ed01e62b114e981ee3deed79e602b6c0349 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Sun, 10 Sep 2017 15:20:41 +0200 Subject: [PATCH 044/115] python-simple-hipchat: 0.1.0 => 0.4.0 0.1.0 does not work on Python 3 but versions >= 0.2 do. --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abd2de9ae405..d781b003a2c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17824,11 +17824,11 @@ in { python_simple_hipchat = buildPythonPackage rec { name = "python-simple-hipchat-${version}"; - version = "0.1"; + version = "0.4.0"; src = pkgs.fetchurl { - url = "mirror://pypi/p/python-simple-hipchat/python-simple-hipchat-${version}.zip"; - sha256 = "404e5ff7187abb09c2227f22063d06baf0fd525725e9c9ad280176bed1c94a3f"; + url = "mirror://pypi/p/python-simple-hipchat/python-simple-hipchat-${version}.tar.gz"; + sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav"; }; buildInputs = [ pkgs.unzip ]; From 8f3f64e51220c3226fc80bd62f5c32f6d99f2703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 10 Sep 2017 14:19:41 +0100 Subject: [PATCH 045/115] python.pkgs.unicorn: disable python3 fixes #29200 --- .../python-modules/unicorn/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/unicorn/default.nix diff --git a/pkgs/development/python-modules/unicorn/default.nix b/pkgs/development/python-modules/unicorn/default.nix new file mode 100644 index 000000000000..b20843d0fc29 --- /dev/null +++ b/pkgs/development/python-modules/unicorn/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy3k }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "unicorn"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg"; + }; + + disabled = isPy3k; + + setupPyBuildFlags = [ "--plat-name" "linux" ]; + + meta = with stdenv.lib; { + description = "Unicorn CPU emulator engine"; + homepage = "http://www.unicorn-engine.org/"; + license = [ licenses.gpl2 ]; + maintainers = [ maintainers.bennofs ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index abd2de9ae405..a145882a8f4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -27232,21 +27232,7 @@ EOF # We need "normal" libxml2 and not the python package by the same name. pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; - unicorn = buildPythonPackage rec { - name = "unicorn-${version}"; - version = "1.0.1"; - src = pkgs.fetchurl { - url = "mirror://pypi/u/unicorn/${name}.tar.gz"; - sha256 = "0a5b4vh734b3wfkgapzzf8x18rimpmzvwwkly56da84n27wfw9bg"; - }; - setupPyBuildFlags = [ "--plat-name" "linux" ]; - meta = with pkgs.stdenv.lib; { - description = "Unicorn CPU emulator engine"; - homepage = "http://www.unicorn-engine.org/"; - license = [ licenses.gpl2 ]; - maintainers = [ maintainers.bennofs ]; - }; - }; + unicorn = callPackage ../development/python-modules/unicorn { }; intervaltree = callPackage ../development/python-modules/intervaltree { }; From cfb64bdbbd8217180ecfeb7ed8ad7600643fd103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 10 Sep 2017 14:31:30 +0100 Subject: [PATCH 046/115] python.pkgs.python_simple_hipchat: move out of python-packages --- .../python-simple-hipchat/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +++---------- 2 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/python-modules/python-simple-hipchat/default.nix diff --git a/pkgs/development/python-modules/python-simple-hipchat/default.nix b/pkgs/development/python-modules/python-simple-hipchat/default.nix new file mode 100644 index 000000000000..1e3f627ab0b9 --- /dev/null +++ b/pkgs/development/python-modules/python-simple-hipchat/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, unzip }: + +buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "python-simple-hipchat"; + version = "0.4.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav"; + }; + + buildInputs = [ unzip ]; + + meta = with stdenv.lib; { + description = "Easy peasy wrapper for HipChat's v1 API"; + homepage = https://github.com/kurttheviking/simple-hipchat-py; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d781b003a2c0..d6908dee25f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17822,17 +17822,8 @@ in { ''; }); - python_simple_hipchat = buildPythonPackage rec { - name = "python-simple-hipchat-${version}"; - version = "0.4.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/python-simple-hipchat/python-simple-hipchat-${version}.tar.gz"; - sha256 = "0zy6prrj85jjc4xmxgfg8h94j81k6zhfxfffcbvq9b10jis1rgav"; - }; - - buildInputs = [ pkgs.unzip ]; - }; + python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {} + python_simple_hipchat = python-simple-hipchat; python_keyczar = buildPythonPackage rec { name = "python-keyczar-0.71c"; @@ -24530,7 +24521,7 @@ EOF buildInputs = with self; [ nose mock ]; propagatedBuildInputs = with self; [ jinja2 pyyaml redis requests pagerduty - python_simple_hipchat pushbullet + python-simple-hipchat pushbullet ]; patchPhase = "> requirements.txt"; From 6e1eedd64e6ba3e9b84db038e6f20bb9a2e17177 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 10 Sep 2017 13:37:26 +0000 Subject: [PATCH 047/115] vice: 2.2 -> 3.1 + fix build procedure --- pkgs/misc/emulators/vice/default.nix | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 6251282aae32..0b56cb21dc0d 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11 +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: stdenv.mkDerivation rec { - name = "vice-2.2"; + name = "vice-3.1"; src = fetchurl { - url = http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.2.tar.gz; - sha256 = "0l8mp9ybx494fdqgr1ps4x3c3qzms4yyg4hzcn3ihzy92zw1nn2x"; + url = mirror://sourceforge/vice-emu/vice-3.1.tar.gz; + sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa - pkgconfig gtk2 SDL autoreconfHook ]; - configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui"; + buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline mesa + pkgconfig gtk2 SDL autoreconfHook libXaw ]; + dontDisableStatic = true; + configureFlags = "--enable-fullscreen --enable-gnomeui"; desktopItem = makeDesktopItem { name = "vice"; @@ -23,12 +24,19 @@ stdenv.mkDerivation rec { categories = "Application;Emulator;"; }; + preBuild = '' + for i in src/resid src/resid-dtv + do + mkdir -pv $i/src + ln -sv ../../wrap-u-ar.sh $i/src + done + ''; patchPhase = '' # Disable font-cache update sed -i -e "s|install: install-data-am|install-no: install-data-am|" data/fonts/Makefile.am ''; - NIX_LDFLAGS = "-lX11 -L${libX11}/lib"; + #NIX_LDFLAGS = "-lX11 -L${libX11}/lib"; postInstall = '' mkdir -p $out/share/applications From 3dea1972737f5ce7b2c5461fe20370bad10aae03 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 10 Sep 2017 15:43:46 +0200 Subject: [PATCH 048/115] ispc: use newer version and LLVM 4.0 due to bug in clang++ 3.9 wrapper (see #29204) --- pkgs/development/compilers/ispc/default.nix | 12 +++++------- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 6bc7f66ca299..0e4bc420241d 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -2,11 +2,9 @@ testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: -# TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? - stdenv.mkDerivation rec { - version = "1.9.1"; - rev = "v${version}"; + version = "20170807"; + rev = "6e0fc2f148e95afad998a7c7f4d7908d29fd8e44"; inherit testedTargets; @@ -16,7 +14,7 @@ stdenv.mkDerivation rec { owner = "ispc"; repo = "ispc"; inherit rev; - sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693"; + sha256 = "17fwnfm8a329lgfhjwcvji4h1fm4iqmc28wz23hvgqbpj8lk6qgh"; }; # there are missing dependencies in the Makefile, causing sporadic build failures @@ -60,8 +58,8 @@ stdenv.mkDerivation rec { ''; makeFlags = [ - "CXX=${llvmPackages.clang}/bin/clang++" - "CLANG=${llvmPackages.clang}/bin/clang" + "CXX=${stdenv.cc}/bin/clang++" + "CLANG=${stdenv.cc}/bin/clang" "CLANG_INCLUDE=${llvmPackages.clang-unwrapped}/include" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d87f4707514..49d325f73c52 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8523,7 +8523,8 @@ with pkgs; isocodes = callPackage ../development/libraries/iso-codes { }; ispc = callPackage ../development/compilers/ispc { - llvmPackages = llvmPackages_39; + llvmPackages = llvmPackages_4; + stdenv = llvmPackages_4.stdenv; }; itk = callPackage ../development/libraries/itk { }; From 72b48de97a24d84ac9a440955d1260ae373d899f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 10 Sep 2017 13:42:29 +0000 Subject: [PATCH 049/115] Missing semicolon --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 743aa9672e8b..88c7fedeee87 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17822,7 +17822,7 @@ in { ''; }); - python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {} + python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; python_simple_hipchat = python-simple-hipchat; python_keyczar = buildPythonPackage rec { From 9ca079f5ec8f67478ac8ce0fab2798ea7ad9f514 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 10 Sep 2017 13:43:45 +0000 Subject: [PATCH 050/115] Missing self reference --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88c7fedeee87..11b9fd5e067d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17823,7 +17823,7 @@ in { }); python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; - python_simple_hipchat = python-simple-hipchat; + python_simple_hipchat = self.python-simple-hipchat; python_keyczar = buildPythonPackage rec { name = "python-keyczar-0.71c"; From 2c056b1f283c95515e2a5ec48e8fdb2726d876b1 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 10 Sep 2017 14:11:40 +0000 Subject: [PATCH 051/115] mpich2: use gfortran 5 (cherry picked from commit 7f47214526278b08782ae12ef93a0948e4c314ff) --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49d325f73c52..e772f08f6f19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9689,7 +9689,9 @@ with pkgs; libmpc = callPackage ../development/libraries/libmpc { }; - mpich2 = callPackage ../development/libraries/mpich2 { }; + mpich2 = callPackage ../development/libraries/mpich2 { + gfortran = gfortran5; + }; mstpd = callPackage ../os-specific/linux/mstpd { }; From 345e57092111c408935f5fdaf8dffc39efaadbbc Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 10 Sep 2017 14:24:59 +0000 Subject: [PATCH 052/115] fs-uae: 2.8.0 -> 2.8.3 --- pkgs/misc/emulators/fs-uae/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index f7d94bcad471..95aaa96c911a 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "fs-uae-${version}"; - version = "2.8.0"; + version = "2.8.3"; src = fetchurl { url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; - sha256 = "1cvvlkzhh4rrpax7505bngw990rx86l1nhad174zpqc9ah93il25"; + sha256 = "14k2p324sdr662f49299mv0bw5jmpj1i2iqn0xs5pgf80x6l3mg2"; }; buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; From 4a810fb31d3828091ce29cbffb52cfdf96aa82ed Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 10 Sep 2017 16:25:51 +0200 Subject: [PATCH 053/115] borgbackup: fix build with python36 cffi fails to build with python34. --- pkgs/tools/backup/borg/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index dcea9c9435b9..19495b6e1df6 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -37,6 +37,9 @@ python3Packages.buildPythonApplication rec { cp -R docs/_build/man $out/share/man/man1 ''; + # tests fail due to missing test command in nix_run_setup.py + doCheck = false; + meta = with stdenv.lib; { description = "A deduplicating backup program (attic fork)"; homepage = https://borgbackup.github.io/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e772f08f6f19..8b0cb6e77cd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -740,9 +740,7 @@ with pkgs; bubblewrap = callPackage ../tools/admin/bubblewrap { }; - borgbackup = callPackage ../tools/backup/borg { - python3Packages = python34Packages; - }; + borgbackup = callPackage ../tools/backup/borg { }; boomerang = callPackage ../development/tools/boomerang { }; From 631abf835e759a038f96767e8e1505dd8d5df5b4 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 10 Sep 2017 14:42:47 +0000 Subject: [PATCH 054/115] tomcat: bump versions --- pkgs/servers/http/tomcat/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 06594885dbc2..6a29ecaad569 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -32,20 +32,20 @@ let in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.75"; - sha256 = "0w5adsy4792qkf3ws46f539lrdbpz7lghy79s6b04c9yqaxjz6ni"; + versionMinor = "0.81"; + sha256 = "0mcr3caizqk6qrc0j9p91apdsg65ksawg0l6xpqk1fq6071nd5rq"; }; tomcat8 = common { versionMajor = "8"; - versionMinor = "0.41"; - sha256 = "1mvnf6m29y3p40vvi9mgghrddlmgwcrcvfwrf9vbama78fsh8wm5"; + versionMinor = "0.46"; + sha256 = "14wb9mgb7z02j6wvvmcsfc2zkcqnijc40gzyg1mnxcy5fvf8nzpk"; }; tomcat85 = common { versionMajor = "8"; - versionMinor = "5.14"; - sha256 = "0dls16lw7yak3s6cwwcccfg0qb5g8s36waxlg8wgjk8vc57h316w"; + versionMinor = "5.20"; + sha256 = "1l5cgxzaassjnfbr4rbr3wzz45idcqa8aqhphhvlx1xl8xqv6p8a"; }; tomcatUnstable = common { From bf9b88f154b25a4ea2ba25dc5196ff5c9d6126a1 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 10 Sep 2017 14:51:23 +0000 Subject: [PATCH 055/115] fs-uae: build on x86 linux only --- pkgs/misc/emulators/fs-uae/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 95aaa96c911a..172b2a2eb3e2 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://fs-uae.net; maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + platforms = [ "i686-linux" "x86_64-linux" ]; }; } # TODO: testing and Python GUI support From 55b5a94d845ff46d7d03ccdc08557c6cce048c8e Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Sun, 10 Sep 2017 14:52:13 +0000 Subject: [PATCH 056/115] desmume: fix build with gcc6 by adding debian patch Debian also removed the package in testing when building with gcc7. --- pkgs/misc/emulators/desmume/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 02964d0232f5..3e7b033b5788 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchurl, fetchpatch , pkgconfig, libtool, intltool , libXmu , lua @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs"; }; + patches = [ + (fetchpatch { + name = "gcc6_fixes.patch"; + url = "https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/desmume/debian/patches/gcc6_fixes.patch?revision=15925"; + sha256 = "0j3fmxz0mfb3f4biks03pyz8f9hy958ks6qplisl60rzq9v9qpks"; + }) + ]; + buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop_file_utils gtk2 gtkglext libglade pangox_compat From b310053c012f92c8742d88ffc37bb446a4ecdc87 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 10 Sep 2017 17:05:01 +0200 Subject: [PATCH 057/115] fox-1.6: add missing frameworks --- pkgs/development/libraries/fox/fox-1.6.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 98becb8e2da1..63ec62336163 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor -, libXrandr, mesa, libXft, libXfixes, xinput }: +, libXrandr, mesa, libXft, libXfixes, xinput +, CoreServices }: let version = "1.6.49"; @@ -13,8 +14,10 @@ stdenv.mkDerivation rec { sha256 = "03m9wm8hpzh1i0fxx5mpvjr67384pfm9hn7gzdcq55b4639fqy9n"; }; - buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr - libXft mesa libXfixes xinput ]; + buildInputs = [ + xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr + libXft mesa libXfixes xinput + ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b0cb6e77cd4..72902fc2b311 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2048,7 +2048,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; - fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { }; + fox_1_6 = callPackage ../development/libraries/fox/fox-1.6.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; fping = callPackage ../tools/networking/fping {}; From 628578f9f855d80d572f611bf9064f9bfa01ea54 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 10 Sep 2017 17:14:16 +0200 Subject: [PATCH 058/115] v8: fix v3 builds by switching to GCC 5 (mksnapshot segfaults with GCC 6) --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 72902fc2b311..f530b3feac2e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10642,10 +10642,12 @@ with pkgs; v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (python2Packages) python gyp; cctools = darwin.cctools; + stdenv = overrideCC stdenv gcc5; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix { inherit (python2Packages) python gyp; + stdenv = overrideCC stdenv gcc5; }; v8 = callPackage ../development/libraries/v8 { From 301ab39213d25d42a355421c9c441aac3a87e836 Mon Sep 17 00:00:00 2001 From: Markus Mueller Date: Sun, 10 Sep 2017 15:21:35 +0000 Subject: [PATCH 059/115] dmenu-wayland: git-2014-11-02 -> git-2017-04-07 fix build Bumped and fixed substitution for package to build successfully. --- pkgs/applications/misc/dmenu/wayland.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 9a13da677456..340e8f161647 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -6,12 +6,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "dmenu-wayland-${version}"; - version = "git-2014-11-02"; - rev = "6e08b77428cc3c406ed2e90d4cae6c41df76341e"; + version = "git-2017-04-07"; + rev = "f385d9d18813071b4b4257bf8d4d572daeda0e70"; src = fetchurl { url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz"; - sha256 = "d0f73e442baf44a93a3b9d41a72e9cfa14f54af6049c90549f516722e3f88019"; + sha256 = "0y1jvh2815c005ns0bsjxsmz82smw22n6jsfg2g03a1pacakp6ys"; }; buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; preConfigure = [ - ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@$(echo "$nativeBuildInputs" | grep -o '[^ ]*-swc-[^ ]*')/share/swc@g" config.mk'' + ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@${swc}/share/swc@g" config.mk'' ]; meta = { From 92163ec65c5c366c5cdc3fb72e5e57cb1aa36f12 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 10 Sep 2017 17:23:50 +0200 Subject: [PATCH 060/115] glslviewer: fix darwin build --- pkgs/development/tools/glslviewer/default.nix | 23 +++++++++++-------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 1cca6a096fe6..a971ae83e637 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage, - libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi, - libX11, mesa_glu }: +{ stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage +, libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi +, libX11, mesa_glu, Cocoa +}: stdenv.mkDerivation rec { name = "glslviewer-${version}"; @@ -15,17 +16,21 @@ stdenv.mkDerivation rec { # Makefile has /usr/local/bin hard-coded for 'make install' preConfigure = '' - sed s,/usr/local,$out, -i Makefile + substituteInPlace Makefile \ + --replace '/usr/local' "$out" \ + --replace '/usr/bin/clang++' 'clang++' ''; preInstall = '' mkdir -p $out/bin ''; - - buildInputs = [ glfw mesa_glu pkgconfig glfw libXrandr libXdamage - libXext libXrender libXinerama libXcursor libXxf86vm - libXi libX11 ]; - + + buildInputs = [ + glfw mesa_glu pkgconfig glfw libXrandr libXdamage + libXext libXrender libXinerama libXcursor libXxf86vm + libXi libX11 + ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; + meta = with stdenv.lib; { description = "Live GLSL coding renderer"; homepage = http://patriciogonzalezvivo.com/2015/glslViewer/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f530b3feac2e..0ca1dff970b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1075,7 +1075,9 @@ with pkgs; glock = callPackage ../development/tools/glock { }; - glslviewer = callPackage ../development/tools/glslviewer { }; + glslviewer = callPackage ../development/tools/glslviewer { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; gmic = callPackage ../tools/graphics/gmic { }; From 259e73d678fed608730c3eb90eca7ac3c2e0a6a1 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sun, 10 Sep 2017 18:04:22 +0200 Subject: [PATCH 061/115] perl-moose: fix darwin build --- pkgs/top-level/perl-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 0a4818a51b80..55f543e68baf 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9050,6 +9050,9 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ CPANMetaCheck CPANMetaRequirements DistCheckConflicts TestCleanNamespaces TestFatal TestRequires ModuleMetadata ]; propagatedBuildInputs = [ ClassLoad ClassLoadXS DataOptList DevelGlobalDestruction DevelStackTrace DistCheckConflicts EvalClosure ListMoreUtils MROCompat ModuleRuntime ModuleRuntimeConflicts PackageDeprecationManager PackageStash PackageStashXS ParamsUtil SubExporter SubName TaskWeaken TryTiny ]; + preConfigure = '' + export LD=$CC + ''; meta = { homepage = http://moose.perl.org/; description = "A postmodern object system for Perl 5"; From c3b304e81197ff006f5f43986d26cf0aa96e19b2 Mon Sep 17 00:00:00 2001 From: Tristan Helmich Date: Sun, 10 Sep 2017 18:08:26 +0200 Subject: [PATCH 062/115] pythonPackages.phonenumbers: 8.8.0 -> 8.8.1 --- pkgs/development/python-modules/phonenumbers/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index b527df297929..53ec2c292fcc 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,17 +2,17 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.8.0"; + version = "8.8.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "0j8yzn7fva863v7vrjk0s1d63yswg8hf2hlpvfwzxk9absjyvmgq"; + sha256 = "09f4b307v6wn5zs6spvp5icwad3dz9baf7d14hyvpnxn7cdqj2xy"; }; meta = { description = "Python version of Google's common library for parsing, formatting, storing and validating international phone numbers"; - homepage = "https://github.com/daviddrysdale/python-phonenumbers"; + homepage = https://github.com/daviddrysdale/python-phonenumbers; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ fadenb ]; }; From 1ab2b06a36b828b11f71bfb7e94d591762c2b3cb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 10 Sep 2017 12:11:20 -0400 Subject: [PATCH 063/115] linux: 4.9.48 -> 4.9.49 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 81f4f2a95775..309286b662fc 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.9.48"; + version = "4.9.49"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y3s5xbh5axdvsx9iwz7sinbm7v6j2dvmj8dz46zj1mziwicagwq"; + sha256 = "1ywiww2h1gf3ps305irzk7n9xkcgg9bclr2jw6r5cqxmh3qxrv2p"; }; kernelPatches = args.kernelPatches; From 9c723d4b2b757eebf830de8992ac51333f4f89bb Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 10 Sep 2017 12:12:27 -0400 Subject: [PATCH 064/115] linux: 4.12.11 -> 4.12.12 --- pkgs/os-specific/linux/kernel/linux-4.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.12.nix b/pkgs/os-specific/linux/kernel/linux-4.12.nix index 4bcbca4dacce..c35b9e3e02ce 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.12.nix @@ -1,12 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.12.11"; + version = "4.12.12"; extraMeta.branch = "4.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "015kyh0v9lkk4a6sa7ysddi7dm639z5p45v2sh2kswsih4sf7kxf"; + sha256 = "1d254yxn46ydp0x3s5cpyg4p74zvdwiqfiaaim1m3g6rwjmlkjpa"; }; kernelPatches = args.kernelPatches; From 80486ba971e35350c9d5b4dd5684e24a9e49ccea Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 10 Sep 2017 12:12:47 -0400 Subject: [PATCH 065/115] linux: 4.13 -> 4.13.1 --- pkgs/os-specific/linux/kernel/linux-4.13.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.13.nix b/pkgs/os-specific/linux/kernel/linux-4.13.nix index 4c7039b2165c..29f0a05558cf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.13.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.13.nix @@ -1,13 +1,12 @@ { stdenv, hostPlatform, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.13"; - modDirVersion = "4.13.0"; + version = "4.13.1"; extraMeta.branch = "4.13"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0b4slkcq9pxxwp5sfbzffplsf8p0a4lksflpbfr3xn9sdh3ddcrd"; + sha256 = "1kp1lsf4314af7crpqkd2x1zx407a97r7rz3zhhskbilvsifgkny"; }; kernelPatches = args.kernelPatches; From 397fc0dacac23515ee09b8de6a14dc9019f325e2 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Sun, 10 Sep 2017 16:29:39 +0000 Subject: [PATCH 066/115] fast-cli: fix build --- pkgs/development/node-packages/default-v6.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 27664385b613..334c79a82672 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -53,4 +53,12 @@ nodePackages // { export PATH="$PATH:$tmp" ''; }); + + fast-cli = nodePackages.fast-cli.override (oldAttrs: { + preRebuild = '' + # Simply ignore the phantomjs --version check. It seems to need a display but it is safe to ignore + sed -i -e "s|console.error('Error verifying phantomjs, continuing', err)|console.error('Error verifying phantomjs, continuing', err); return true;|" node_modules/phantomjs-prebuilt/lib/util.js + ''; + buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; + }); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ca1dff970b7..2bf0622e09a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1027,9 +1027,7 @@ with pkgs; fastJson = callPackage ../development/libraries/fastjson { }; - fast-cli = nodePackages.fast-cli.overrideDerivation (old: { - buildInputs = old.buildInputs ++ [phantomjs2]; - }); + fast-cli = nodePackages.fast-cli; fd = callPackage ../tools/misc/fd { }; From 4f976bdd3e711d3c628df64af6ef918516f621b4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 10 Sep 2017 13:41:49 -0300 Subject: [PATCH 067/115] jupp: init at 3.1 jupp is a fork of joe's editor. --- pkgs/applications/editors/jupp/default.nix | 44 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/editors/jupp/default.nix diff --git a/pkgs/applications/editors/jupp/default.nix b/pkgs/applications/editors/jupp/default.nix new file mode 100644 index 000000000000..14fdcce1c8e5 --- /dev/null +++ b/pkgs/applications/editors/jupp/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl +, ncurses, gpm +}: + +stdenv.mkDerivation rec { + + name = "jupp-${version}"; + version = "3.1"; + srcName = "joe-3.1jupp31"; + + src = fetchurl { + urls = [ + "https://www.mirbsd.org/MirOS/dist/jupp/${srcName}.tgz" + "http://pub.allbsd.org/MirOS/dist/jupp/${srcName}.tgz" ]; + sha256 = "1fnf9jsd6p4jyybkhjjs328qx38ywy8w029ngc7j7kqp0ixn0l0s"; + }; + + preConfigure = "chmod +x ./configure"; + + buildInputs = [ ncurses gpm ]; + + configureFlags = [ + "--enable-curses" + "--enable-termcap" + "--enable-termidx" + "--enable-getpwnam" + "--enable-largefile" + ]; + + meta = with stdenv.lib; { + description = "A portable fork of Joe's editor"; + longDescription = '' + This is the portable version of JOE's Own Editor, which is currently + developed at sourceforge, licenced under the GNU General Public License, + Version 1, using autoconf/automake. This version has been enhanced by + several functions intended for programmers or other professional users, + and has a lot of bugs fixed. It is based upon an older version of joe + because these behave better overall. + ''; + homepage = http://mirbsd.de/jupp; + license = licenses.gpl1; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e584af631784..52eca8c6dc4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2760,6 +2760,8 @@ with pkgs; jucipp = callPackage ../applications/editors/jucipp { }; + jupp = callPackage ../applications/editors/jupp { }; + jwhois = callPackage ../tools/networking/jwhois { }; k2pdfopt = callPackage ../applications/misc/k2pdfopt { }; From 5d57aaebd55f9813309c262f9d44437ad4947a33 Mon Sep 17 00:00:00 2001 From: Falco Peijnenburg Date: Sun, 10 Sep 2017 12:09:23 +0200 Subject: [PATCH 068/115] haskellPackages.wai-secure-cookies: Fixed build --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2820c538b76b..320e96d56c1e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -927,4 +927,11 @@ self: super: { # https://github.com/graknlabs/grakn-haskell/pull/1 grakn = dontCheck (doJailbreak super.grakn); + + # cryptonite == 0.24.x, protolude == 0.2.x + wai-secure-cookies = super.wai-secure-cookies.override { + cryptonite = super.cryptonite_0_24; + protolude = super.protolude_0_2; + }; + } From 572726a5704887fad24241a745d8bd4173c785f4 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Sat, 9 Sep 2017 17:47:51 +0800 Subject: [PATCH 069/115] manual: `name' is not an argument for `mkOption' --- nixos/doc/manual/development/option-types.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index 441393c98276..b8e3ea774a71 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -175,7 +175,6 @@ Directly defined submodule options.mod = mkOption { - name = "mod"; description = "submodule example"; type = with types; listOf (submodule { options = { From f37a1e155e78f97644b53a14748743d655653225 Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Fri, 8 Sep 2017 08:37:57 +0800 Subject: [PATCH 070/115] manual: fixed remaining placeholder literal --- nixos/doc/manual/development/option-declarations.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index d20c2d1aa2e2..be793152f9ef 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -137,8 +137,8 @@ services.xserver.displayManager.enable = mkOption { }; Extending - <literal>services.foo.backend</literal> in the <literal>sddm</literal> - module + services.xserver.displayManager.enable in the + sddm module services.xserver.displayManager.enable = mkOption { type = with types; nullOr (enum [ "sddm" ]); From 4d101993bfed0a40caf5e1aaa19cc085f2c7192a Mon Sep 17 00:00:00 2001 From: Thomas Bach Date: Sun, 10 Sep 2017 08:50:07 +0800 Subject: [PATCH 071/115] manual: reworked submodule section for better readability The section was strange to read, as the initial example already used `listOf' which is mentioned in the very first paragraph. Then you read in a subsection about `listOf' and the exact same example is given once again. --- nixos/doc/manual/development/option-types.xml | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml index b8e3ea774a71..7b86e518aaf1 100644 --- a/nixos/doc/manual/development/option-types.xml +++ b/nixos/doc/manual/development/option-types.xml @@ -157,26 +157,26 @@
Submodule - Submodule is a very powerful type that defines a set of sub-options that - are handled like a separate module. - It is especially interesting when used with composed types like - attrsOf or listOf. + submodule is a very powerful type that defines a set + of sub-options that are handled like a separate module. - The submodule type take a parameter o, that - should be a set, or a function returning a set with an - options key defining the sub-options. - The option set can be defined directly () or as reference (). + It takes a parameter o, that should be a set, + or a function returning a set with an options key + defining the sub-options. + Submodule option definitions are type-checked accordingly to the + options declarations. + Of course, you can nest submodule option definitons for even higher + modularity. - Submodule option definitions are type-checked accordingly to the options - declarations. It is possible to declare submodule options inside a submodule - sub-options for even higher modularity. + The option set can be defined directly + () or as reference + (). Directly defined submodule options.mod = mkOption { description = "submodule example"; - type = with types; listOf (submodule { + type = with types; submodule { options = { foo = mkOption { type = int; @@ -185,10 +185,10 @@ options.mod = mkOption { type = str; }; }; - }); + }; }; -Submodule defined as a +<example xml:id='ex-submodule-reference'><title>Submodule defined as a reference let @@ -205,16 +205,20 @@ let in options.mod = mkOption { description = "submodule example"; - type = with types; listOf (submodule modOptions); + type = with types; submodule modOptions; }; -
Composed with <literal>listOf</literal> - - When composed with listOf, submodule allows multiple - definitions of the submodule option set. + The submodule type is especially interesting when + used with composed types like attrsOf or + listOf. + When composed with listOf + (), + submodule allows multiple definitions of the submodule + option set (). + Declaration of a list - of submodules + nof submodules options.mod = mkOption { description = "submodule example"; @@ -238,13 +242,11 @@ config.mod = [ { foo = 2; bar = "two"; } ]; -
- - -
Composed with <literal>attrsOf</literal> - - When composed with attrsOf, submodule allows multiple - named definitions of the submodule option set. + When composed with attrsOf + (), + submodule allows multiple named definitions of the + submodule option set (). + Declaration of attribute sets of submodules @@ -269,7 +271,6 @@ options.mod = mkOption { config.mod.one = { foo = 1; bar = "one"; }; config.mod.two = { foo = 2; bar = "two"; }; -
Extending types From e1ee06de1bc4ba67bb0dcb76f7943541164c2be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 8 Sep 2017 16:25:32 +0200 Subject: [PATCH 072/115] kdeApplications: 17.08.0 -> 17.08.1 --- pkgs/applications/kde/fetch.sh | 2 +- pkgs/applications/kde/khelpcenter.nix | 1 - .../kde/khelpcenter_kcoreaddons.patch | 13 - pkgs/applications/kde/srcs.nix | 2752 ++++++++--------- 4 files changed, 1377 insertions(+), 1391 deletions(-) delete mode 100644 pkgs/applications/kde/khelpcenter_kcoreaddons.patch diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index c1b2c79c849c..11cbfcfe5388 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/applications/17.08.0/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/applications/17.08.1/ -A '*.tar.xz' ) diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix index eae151e12252..69b629bbeb90 100644 --- a/pkgs/applications/kde/khelpcenter.nix +++ b/pkgs/applications/kde/khelpcenter.nix @@ -12,5 +12,4 @@ mkDerivation { grantlee kcmutils kconfig kcoreaddons kdbusaddons kdelibs4support khtml ki18n kinit kservice xapian ]; - patches = [ ./khelpcenter_kcoreaddons.patch ]; } diff --git a/pkgs/applications/kde/khelpcenter_kcoreaddons.patch b/pkgs/applications/kde/khelpcenter_kcoreaddons.patch deleted file mode 100644 index c5380cb48e51..000000000000 --- a/pkgs/applications/kde/khelpcenter_kcoreaddons.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/searchhandlers/CMakeLists.txt b/searchhandlers/CMakeLists.txt -index 298a32e..b9e06c6 100644 ---- a/searchhandlers/CMakeLists.txt -+++ b/searchhandlers/CMakeLists.txt -@@ -16,7 +16,7 @@ set(khc_xapianindexer_SOURCES - add_executable(khc_xapianindexer ${khc_xapianindexer_SOURCES}) - kde_target_enable_exceptions(khc_xapianindexer PRIVATE) - ecm_mark_nongui_executable(khc_xapianindexer) --target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES}) -+target_link_libraries(khc_xapianindexer Qt5::Core KF5::Archive KF5::CoreAddons ${XAPIAN_LIBRARIES} ${LIBXML2_LIBRARIES}) - if (${KF5_VERSION} VERSION_GREATER 5.35.0) - # practically means >=5.36 - target_link_libraries(khc_xapianindexer KF5::DocTools) diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index ad7a73588b0a..f7b5ca0b31a2 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -3,2235 +3,2235 @@ { akonadi = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-17.08.0.tar.xz"; - sha256 = "00mj3gvlv1cgb7dxzjym87404laxsk7insykbb12zj4wlhzakznp"; - name = "akonadi-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/akonadi-17.08.1.tar.xz"; + sha256 = "1nhjhgpigi8bhavh609lxnr76w9c0j7017haiv6g6j6zd5h0pp6w"; + name = "akonadi-17.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-calendar-17.08.0.tar.xz"; - sha256 = "0mv41pkn24rdbg5xyz7vxaihma02qry3sladgpffg27yw56xp5x4"; - name = "akonadi-calendar-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-17.08.1.tar.xz"; + sha256 = "15ld1jn1962wc5ynf8cgg9z6bh7hvjcl4nv9fqaa5mwy4mik4a0z"; + name = "akonadi-calendar-17.08.1.tar.xz"; }; }; akonadi-calendar-tools = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-calendar-tools-17.08.0.tar.xz"; - sha256 = "1vzmdgbn6hjjv74837s18kfif7s2gak5jbag2l1kqdj9lgwi4lv0"; - name = "akonadi-calendar-tools-17.08.0.tar.xz"; - }; - }; - akonadi-contacts = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-contacts-17.08.0.tar.xz"; - sha256 = "0j49zf83bfzrxygdg98cijjjva96niv24312ng7f8hckm369zc91"; - name = "akonadi-contacts-17.08.0.tar.xz"; - }; - }; - akonadi-import-wizard = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-import-wizard-17.08.0.tar.xz"; - sha256 = "0hhi8l94fariz6q2zazxsqnm08scfqsc3sm8azklj24gbz59qzzf"; - name = "akonadi-import-wizard-17.08.0.tar.xz"; - }; - }; - akonadi-mime = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-mime-17.08.0.tar.xz"; - sha256 = "0lg0rqikgdbdvh44p52m7acw6ni5wi1rsgx93wn1nki4rhnsgndp"; - name = "akonadi-mime-17.08.0.tar.xz"; - }; - }; - akonadi-notes = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-notes-17.08.0.tar.xz"; - sha256 = "1d17403bhbh7nk73vcq86dilfancb31fdz2al6pr7xrkxm5nql0v"; - name = "akonadi-notes-17.08.0.tar.xz"; - }; - }; - akonadi-search = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadi-search-17.08.0.tar.xz"; - sha256 = "1i6v4mvm2g0v4kzbs6rla9gf16lswg4xghsam9k1cpqpakkaqf84"; - name = "akonadi-search-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/akonadi-calendar-tools-17.08.1.tar.xz"; + sha256 = "1y4r3y9gbc1zsip25pz47fxi9fw68fr6p18mljfkcg394sygvlcr"; + name = "akonadi-calendar-tools-17.08.1.tar.xz"; }; }; akonadiconsole = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akonadiconsole-17.08.0.tar.xz"; - sha256 = "0a0gvw6xn4wcl5hzxnv4170n1yq0ycmfs6nyff4x8fcj0ffl6rqv"; - name = "akonadiconsole-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/akonadiconsole-17.08.1.tar.xz"; + sha256 = "0xy8s23941rfh1yiz2c1v10m59jrd8hphzphckxa68zxb6cb7vws"; + name = "akonadiconsole-17.08.1.tar.xz"; + }; + }; + akonadi-contacts = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/akonadi-contacts-17.08.1.tar.xz"; + sha256 = "0hgabjca3fzb8hlzhfi54la7rgh4gaii6i2j623birslzry3mkc9"; + name = "akonadi-contacts-17.08.1.tar.xz"; + }; + }; + akonadi-import-wizard = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/akonadi-import-wizard-17.08.1.tar.xz"; + sha256 = "1f7k592papppfqdhgpcpw03phhdlkp18cbap1ibvzywhg1dn2qmg"; + name = "akonadi-import-wizard-17.08.1.tar.xz"; + }; + }; + akonadi-mime = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/akonadi-mime-17.08.1.tar.xz"; + sha256 = "1apl89r1mpj5byngzdibxr4whr0932zr3j2y51pynnmilgkmyg6v"; + name = "akonadi-mime-17.08.1.tar.xz"; + }; + }; + akonadi-notes = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/akonadi-notes-17.08.1.tar.xz"; + sha256 = "1fgkipxhzj7c6ahdqhjii6ccxgn2qnn55jn64nrb36srmpnzrq7f"; + name = "akonadi-notes-17.08.1.tar.xz"; + }; + }; + akonadi-search = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/akonadi-search-17.08.1.tar.xz"; + sha256 = "1m119843brcjcymfcp9n7pfybqnw9ydhsm9ry5im52kci4rwsfhx"; + name = "akonadi-search-17.08.1.tar.xz"; }; }; akregator = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/akregator-17.08.0.tar.xz"; - sha256 = "16ss44md7vnz6nclhza7ygvfaqr8dpd2lq1cz4szm0qwwiciwxkc"; - name = "akregator-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/akregator-17.08.1.tar.xz"; + sha256 = "02p1vlxm91pyqhhwg3ggik9c8xw5ayz1w7bqpxmcb81gff75ha77"; + name = "akregator-17.08.1.tar.xz"; }; }; analitza = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/analitza-17.08.0.tar.xz"; - sha256 = "1qmh4xc912bw5m07pnqdp6pmjiba6mirlwhgbl6wqvzi97cjrsxq"; - name = "analitza-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/analitza-17.08.1.tar.xz"; + sha256 = "1kcyhim72g39ywq90hdd9ba6vwgq99xkbj82vbasy0il8xkkfcn4"; + name = "analitza-17.08.1.tar.xz"; }; }; ark = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ark-17.08.0.tar.xz"; - sha256 = "1d3p4y1bchnqza2xxmd7z3ys66373mgvdr8xa5z2n2pq55qnvrx1"; - name = "ark-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ark-17.08.1.tar.xz"; + sha256 = "019gz57c46lh5wz84r0swhbx7ywgw8s7yc1f589xh4nz18i9xi69"; + name = "ark-17.08.1.tar.xz"; }; }; artikulate = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/artikulate-17.08.0.tar.xz"; - sha256 = "0gybg5aw8gbrmfg46985p2xmdz624vjc6rkkh2f2dvrijx9z82sf"; - name = "artikulate-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/artikulate-17.08.1.tar.xz"; + sha256 = "1dgr9ww0pm6k0rhb3lkvr65jx6pnwsck1v3sfwpyyf8rrwixbvyk"; + name = "artikulate-17.08.1.tar.xz"; }; }; audiocd-kio = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/audiocd-kio-17.08.0.tar.xz"; - sha256 = "05h1rp7f3jqx9jzn3x48sdd0ycb0ksflyy8ncy9bb72ky3j3f986"; - name = "audiocd-kio-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/audiocd-kio-17.08.1.tar.xz"; + sha256 = "1k987lxm5wl6prdvbxxby1ly9r2dq7r5dsfbpazm43fxpx0pqyik"; + name = "audiocd-kio-17.08.1.tar.xz"; }; }; baloo-widgets = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/baloo-widgets-17.08.0.tar.xz"; - sha256 = "0z5lpmca6w691ckyhhr99ky0fjli7sk8riarhrr65hk6zyf3djmx"; - name = "baloo-widgets-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/baloo-widgets-17.08.1.tar.xz"; + sha256 = "19nij0hrcbcq4czxgh3l6gb25lkdi6j6sgmch24a8c7a106h0ips"; + name = "baloo-widgets-17.08.1.tar.xz"; }; }; blinken = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/blinken-17.08.0.tar.xz"; - sha256 = "0p2yx91sggn908i24lqjkd5lw5djidwdfybf6dvdz916bv2ypf90"; - name = "blinken-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/blinken-17.08.1.tar.xz"; + sha256 = "1nwdmhsyq1yzlr17mn98np0d3zg3rjyxsmlc7lyv1kszckhmb7qq"; + name = "blinken-17.08.1.tar.xz"; }; }; blogilo = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/blogilo-17.08.0.tar.xz"; - sha256 = "1dabq57krzjkrs5xpgarisik66n0cvk097y9szxbmw1ghmw871cf"; - name = "blogilo-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/blogilo-17.08.1.tar.xz"; + sha256 = "1c9dq7xwdwxwdch4ygyz7pds8q41xpb5661wa4alnpd06ra0bq0c"; + name = "blogilo-17.08.1.tar.xz"; }; }; bomber = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/bomber-17.08.0.tar.xz"; - sha256 = "0ydg1is0ayscj275177ivkzqdhc1mkqwbjfq5wdwiqdmh4p2dgzh"; - name = "bomber-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/bomber-17.08.1.tar.xz"; + sha256 = "1pcva9rgmvvkbbabwiw3aqv0aq0w2s6vxrw0gfxh6plgs42hpb24"; + name = "bomber-17.08.1.tar.xz"; }; }; bovo = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/bovo-17.08.0.tar.xz"; - sha256 = "1fl7cq27y3n0nzabh7xxwdipczww7pcck8nk2vrxzpnnwyzc4hjn"; - name = "bovo-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/bovo-17.08.1.tar.xz"; + sha256 = "0vn4q6qvig9rjq8ynwg53vzas8vxg0b55mvpg801ky6kp3ma3m6i"; + name = "bovo-17.08.1.tar.xz"; }; }; calendarsupport = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/calendarsupport-17.08.0.tar.xz"; - sha256 = "01fw1ddd6xhv84557214ilj088cdczv26whl6q4wm7c4wyicrrxs"; - name = "calendarsupport-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/calendarsupport-17.08.1.tar.xz"; + sha256 = "1p1s5sn284j2lwzm09ifp6dj6gzg6p169hh7dv7k5bshi7kzf42v"; + name = "calendarsupport-17.08.1.tar.xz"; }; }; cantor = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/cantor-17.08.0.tar.xz"; - sha256 = "0mv7qx5zam6mcri3j3jqci70bxxzrf3f7vdpmsmwcm2w0isv02x0"; - name = "cantor-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/cantor-17.08.1.tar.xz"; + sha256 = "1m6si2gy6n20z27sby7g7nqaxl067qpkj29l6b3qsyyx03w73n33"; + name = "cantor-17.08.1.tar.xz"; }; }; cervisia = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/cervisia-17.08.0.tar.xz"; - sha256 = "0pz6qqq5nayw68z30gf0bxjm8lz0hn2cswvdyc0b505p2gkq1ika"; - name = "cervisia-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/cervisia-17.08.1.tar.xz"; + sha256 = "13p5gs2cg939mcnq2hvvncj8v7vr7pcklq932xhy4qfwhqbhkxp1"; + name = "cervisia-17.08.1.tar.xz"; }; }; dolphin = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/dolphin-17.08.0.tar.xz"; - sha256 = "1fxga83magv47jpmrbcyyxblxyws0n6mp8vjv8pa5jzwywsxg09r"; - name = "dolphin-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/dolphin-17.08.1.tar.xz"; + sha256 = "04b9vq03m6s5mrv7q4na65kv9hpx7i4v45g6ls7pcyxi6ziszr3q"; + name = "dolphin-17.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/dolphin-plugins-17.08.0.tar.xz"; - sha256 = "1vb0flj4151d1h4x7rgfn79hcqk1pal9hxdi5wmkzjy3aj702gcc"; - name = "dolphin-plugins-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/dolphin-plugins-17.08.1.tar.xz"; + sha256 = "0vrs8yk2vqfbc79xjkj95zndyig2gz2b8aafs61q25b29lzilyq9"; + name = "dolphin-plugins-17.08.1.tar.xz"; }; }; dragon = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/dragon-17.08.0.tar.xz"; - sha256 = "0h9ysyjpcj8hlsbp622dzpzjvilad1qrjflhmx71gaan2dyq0jd0"; - name = "dragon-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/dragon-17.08.1.tar.xz"; + sha256 = "143x7x07z5af0z7za8r3jiq5id33rmb62ygp84af905lm2gf2yk0"; + name = "dragon-17.08.1.tar.xz"; }; }; eventviews = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/eventviews-17.08.0.tar.xz"; - sha256 = "166jsnyv3xwhli931xwh18cy6alkj7w2lc3bqzkch0bc4gd2w8ba"; - name = "eventviews-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/eventviews-17.08.1.tar.xz"; + sha256 = "1av86sbldkrgsdybxqzgda1pnd4y27ygxsibr76w6y8fnk66zrg7"; + name = "eventviews-17.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ffmpegthumbs-17.08.0.tar.xz"; - sha256 = "1771abzrfifvw2c34vl1j0xl5j9lv9q2cwfyan3bzviwyyca0gka"; - name = "ffmpegthumbs-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ffmpegthumbs-17.08.1.tar.xz"; + sha256 = "1lgi8rs3zbrwlcxbhq9qys8w0yh4f0rbalig0y020igbplkn9ccs"; + name = "ffmpegthumbs-17.08.1.tar.xz"; }; }; filelight = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/filelight-17.08.0.tar.xz"; - sha256 = "1y6b705q04hjzdyy3k3dps9rgvaqlvy232f3m0qg1j9kjy0hs7kb"; - name = "filelight-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/filelight-17.08.1.tar.xz"; + sha256 = "0wi0j55z8h58slbq4hinhfycpjb69m5g4ilk0csjw8syxhmy1jhl"; + name = "filelight-17.08.1.tar.xz"; }; }; granatier = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/granatier-17.08.0.tar.xz"; - sha256 = "1i55hqgn69c1y03wwnm360bmw3v0nsn5wi1nd4p5na4vxcr7ly03"; - name = "granatier-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/granatier-17.08.1.tar.xz"; + sha256 = "0panmz171ba3vfvdgjcwg1nxwv52qsh6qazagz7p5bv0hkf6y94n"; + name = "granatier-17.08.1.tar.xz"; }; }; grantlee-editor = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/grantlee-editor-17.08.0.tar.xz"; - sha256 = "1kvkbjicfnl8r13gzlb85d4c4allz6257285rmm3anhp12k84z31"; - name = "grantlee-editor-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/grantlee-editor-17.08.1.tar.xz"; + sha256 = "0xpkip7cy6d318mh3l8014zdifhx3njx8vk2cr2f00bjvs879zfj"; + name = "grantlee-editor-17.08.1.tar.xz"; }; }; grantleetheme = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/grantleetheme-17.08.0.tar.xz"; - sha256 = "04q29qvibxzxi9s9jldjvnx8x7x76ybcy7964im303zhcf3djmm5"; - name = "grantleetheme-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/grantleetheme-17.08.1.tar.xz"; + sha256 = "0l6ycr609wvxad1dwgy56blcnag5pr30gj59d5dcnq0iqcs9v5w9"; + name = "grantleetheme-17.08.1.tar.xz"; }; }; gwenview = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/gwenview-17.08.0.tar.xz"; - sha256 = "1xqma79v0sd48fsslblqaw5rbz80p2qi9rmwgv4adr1cd4n69f5i"; - name = "gwenview-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/gwenview-17.08.1.tar.xz"; + sha256 = "1f5c78007sqy3iq0rx8cskma8rjzinaahy26r054l59gq6b0d3v7"; + name = "gwenview-17.08.1.tar.xz"; }; }; incidenceeditor = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/incidenceeditor-17.08.0.tar.xz"; - sha256 = "0pl9qza8bmbr6f29iaq9afhr89nkap8yzf36qn0i0fvc2x1940wk"; - name = "incidenceeditor-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/incidenceeditor-17.08.1.tar.xz"; + sha256 = "0axwkhwqgmdnh9qn6j87j44x24vqb5bhch2pscrifdni05j99wzx"; + name = "incidenceeditor-17.08.1.tar.xz"; }; }; jovie = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/jovie-17.08.0.tar.xz"; - sha256 = "1q8l5xm93x2kacz8ay2ra6jg0q24r22y8lxfpqzb8l8sz7gy81qa"; - name = "jovie-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/jovie-17.08.1.tar.xz"; + sha256 = "19zhm6iqq505bwdd6f57rkzc9fmqqmw60071n679khrcgmsyx7ac"; + name = "jovie-17.08.1.tar.xz"; }; }; juk = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/juk-17.08.0.tar.xz"; - sha256 = "0dzhn7x4r32smfil8v5afrl4d3xlx0c23f21rbj8gnnbiz3033iw"; - name = "juk-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/juk-17.08.1.tar.xz"; + sha256 = "1r3igqgw2ani4500sndbqnxcbyjg8l0lcd0l0r6wmqs9cgf1w5d5"; + name = "juk-17.08.1.tar.xz"; }; }; k3b = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/k3b-17.08.0.tar.xz"; - sha256 = "1n0jvvd414mmfpljj1ja2ik7hcf3ih6i5ghcsq6irq6ijxibrkdd"; - name = "k3b-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/k3b-17.08.1.tar.xz"; + sha256 = "1pv8fpalqr7fpcy7dypzjp91h82scvzfk5g0mpzjpqlmn99hgfj1"; + name = "k3b-17.08.1.tar.xz"; }; }; kaccessible = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kaccessible-17.08.0.tar.xz"; - sha256 = "0xnlirxm5bp7wbvalml4z9l7yrnkxi7966dxb2a6n140xbnzy3f5"; - name = "kaccessible-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kaccessible-17.08.1.tar.xz"; + sha256 = "13j1c9l8qhll0a8fcny9nibr858w5cjpahccxgkh9v54iy3f243s"; + name = "kaccessible-17.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kaccounts-integration-17.08.0.tar.xz"; - sha256 = "181324pacp8nvnzyivwr657qi4jsbi5c1hv7yi5m9z0lw0b0h515"; - name = "kaccounts-integration-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kaccounts-integration-17.08.1.tar.xz"; + sha256 = "0y09hnjhxy7lnqjhz82z090wv3y5942xh1vhgyi5ac7pkgyzjh7m"; + name = "kaccounts-integration-17.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kaccounts-providers-17.08.0.tar.xz"; - sha256 = "1428vak366hkx54shpymsg6xk1f92hkz2hgbipim5rddgjqpa9w4"; - name = "kaccounts-providers-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kaccounts-providers-17.08.1.tar.xz"; + sha256 = "0dyrsvh98b75fxpap3x4vwvqx2dxyvcg4sfkic9sv137kwl8ihcp"; + name = "kaccounts-providers-17.08.1.tar.xz"; }; }; kaddressbook = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kaddressbook-17.08.0.tar.xz"; - sha256 = "1m6k5gadrq5l6grw9y677360lxxcvz4axhr0rkpamvf0vy92iy8w"; - name = "kaddressbook-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kaddressbook-17.08.1.tar.xz"; + sha256 = "0qf3wfjgbzjxrvhnwa702yhp54m8f4wk8d67jsgrlpvq3lizrzrf"; + name = "kaddressbook-17.08.1.tar.xz"; }; }; kajongg = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kajongg-17.08.0.tar.xz"; - sha256 = "0nf1p3gm9mq4szq49wmc39hjk52v4x5x7fn35sgmfi0dprz9i8y1"; - name = "kajongg-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kajongg-17.08.1.tar.xz"; + sha256 = "10bymw4bwqxjppvynwcx600ybr02kyd9m2ya0pi2208kj2s317m5"; + name = "kajongg-17.08.1.tar.xz"; }; }; kalarm = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kalarm-17.08.0.tar.xz"; - sha256 = "1680i011p15pra6cb95icz788v7qivc3l8d9fngw9hg03i33y118"; - name = "kalarm-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kalarm-17.08.1.tar.xz"; + sha256 = "0nxkln40bwlfdn2fp5a2a55x40zakq5nrir9bi920jpp78ivx2mf"; + name = "kalarm-17.08.1.tar.xz"; }; }; kalarmcal = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kalarmcal-17.08.0.tar.xz"; - sha256 = "0wwb2xx6avjaqkfsf2jnxbk31i4dss3j1gp1rjb608slq8kpwyy0"; - name = "kalarmcal-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kalarmcal-17.08.1.tar.xz"; + sha256 = "1dvv1rbh67c2vxcls8jv8chcgbp7q8c2jdjsr2cx2lmiasz0lqlf"; + name = "kalarmcal-17.08.1.tar.xz"; }; }; kalgebra = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kalgebra-17.08.0.tar.xz"; - sha256 = "1i8b9cv1qv8vhfbx0qa3ka08qgyyp6h474v9x504ypsx8124f8g4"; - name = "kalgebra-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kalgebra-17.08.1.tar.xz"; + sha256 = "07l3gff8la0cjd3aszm2v0gykfb2ws6k5hix0ck9q62kz1h6zd8d"; + name = "kalgebra-17.08.1.tar.xz"; }; }; kalzium = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kalzium-17.08.0.tar.xz"; - sha256 = "01xvnczj6dhjx37f2i1dil31zc5bff25p3i0mk01dgnvzcq7cflf"; - name = "kalzium-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kalzium-17.08.1.tar.xz"; + sha256 = "15rvpjni1a1fhr52awivzdc6v575510fs5mxxk05wqzsffa67i1f"; + name = "kalzium-17.08.1.tar.xz"; }; }; kamera = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kamera-17.08.0.tar.xz"; - sha256 = "14krfdwraffbhsqhmi0h91mmpxx4952vbmilbp6955psz7cn8xyi"; - name = "kamera-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kamera-17.08.1.tar.xz"; + sha256 = "044mn0k18ffxhc9nnbpqhcjlzkj4657nxqwdfl65k689y1l2bff1"; + name = "kamera-17.08.1.tar.xz"; }; }; kanagram = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kanagram-17.08.0.tar.xz"; - sha256 = "1szksc9w22dzkwhsgpbd5xrrg1iwn13wdcdhhc5g2mcx1xgwksr0"; - name = "kanagram-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kanagram-17.08.1.tar.xz"; + sha256 = "07gykmv9r1ikaw4l3zz27rc7a23q2nizszblm1ygv2nlyj6lilgf"; + name = "kanagram-17.08.1.tar.xz"; }; }; kapman = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kapman-17.08.0.tar.xz"; - sha256 = "042lczwbcb7nrbw2wx486mg9qmlx1kcxjdwab10gmy0hvx83p0m3"; - name = "kapman-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kapman-17.08.1.tar.xz"; + sha256 = "1r7r13yfgf64jfarqjiirfbhmrg6d04ija5sgl8aiib8rwnbs2lb"; + name = "kapman-17.08.1.tar.xz"; }; }; kapptemplate = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kapptemplate-17.08.0.tar.xz"; - sha256 = "1i2w06fb6i0b5yhawms9a0qmis1kz8hyyg8hhnfwcsb0frp4sp7s"; - name = "kapptemplate-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kapptemplate-17.08.1.tar.xz"; + sha256 = "0dcgsh4ns3749yybzz2jgdbjskxyzlnr2c0f5wzh9ilkz3yp7lq2"; + name = "kapptemplate-17.08.1.tar.xz"; }; }; kate = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kate-17.08.0.tar.xz"; - sha256 = "0zb6w346y5lz4bfvgvnkr9x1vkv6nblc2lrdx103jwbjwb3kjnpj"; - name = "kate-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kate-17.08.1.tar.xz"; + sha256 = "0z71s9g66ivbchrd2ps3j16ickjnky7ws484y04akjjs7sryzd0l"; + name = "kate-17.08.1.tar.xz"; }; }; katomic = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/katomic-17.08.0.tar.xz"; - sha256 = "0csnag857syf1966b8r1z8xhrcddy1r4qnk0lxgf326w1z33lyl3"; - name = "katomic-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/katomic-17.08.1.tar.xz"; + sha256 = "04k29x2hvcqc22cm763aflpwzb6gqqbnpd6dknd34985fqrrcdp4"; + name = "katomic-17.08.1.tar.xz"; }; }; kblackbox = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kblackbox-17.08.0.tar.xz"; - sha256 = "10n6an0m5q11i8jlg1v3fz5ib8mhwifalhkj3syda4wjnc6i98g0"; - name = "kblackbox-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kblackbox-17.08.1.tar.xz"; + sha256 = "1n1rxh86qcaa8dm5qcs43pdxjndzssy4pdyn90anw6bqsw1mn7q0"; + name = "kblackbox-17.08.1.tar.xz"; }; }; kblocks = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kblocks-17.08.0.tar.xz"; - sha256 = "0ahc5pyrhfx49pyyj5i7kp7jj5y9dkxd12xbrmv3hyqips1q83ds"; - name = "kblocks-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kblocks-17.08.1.tar.xz"; + sha256 = "0bx5j1kahyspbmrw2falkw037d1lkj6f1yppwdlh2l4zn7xbgx78"; + name = "kblocks-17.08.1.tar.xz"; }; }; kblog = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kblog-17.08.0.tar.xz"; - sha256 = "0hspjg73yjqsxykc2spsva4bc33bn0rxbdjn33fhzyz31n2cv6km"; - name = "kblog-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kblog-17.08.1.tar.xz"; + sha256 = "0kdwv2ym3xba7n0qslrgdlmanw1zqanv5ycjnl54gf1xlbdwbpv2"; + name = "kblog-17.08.1.tar.xz"; }; }; kbounce = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kbounce-17.08.0.tar.xz"; - sha256 = "0269mfnzkvf25j60hj1mpg1wsjd2a90llcqxfzc9bi3kfvg9k11f"; - name = "kbounce-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kbounce-17.08.1.tar.xz"; + sha256 = "0bl1pm8h547gwzx1pbc340711fp5scfa1dql7b1yjjpfg56flccm"; + name = "kbounce-17.08.1.tar.xz"; }; }; kbreakout = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kbreakout-17.08.0.tar.xz"; - sha256 = "1vcknsahyaya6mk81mzbv56924k55yzhkfiv389bwj8gfg0983a0"; - name = "kbreakout-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kbreakout-17.08.1.tar.xz"; + sha256 = "021hzg4m6aqvvavdx63ydj2s71shml6x1rrd9lyyw23harh7402h"; + name = "kbreakout-17.08.1.tar.xz"; }; }; kbruch = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kbruch-17.08.0.tar.xz"; - sha256 = "0gdz4ayk7bpc3w0pw8a4k742hxp7qh6a0j5b21qfhjzlhbpb4y4r"; - name = "kbruch-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kbruch-17.08.1.tar.xz"; + sha256 = "110iar2p5wlil4b8j5gw37mizajvhc9j7fww7dmvffq1yn4m5ac2"; + name = "kbruch-17.08.1.tar.xz"; }; }; kcachegrind = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcachegrind-17.08.0.tar.xz"; - sha256 = "0n0sj9vpawjanj92jkbkvb4njr6qy3v5j2npglg2skv1brqhn55h"; - name = "kcachegrind-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcachegrind-17.08.1.tar.xz"; + sha256 = "0pgc00y7l98fws7qfc9i92a9mizgkkvap48pi12r9ajj5bhy792b"; + name = "kcachegrind-17.08.1.tar.xz"; }; }; kcalc = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcalc-17.08.0.tar.xz"; - sha256 = "03xiwv8c86p3s640a35021z5varqkfrgpkrlc5gyxd2nnjldy9ky"; - name = "kcalc-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcalc-17.08.1.tar.xz"; + sha256 = "177mr533r71jpa64bvkbl349lkf2yzanrjh22d4rii7lqma63z4k"; + name = "kcalc-17.08.1.tar.xz"; }; }; kcalcore = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcalcore-17.08.0.tar.xz"; - sha256 = "1vpyzbv6lv29ihzwrwd0nsb9vmy6iswka244fixa278218g2lfix"; - name = "kcalcore-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcalcore-17.08.1.tar.xz"; + sha256 = "084gj40lssh6lsjn7xpvzlhlfcc6vcdk6ygv47wvf8y0yipppspw"; + name = "kcalcore-17.08.1.tar.xz"; }; }; kcalutils = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcalutils-17.08.0.tar.xz"; - sha256 = "1s90arpxjnbzikpy1j1rcbvljcjgq5pgvmsr852r8qgw7s9dkpmh"; - name = "kcalutils-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcalutils-17.08.1.tar.xz"; + sha256 = "04nn5lv2x15352p42589zyh1w2fxbijkq9wmbcr51fb4nphx007l"; + name = "kcalutils-17.08.1.tar.xz"; }; }; kcharselect = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcharselect-17.08.0.tar.xz"; - sha256 = "16hgzm3v84xkq4s68cpz73b4vgw1sarlgab0f2qkacvggpa0gkb6"; - name = "kcharselect-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcharselect-17.08.1.tar.xz"; + sha256 = "1w6ydp7acf5ha0kag60m1anksj7fy2kk8bghpw14lv8bxzrjwdam"; + name = "kcharselect-17.08.1.tar.xz"; }; }; kcolorchooser = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcolorchooser-17.08.0.tar.xz"; - sha256 = "177v2wi0dwzydbi1xwqq34s38rlgqifirm6r4frbxzbxzi1bpvw0"; - name = "kcolorchooser-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcolorchooser-17.08.1.tar.xz"; + sha256 = "1zmzd919crj25ngcv085pp4w213x4bra54npfw4z11cmc30zz57i"; + name = "kcolorchooser-17.08.1.tar.xz"; }; }; kcontacts = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcontacts-17.08.0.tar.xz"; - sha256 = "0852x0nindb8daczdhyiqahyqq0r60gmpyhsymccpz8jzirxlbfv"; - name = "kcontacts-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcontacts-17.08.1.tar.xz"; + sha256 = "0iqpvsnwbnzczdcvbqlrgmx2czjqgl4ag4b09vhkj1s7gs8cracy"; + name = "kcontacts-17.08.1.tar.xz"; }; }; kcron = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kcron-17.08.0.tar.xz"; - sha256 = "0fmzikk0zyhf41k7mxwyzlxr67jg3ffjj0jilskzdq6ffsnc7m08"; - name = "kcron-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kcron-17.08.1.tar.xz"; + sha256 = "0yzv068jsxyag68fix421z5qfvpxm1i9v1q3pw3ksvq07ai740f3"; + name = "kcron-17.08.1.tar.xz"; }; }; kdav = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdav-17.08.0.tar.xz"; - sha256 = "066hhcf8n6wnm4f76f24xq9hy0x9771kvbmappaicwnlza71v0i1"; - name = "kdav-17.08.0.tar.xz"; - }; - }; - kde-dev-scripts = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-dev-scripts-17.08.0.tar.xz"; - sha256 = "1skvgaj54a9apvwbjwpzvqyk1cqg3mf8p0h2fyp0k1i1f3ig8qrb"; - name = "kde-dev-scripts-17.08.0.tar.xz"; - }; - }; - kde-dev-utils = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-dev-utils-17.08.0.tar.xz"; - sha256 = "00xz7n5bjss2im106n7r8zncan9v1mxmlfl27if1wff0nflbnfcm"; - name = "kde-dev-utils-17.08.0.tar.xz"; - }; - }; - kde-l10n-ar = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ar-17.08.0.tar.xz"; - sha256 = "0jp0zcc8m0zmi342y8656z6gw93drnripfj0qbkblqj7fmqbgjf4"; - name = "kde-l10n-ar-17.08.0.tar.xz"; - }; - }; - kde-l10n-ast = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ast-17.08.0.tar.xz"; - sha256 = "03pzn3pa39350njjww36mk6l809bnx332v1y0hic0rrpbnscmbfk"; - name = "kde-l10n-ast-17.08.0.tar.xz"; - }; - }; - kde-l10n-bg = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-bg-17.08.0.tar.xz"; - sha256 = "15a14mwyi29pc66mx02axsham6mgqw7bmd54rinhafhwcdsdyhia"; - name = "kde-l10n-bg-17.08.0.tar.xz"; - }; - }; - kde-l10n-bs = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-bs-17.08.0.tar.xz"; - sha256 = "17irsp0zdk66k66rg2an3bdx38y8d64zijh4fm7kr0nx3vm1gzxp"; - name = "kde-l10n-bs-17.08.0.tar.xz"; - }; - }; - kde-l10n-ca = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ca-17.08.0.tar.xz"; - sha256 = "0yhr0yrxxbzkp2aby7kfkscf4rrk12myhqqvcy4v1acqywqn3zrs"; - name = "kde-l10n-ca-17.08.0.tar.xz"; - }; - }; - kde-l10n-ca_valencia = { - version = "ca_valencia-17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ca@valencia-17.08.0.tar.xz"; - sha256 = "0khslngsws4z0frc93w0yj3lgi9164j94pknwzhiq6h39bdy5jha"; - name = "kde-l10n-ca_valencia-17.08.0.tar.xz"; - }; - }; - kde-l10n-cs = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-cs-17.08.0.tar.xz"; - sha256 = "0ia1lysymd87z1a7hcg95v30q8gwlx1f2m5brkh1s1fdkl4hf7zc"; - name = "kde-l10n-cs-17.08.0.tar.xz"; - }; - }; - kde-l10n-da = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-da-17.08.0.tar.xz"; - sha256 = "1fzmzhnsp6jfiahga685dnn8li24lhyq0pdvpbmx2fsq8izg449s"; - name = "kde-l10n-da-17.08.0.tar.xz"; - }; - }; - kde-l10n-de = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-de-17.08.0.tar.xz"; - sha256 = "1zaypk1y6bmpbrymds5iiq0gcc1fcja61fpm9iqc76s3x22walw3"; - name = "kde-l10n-de-17.08.0.tar.xz"; - }; - }; - kde-l10n-el = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-el-17.08.0.tar.xz"; - sha256 = "0440flgz1sfs8b8qrvzn2gh14z25pivvxgcv2kgsgb6lq9b98bhg"; - name = "kde-l10n-el-17.08.0.tar.xz"; - }; - }; - kde-l10n-en_GB = { - version = "en_GB-17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-en_GB-17.08.0.tar.xz"; - sha256 = "1w11hbr3sdrr724qvfh15ppyg0r4003110v876xqy2f2d5z2v9mq"; - name = "kde-l10n-en_GB-17.08.0.tar.xz"; - }; - }; - kde-l10n-eo = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-eo-17.08.0.tar.xz"; - sha256 = "0w034zx2qmwimq5p8gr0dgh1d51bhwnqc1db9jszr0hv891fji8v"; - name = "kde-l10n-eo-17.08.0.tar.xz"; - }; - }; - kde-l10n-es = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-es-17.08.0.tar.xz"; - sha256 = "1428jqjqmxh1fql39af52f0g8ha7jlnmkpkb45x9k95cfbm0hccn"; - name = "kde-l10n-es-17.08.0.tar.xz"; - }; - }; - kde-l10n-et = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-et-17.08.0.tar.xz"; - sha256 = "0iqs6636jfxyhdiifx9nzxg1z7z4rb9parj93njhb6x34kpa6b4v"; - name = "kde-l10n-et-17.08.0.tar.xz"; - }; - }; - kde-l10n-eu = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-eu-17.08.0.tar.xz"; - sha256 = "1x3r1m0yivvasv7832v2my2nn8kgdfp8326dmjz1fcgs7cnnv4ab"; - name = "kde-l10n-eu-17.08.0.tar.xz"; - }; - }; - kde-l10n-fa = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fa-17.08.0.tar.xz"; - sha256 = "1kaibymfrpa5c6pmq3rkxnnl532s19bg60nzq0iirn3n0kgplwy2"; - name = "kde-l10n-fa-17.08.0.tar.xz"; - }; - }; - kde-l10n-fi = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fi-17.08.0.tar.xz"; - sha256 = "0yml2hpg0b48rknik9kfhdgn6znwjqxg43gaglglm79d68a7xdng"; - name = "kde-l10n-fi-17.08.0.tar.xz"; - }; - }; - kde-l10n-fr = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-fr-17.08.0.tar.xz"; - sha256 = "1r97zi8p1jha99r5k2qljrypmyzdrmpz0r60bv1b7nhx7m6ix503"; - name = "kde-l10n-fr-17.08.0.tar.xz"; - }; - }; - kde-l10n-ga = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ga-17.08.0.tar.xz"; - sha256 = "1y43njj4k79mzcvhg8ycr7641js698kda762jffdzfl2navx2f7r"; - name = "kde-l10n-ga-17.08.0.tar.xz"; - }; - }; - kde-l10n-gl = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-gl-17.08.0.tar.xz"; - sha256 = "053x6v84bpa8cnl6v95kfks7b914b9jy1wd41lyxd9a8z5nh04yp"; - name = "kde-l10n-gl-17.08.0.tar.xz"; - }; - }; - kde-l10n-he = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-he-17.08.0.tar.xz"; - sha256 = "08fq8v7af2j2iqnwja3pznklizxib7v4zs22i359iql05iayd0wy"; - name = "kde-l10n-he-17.08.0.tar.xz"; - }; - }; - kde-l10n-hi = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hi-17.08.0.tar.xz"; - sha256 = "0zizfvwiwix937iczh186w42ydsvyp3h4pyk2r05ds4hbz6jw4yd"; - name = "kde-l10n-hi-17.08.0.tar.xz"; - }; - }; - kde-l10n-hr = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hr-17.08.0.tar.xz"; - sha256 = "18fdby0dpgymrya63cks23k5nq4ni9n7nymvx65z7bn8h7r8cbmc"; - name = "kde-l10n-hr-17.08.0.tar.xz"; - }; - }; - kde-l10n-hu = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-hu-17.08.0.tar.xz"; - sha256 = "1gcqmf4vbmwah8yi78inb9miirs13r80wjfif5c8vblhvdmlbrc1"; - name = "kde-l10n-hu-17.08.0.tar.xz"; - }; - }; - kde-l10n-ia = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ia-17.08.0.tar.xz"; - sha256 = "11ljcxwsq09885rdd3kszfchjdi4g3359b88rfsq4dn11bnmm50s"; - name = "kde-l10n-ia-17.08.0.tar.xz"; - }; - }; - kde-l10n-id = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-id-17.08.0.tar.xz"; - sha256 = "005563k8bdqzyhm3l231vlc96iwc4sg9f0932y9w1nmlxkh0n02f"; - name = "kde-l10n-id-17.08.0.tar.xz"; - }; - }; - kde-l10n-is = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-is-17.08.0.tar.xz"; - sha256 = "143zja0j77lgmkb34lycrdzkpsffzljmlmmiaisjpb1bj664sk9d"; - name = "kde-l10n-is-17.08.0.tar.xz"; - }; - }; - kde-l10n-it = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-it-17.08.0.tar.xz"; - sha256 = "0ppd16w8zdpslz8p6yrhw4dl7pm0i3a6wpin3kvqxaxd87vxzzvb"; - name = "kde-l10n-it-17.08.0.tar.xz"; - }; - }; - kde-l10n-ja = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ja-17.08.0.tar.xz"; - sha256 = "0qq88f5gm3ifw1l5m2xq8x6ajqj6ngfpydbrz5ry62nz8mi0w1i0"; - name = "kde-l10n-ja-17.08.0.tar.xz"; - }; - }; - kde-l10n-kk = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-kk-17.08.0.tar.xz"; - sha256 = "0w953g4hvhisawb3423c9dd1vin8zxk3643ilkrf3mlkx972ib5m"; - name = "kde-l10n-kk-17.08.0.tar.xz"; - }; - }; - kde-l10n-km = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-km-17.08.0.tar.xz"; - sha256 = "1xhmmnxsd0lcr68zz5x68cs4gxxlxm71p30zj3cm188dq756c9a9"; - name = "kde-l10n-km-17.08.0.tar.xz"; - }; - }; - kde-l10n-ko = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ko-17.08.0.tar.xz"; - sha256 = "1c6arfbp06kmapxp8ass37sb250pbsvfhwjqn57yaya0hvf3my82"; - name = "kde-l10n-ko-17.08.0.tar.xz"; - }; - }; - kde-l10n-lt = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-lt-17.08.0.tar.xz"; - sha256 = "09cidww52igwav358a1f1gm7djcrpnl7d3wc11w2v7hn76cabjmx"; - name = "kde-l10n-lt-17.08.0.tar.xz"; - }; - }; - kde-l10n-lv = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-lv-17.08.0.tar.xz"; - sha256 = "148sfbalalp3calzgl4kga1bcj1sqgkwdgx07bsqza9q142z5xjs"; - name = "kde-l10n-lv-17.08.0.tar.xz"; - }; - }; - kde-l10n-mr = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-mr-17.08.0.tar.xz"; - sha256 = "1m8la1a1fyfm5k732hnm3ybxqmah7mdf6f3nhxisr3c2h3gxqysk"; - name = "kde-l10n-mr-17.08.0.tar.xz"; - }; - }; - kde-l10n-nb = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nb-17.08.0.tar.xz"; - sha256 = "13r7dzwbr1qggwbh4lbb45xy7qck04waxjsaj66d5zv7gw9hc2gp"; - name = "kde-l10n-nb-17.08.0.tar.xz"; - }; - }; - kde-l10n-nds = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nds-17.08.0.tar.xz"; - sha256 = "19mrs2l6z6ypr1h4ppw0v588hj46nngzanlq5rcznimf9v1b4jwr"; - name = "kde-l10n-nds-17.08.0.tar.xz"; - }; - }; - kde-l10n-nl = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nl-17.08.0.tar.xz"; - sha256 = "1lvqjgjk2qfbvlkjyp0pkdp015dcxmc4db0zy077fy1vbrcclj54"; - name = "kde-l10n-nl-17.08.0.tar.xz"; - }; - }; - kde-l10n-nn = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-nn-17.08.0.tar.xz"; - sha256 = "1vk504hjrai30rbr7v9fkyf8yj4ms33ck7c32xk5jxq0avd3yyj7"; - name = "kde-l10n-nn-17.08.0.tar.xz"; - }; - }; - kde-l10n-pa = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pa-17.08.0.tar.xz"; - sha256 = "0vh52aqbd66mrb492d2h8gihbs6wql6q0yjvk0ixhhi2b9cykzi0"; - name = "kde-l10n-pa-17.08.0.tar.xz"; - }; - }; - kde-l10n-pl = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pl-17.08.0.tar.xz"; - sha256 = "1mfjjvm41cd4z1bvnrhpjbwcp2czw70mp3p3snyb7397d2c786f1"; - name = "kde-l10n-pl-17.08.0.tar.xz"; - }; - }; - kde-l10n-pt = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pt-17.08.0.tar.xz"; - sha256 = "1z44l4qa8ks9r7bwa7dgp43nlcymkdkz31jl7qvgy8c8lil8a6vy"; - name = "kde-l10n-pt-17.08.0.tar.xz"; - }; - }; - kde-l10n-pt_BR = { - version = "pt_BR-17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-pt_BR-17.08.0.tar.xz"; - sha256 = "1hgbw89f7slscc7cgfsxdk0l3y5szsqsidq9grj0j4v2v1qfy320"; - name = "kde-l10n-pt_BR-17.08.0.tar.xz"; - }; - }; - kde-l10n-ro = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ro-17.08.0.tar.xz"; - sha256 = "0y3mpa1jckzl76yz3fal05dprpmch0m7y03q83yzgb6xdr021bds"; - name = "kde-l10n-ro-17.08.0.tar.xz"; - }; - }; - kde-l10n-ru = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ru-17.08.0.tar.xz"; - sha256 = "0ixs6n9jz2i570i5qfd36pjg8jldlgsrwbdb8n82h9c9mjyc7if9"; - name = "kde-l10n-ru-17.08.0.tar.xz"; - }; - }; - kde-l10n-sk = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sk-17.08.0.tar.xz"; - sha256 = "0g60hxlbck1rjjmwx0wvxzzgqjmi6wc1n5s6i2230150apas9dh1"; - name = "kde-l10n-sk-17.08.0.tar.xz"; - }; - }; - kde-l10n-sl = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sl-17.08.0.tar.xz"; - sha256 = "0vs0kvyxb5yc0qwsdf9rg49gvzd5mwd9bag5mvwp4hcrcn3i7db0"; - name = "kde-l10n-sl-17.08.0.tar.xz"; - }; - }; - kde-l10n-sr = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sr-17.08.0.tar.xz"; - sha256 = "0wq1n8ygcz1jpxi3qf0q9qj07vb1p4agn1hjfyy4bjzm3kdy2jkw"; - name = "kde-l10n-sr-17.08.0.tar.xz"; - }; - }; - kde-l10n-sv = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-sv-17.08.0.tar.xz"; - sha256 = "09h9d65idax2d10gzwrff96a2si1anc827j2b9r1d559gx9imy0w"; - name = "kde-l10n-sv-17.08.0.tar.xz"; - }; - }; - kde-l10n-tr = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-tr-17.08.0.tar.xz"; - sha256 = "1dg4l6cy2qn9zvspwf7hfn2p0aad3x3zq0jhipdh4n00gykwh3sm"; - name = "kde-l10n-tr-17.08.0.tar.xz"; - }; - }; - kde-l10n-ug = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-ug-17.08.0.tar.xz"; - sha256 = "00732l2qisn2kaal3k19f6bnf8ynxalfvmazapbcn3hbcig8cyi5"; - name = "kde-l10n-ug-17.08.0.tar.xz"; - }; - }; - kde-l10n-uk = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-uk-17.08.0.tar.xz"; - sha256 = "10jrvzy4kfbcn0vcbyir967vhbmk05kzjc7sydx3mg98b0j6qicz"; - name = "kde-l10n-uk-17.08.0.tar.xz"; - }; - }; - kde-l10n-wa = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-wa-17.08.0.tar.xz"; - sha256 = "0p595ra21jn72r46haiwi4h8a3gia96qv0lsdfsi8s6lyqqca0i1"; - name = "kde-l10n-wa-17.08.0.tar.xz"; - }; - }; - kde-l10n-zh_CN = { - version = "zh_CN-17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-zh_CN-17.08.0.tar.xz"; - sha256 = "08fxsafnmzizfhr2i63p41jgkjgnkrb07s6mpdrxklkhafl8bmg8"; - name = "kde-l10n-zh_CN-17.08.0.tar.xz"; - }; - }; - kde-l10n-zh_TW = { - version = "zh_TW-17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-l10n/kde-l10n-zh_TW-17.08.0.tar.xz"; - sha256 = "04qq28sf2pjb4rc32j5j9cnhw0h4hpw69gikb5s06324mmmvap0f"; - name = "kde-l10n-zh_TW-17.08.0.tar.xz"; - }; - }; - kde-runtime = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kde-runtime-17.08.0.tar.xz"; - sha256 = "14j61bsrrpajw5djk7aa49xid2lg51a886y3q1xdv3dnflmldm70"; - name = "kde-runtime-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdav-17.08.1.tar.xz"; + sha256 = "1m9pcydg2fwz95mym7k7wdavbw4nz18ihhrhfmcda7m61x6y8z9q"; + name = "kdav-17.08.1.tar.xz"; }; }; kdebugsettings = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdebugsettings-17.08.0.tar.xz"; - sha256 = "057z4bi9mlpdyb8giq5zsgm1fzfq7sz05a0p4is8cawlyjji8qd3"; - name = "kdebugsettings-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdebugsettings-17.08.1.tar.xz"; + sha256 = "0jxy68fs45hwkd3hjl5rknwznsihk0nszmskw3hy3y64p2vvvzyf"; + name = "kdebugsettings-17.08.1.tar.xz"; + }; + }; + kde-dev-scripts = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-dev-scripts-17.08.1.tar.xz"; + sha256 = "16dzmx80752n3wcg2dcwh4cc0mwxwckfbms134g83gwaix5wkyvd"; + name = "kde-dev-scripts-17.08.1.tar.xz"; + }; + }; + kde-dev-utils = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-dev-utils-17.08.1.tar.xz"; + sha256 = "1lq8cya779667yjwinvx9xyfiq79p7m93m4r2zgd7r6fpakxdkch"; + name = "kde-dev-utils-17.08.1.tar.xz"; }; }; kdeedu-data = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdeedu-data-17.08.0.tar.xz"; - sha256 = "1w5zvzgqa8jzvqkgc16sffj6fygrizqmy5lzmxhisnph8im5rxyp"; - name = "kdeedu-data-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdeedu-data-17.08.1.tar.xz"; + sha256 = "1fk2r2cib8gzk1ss5z6wxdwswl3f0hvwmxdgg0cs0j11gk1m0m6g"; + name = "kdeedu-data-17.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdegraphics-mobipocket-17.08.0.tar.xz"; - sha256 = "1r66s3yay2pvy77pfa8g1s07iq4v2fiz9nl4lxhd8lvdg7jxa88i"; - name = "kdegraphics-mobipocket-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-mobipocket-17.08.1.tar.xz"; + sha256 = "0y2yfcf2p864hzyxyxv65mkfl8qk08zh9pr24ycxfdl4g22pal6w"; + name = "kdegraphics-mobipocket-17.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdegraphics-thumbnailers-17.08.0.tar.xz"; - sha256 = "0cp2p5nmxxg09wfrhg7qzz781rbxyml42y6l42njqfphgxsyqs5h"; - name = "kdegraphics-thumbnailers-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdegraphics-thumbnailers-17.08.1.tar.xz"; + sha256 = "1milas13wb958z2p39rm1353lqz9ibhnpwb8ffw6wy5qdbx4fr4q"; + name = "kdegraphics-thumbnailers-17.08.1.tar.xz"; + }; + }; + kde-l10n-ar = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ar-17.08.1.tar.xz"; + sha256 = "03bj86is2a0srygmabxmwmdmqxwwxm06lh9a6g362dhglh4ypp67"; + name = "kde-l10n-ar-17.08.1.tar.xz"; + }; + }; + kde-l10n-ast = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ast-17.08.1.tar.xz"; + sha256 = "0vsyv4g8ywpvcxh1hkhx1y8plx9k068fqrgvglv9gvsr86w57xn7"; + name = "kde-l10n-ast-17.08.1.tar.xz"; + }; + }; + kde-l10n-bg = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bg-17.08.1.tar.xz"; + sha256 = "0bz8ydq7i0q29znbia0fcw5y19cw9a5hxh2gh8s7v6pvniazlgfx"; + name = "kde-l10n-bg-17.08.1.tar.xz"; + }; + }; + kde-l10n-bs = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-bs-17.08.1.tar.xz"; + sha256 = "19jjrwga6b5vn0g8m5mgp9kgn9173km6jmj92fl63w7lhd60pqyy"; + name = "kde-l10n-bs-17.08.1.tar.xz"; + }; + }; + kde-l10n-ca = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca-17.08.1.tar.xz"; + sha256 = "1ldpsjaczqfczglfk2nib4kqkzi6z16mkyisx1byw3wxix7aqak5"; + name = "kde-l10n-ca-17.08.1.tar.xz"; + }; + }; + kde-l10n-ca_valencia = { + version = "ca_valencia-17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ca@valencia-17.08.1.tar.xz"; + sha256 = "1dnvvc6jbwyvagy7ay3w1rdj82bx7zcc97i61drlv2cf1vgkmb4l"; + name = "kde-l10n-ca_valencia-17.08.1.tar.xz"; + }; + }; + kde-l10n-cs = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-cs-17.08.1.tar.xz"; + sha256 = "0f9h5ln31395kgbqa8rj1sdkwjaczw4mvjlif9656xqglzw0dvs1"; + name = "kde-l10n-cs-17.08.1.tar.xz"; + }; + }; + kde-l10n-da = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-da-17.08.1.tar.xz"; + sha256 = "0rr0gmzfbdwnya9bipbymwqy6250zdi47chawi7j3vc4j11511g2"; + name = "kde-l10n-da-17.08.1.tar.xz"; + }; + }; + kde-l10n-de = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-de-17.08.1.tar.xz"; + sha256 = "08ad110q4k21j8mfzigjxxrlic2c6h0cxqiawbfswzc39r0vy0lb"; + name = "kde-l10n-de-17.08.1.tar.xz"; + }; + }; + kde-l10n-el = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-el-17.08.1.tar.xz"; + sha256 = "1m2f8rsygmyn05i3j5mnwnr7mm4jahy2yaphxv822g6i79iy3396"; + name = "kde-l10n-el-17.08.1.tar.xz"; + }; + }; + kde-l10n-en_GB = { + version = "en_GB-17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-en_GB-17.08.1.tar.xz"; + sha256 = "14ql8kd60c4svg3ar5n61g544in805xsyfk2bgals0m47fy3axyf"; + name = "kde-l10n-en_GB-17.08.1.tar.xz"; + }; + }; + kde-l10n-eo = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eo-17.08.1.tar.xz"; + sha256 = "05lnk520hg9kxf6f92fn9avx4h29pjk4k8j7rsk4nwngvvygqjb6"; + name = "kde-l10n-eo-17.08.1.tar.xz"; + }; + }; + kde-l10n-es = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-es-17.08.1.tar.xz"; + sha256 = "1h2lzs1z5rcyg60f5d9jkxmdxwbhrdgbmib5h1nlz3f7jnrnpj86"; + name = "kde-l10n-es-17.08.1.tar.xz"; + }; + }; + kde-l10n-et = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-et-17.08.1.tar.xz"; + sha256 = "0ifcsc6ic76gnbni0qm4yfcbhz4b3kww3rqly34hlrpzlwf52x5w"; + name = "kde-l10n-et-17.08.1.tar.xz"; + }; + }; + kde-l10n-eu = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-eu-17.08.1.tar.xz"; + sha256 = "1nxmy2bdlljjf4dqy1fsfx7iawak7nh4h3x5h72im2s49z4y01rl"; + name = "kde-l10n-eu-17.08.1.tar.xz"; + }; + }; + kde-l10n-fa = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fa-17.08.1.tar.xz"; + sha256 = "19x6zacpyc7gax1lrqls2cb9ax747ls6pm8046hcgdy2nb8byqmc"; + name = "kde-l10n-fa-17.08.1.tar.xz"; + }; + }; + kde-l10n-fi = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fi-17.08.1.tar.xz"; + sha256 = "04cdsrjr9hnx1x3w4chjaq82varc24hl65kqiyf13nr3nvgx3xba"; + name = "kde-l10n-fi-17.08.1.tar.xz"; + }; + }; + kde-l10n-fr = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-fr-17.08.1.tar.xz"; + sha256 = "0dqjr15sg42pp3balfvanl7169nsyqyr67pjw02xzbkskh61jihg"; + name = "kde-l10n-fr-17.08.1.tar.xz"; + }; + }; + kde-l10n-ga = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ga-17.08.1.tar.xz"; + sha256 = "0lbpbkip2fgml3jni4hllixpzaya5q5xcn3m674a7hs3y7gr35gs"; + name = "kde-l10n-ga-17.08.1.tar.xz"; + }; + }; + kde-l10n-gl = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-gl-17.08.1.tar.xz"; + sha256 = "1bbg7ya85phzxw3rcc2k04rc4axridcqdrkh719ivp7p46m47j28"; + name = "kde-l10n-gl-17.08.1.tar.xz"; + }; + }; + kde-l10n-he = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-he-17.08.1.tar.xz"; + sha256 = "1h4lzv2i37l2w8af5w2dxan9zancqbqbcvhc5lkngnq2mvlqhwax"; + name = "kde-l10n-he-17.08.1.tar.xz"; + }; + }; + kde-l10n-hi = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hi-17.08.1.tar.xz"; + sha256 = "0zjbchy072gbslmvi894jqa5vlh4brxkqdk5n3b7nh8003f7kvdl"; + name = "kde-l10n-hi-17.08.1.tar.xz"; + }; + }; + kde-l10n-hr = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hr-17.08.1.tar.xz"; + sha256 = "1k4zzn0cwqp6syr82nij26pnhhjiq39pd03lj1m7r83ylmywivxv"; + name = "kde-l10n-hr-17.08.1.tar.xz"; + }; + }; + kde-l10n-hu = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-hu-17.08.1.tar.xz"; + sha256 = "1jj20ggv96lsfl1vc7gsv3vxwb3swj2bd1v8hyaycc86bw51qfcs"; + name = "kde-l10n-hu-17.08.1.tar.xz"; + }; + }; + kde-l10n-ia = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ia-17.08.1.tar.xz"; + sha256 = "0b0mp1jdbbarqd3ajc0fmjpq01y3yw37dd0ihs0r9l2v6s1ivrx2"; + name = "kde-l10n-ia-17.08.1.tar.xz"; + }; + }; + kde-l10n-id = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-id-17.08.1.tar.xz"; + sha256 = "1hdw5cgwmsp6d36jg9a7gnhiywzavrjs644w5gcw8ab2w5kzi725"; + name = "kde-l10n-id-17.08.1.tar.xz"; + }; + }; + kde-l10n-is = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-is-17.08.1.tar.xz"; + sha256 = "0p9q8p3rffc79p25frgzk3jykwga3cxcc4icx29672bcy5ri6d3a"; + name = "kde-l10n-is-17.08.1.tar.xz"; + }; + }; + kde-l10n-it = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-it-17.08.1.tar.xz"; + sha256 = "1af31vfg6q30rgqfcpmjyk32rlz661azi9r205bbv45nagw5aiyz"; + name = "kde-l10n-it-17.08.1.tar.xz"; + }; + }; + kde-l10n-ja = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ja-17.08.1.tar.xz"; + sha256 = "1273rm1m3ap8psf8qrvvdw7yh4bn0d90mgi02dk7vqx30j8vk2sx"; + name = "kde-l10n-ja-17.08.1.tar.xz"; + }; + }; + kde-l10n-kk = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-kk-17.08.1.tar.xz"; + sha256 = "15wkhp673bfs23rxw8wa2q3z0gqm1wblaca0azhmy4fyhgwqaciz"; + name = "kde-l10n-kk-17.08.1.tar.xz"; + }; + }; + kde-l10n-km = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-km-17.08.1.tar.xz"; + sha256 = "1c6bvy3fifdm1azqzdxbwb71pzlp90wn6k981c1ny2cpcmiwd4ps"; + name = "kde-l10n-km-17.08.1.tar.xz"; + }; + }; + kde-l10n-ko = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ko-17.08.1.tar.xz"; + sha256 = "0wxnjjdlngpva34izxq7syga4gyfj2jyf1npayzq3ii0hzjarmrq"; + name = "kde-l10n-ko-17.08.1.tar.xz"; + }; + }; + kde-l10n-lt = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lt-17.08.1.tar.xz"; + sha256 = "02571m0mnhryy3zggy2bzc2k3q2dqc8kwn49332jsvbmsbkznk6a"; + name = "kde-l10n-lt-17.08.1.tar.xz"; + }; + }; + kde-l10n-lv = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-lv-17.08.1.tar.xz"; + sha256 = "17xhsgqb56al5zyvhllqfnm118fimnchd037649nnkddfpl95wwi"; + name = "kde-l10n-lv-17.08.1.tar.xz"; + }; + }; + kde-l10n-mr = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-mr-17.08.1.tar.xz"; + sha256 = "0p8ynpc1ryksb97zl50i23rknsr70p124wpxmr6i1i7aq8jagcqc"; + name = "kde-l10n-mr-17.08.1.tar.xz"; + }; + }; + kde-l10n-nb = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nb-17.08.1.tar.xz"; + sha256 = "1ikh6fpj5lw4bfpmh8ln1v3mvmd9k55jz3v67ncrfyflljvwv6v7"; + name = "kde-l10n-nb-17.08.1.tar.xz"; + }; + }; + kde-l10n-nds = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nds-17.08.1.tar.xz"; + sha256 = "0g7da58vazj1ckw336hgp7zlp6ra31xdjp0zx6hmwcxjv9as9scy"; + name = "kde-l10n-nds-17.08.1.tar.xz"; + }; + }; + kde-l10n-nl = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nl-17.08.1.tar.xz"; + sha256 = "0d059nb4qifpm4bx0akmxn0x9bx6cs5218yh9prqn9wpzaa96vf5"; + name = "kde-l10n-nl-17.08.1.tar.xz"; + }; + }; + kde-l10n-nn = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-nn-17.08.1.tar.xz"; + sha256 = "034570iymirny6di77gxck3j0b1n11v07kj7k80h03smq2gkb6rh"; + name = "kde-l10n-nn-17.08.1.tar.xz"; + }; + }; + kde-l10n-pa = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pa-17.08.1.tar.xz"; + sha256 = "10872cgamrm39xk5kr4qd5ddzpfpgra1rysj7raw9hr5fw0h5jqx"; + name = "kde-l10n-pa-17.08.1.tar.xz"; + }; + }; + kde-l10n-pl = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pl-17.08.1.tar.xz"; + sha256 = "0bvp9mcny4zbcq1pi2d33s0fkdpblg1qrizi3v3jhzmxx1i7hr3w"; + name = "kde-l10n-pl-17.08.1.tar.xz"; + }; + }; + kde-l10n-pt = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt-17.08.1.tar.xz"; + sha256 = "0m61a31iqzwk8wj40rjnx9i662mk3n9q21vh22p7ak9kf9r9kfhv"; + name = "kde-l10n-pt-17.08.1.tar.xz"; + }; + }; + kde-l10n-pt_BR = { + version = "pt_BR-17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-pt_BR-17.08.1.tar.xz"; + sha256 = "1kh7rrpx5idnkpd8j89gxkm33kjz808mvb0d6i39lsv8nqk8ifq8"; + name = "kde-l10n-pt_BR-17.08.1.tar.xz"; + }; + }; + kde-l10n-ro = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ro-17.08.1.tar.xz"; + sha256 = "04b9bjz9nprhiki00b4yffd27dk1vjz6ddjw6bh6bxrzmzg2cgbc"; + name = "kde-l10n-ro-17.08.1.tar.xz"; + }; + }; + kde-l10n-ru = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ru-17.08.1.tar.xz"; + sha256 = "04zx9xf1ca2pl75rbkcr7fa6sy3kmzdgc626wygqg0s4bi3rlsh2"; + name = "kde-l10n-ru-17.08.1.tar.xz"; + }; + }; + kde-l10n-sk = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sk-17.08.1.tar.xz"; + sha256 = "0q4ykign8mifwfwv56p3ac7bn3ywc9anj43f8n08c7bma4idxv01"; + name = "kde-l10n-sk-17.08.1.tar.xz"; + }; + }; + kde-l10n-sl = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sl-17.08.1.tar.xz"; + sha256 = "13mb62fjlpbhyv485rp1f5xgdfqdkq3vm2qq82rbw4jdw140ck08"; + name = "kde-l10n-sl-17.08.1.tar.xz"; + }; + }; + kde-l10n-sr = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sr-17.08.1.tar.xz"; + sha256 = "0xc6pgbm3rqn5g824pzfv0cxas6anb3glm11zhk9qhj24ig1zd5c"; + name = "kde-l10n-sr-17.08.1.tar.xz"; + }; + }; + kde-l10n-sv = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-sv-17.08.1.tar.xz"; + sha256 = "0p067wi30d7vgxsv345vv0f01qbchnffamv4pjv8sfscbcmih9c6"; + name = "kde-l10n-sv-17.08.1.tar.xz"; + }; + }; + kde-l10n-tr = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-tr-17.08.1.tar.xz"; + sha256 = "15x2r21810mndzzqx5cz1z6a6g7czmp2wiw8hw89g6nigq3qvacx"; + name = "kde-l10n-tr-17.08.1.tar.xz"; + }; + }; + kde-l10n-ug = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-ug-17.08.1.tar.xz"; + sha256 = "1bpd63jv8dlikg3589in5h11ydkpwp5mq69vlam9z68bmbl5sy5w"; + name = "kde-l10n-ug-17.08.1.tar.xz"; + }; + }; + kde-l10n-uk = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-uk-17.08.1.tar.xz"; + sha256 = "1yaynm508g03gn896q3zrw8y5rn4l7m8a2x2skwyjzfxy8pk4az9"; + name = "kde-l10n-uk-17.08.1.tar.xz"; + }; + }; + kde-l10n-wa = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-wa-17.08.1.tar.xz"; + sha256 = "0247pwdizs31jhrjx6kfydgkr2ghqnqsdza10a7mggz825mgg2hv"; + name = "kde-l10n-wa-17.08.1.tar.xz"; + }; + }; + kde-l10n-zh_CN = { + version = "zh_CN-17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_CN-17.08.1.tar.xz"; + sha256 = "0a58ikf8pkxhqr25cy04s5hwhdkp81y3304wa6xcni2k5vlzca9f"; + name = "kde-l10n-zh_CN-17.08.1.tar.xz"; + }; + }; + kde-l10n-zh_TW = { + version = "zh_TW-17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-l10n/kde-l10n-zh_TW-17.08.1.tar.xz"; + sha256 = "02lkg354vq3sqvy4iib51yynjb5yx0hsqh1alik97wajawv4fkrc"; + name = "kde-l10n-zh_TW-17.08.1.tar.xz"; }; }; kdelibs = { - version = "4.14.35"; + version = "4.14.36"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdelibs-4.14.35.tar.xz"; - sha256 = "00zkbamzqw1jmxc344dlwvprhdd59bblkj2yalxhc7fy11sbsclp"; - name = "kdelibs-4.14.35.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdelibs-4.14.36.tar.xz"; + sha256 = "08x5frbbgib9agn9ixslpx41wki8ky4l1r60xrl2pmywmwld4ag1"; + name = "kdelibs-4.14.36.tar.xz"; }; }; kdenetwork-filesharing = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdenetwork-filesharing-17.08.0.tar.xz"; - sha256 = "0m4z3mf40sp874ml128489isqjihn5a92gpcn1wbx6j9d37g0aah"; - name = "kdenetwork-filesharing-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdenetwork-filesharing-17.08.1.tar.xz"; + sha256 = "1m79c4ww25gcx4aiwjwp81r18i8s2x6afpp76xi2am6v4sd8rjb3"; + name = "kdenetwork-filesharing-17.08.1.tar.xz"; }; }; kdenlive = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdenlive-17.08.0.tar.xz"; - sha256 = "0dnapnr7fdqf0ng99q7wvzyipvkpzb75xm379jynwv15x5isc7di"; - name = "kdenlive-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdenlive-17.08.1.tar.xz"; + sha256 = "0cj618pjkack3wj66nbq4src460la5qryylblswg2nzm0svqawqh"; + name = "kdenlive-17.08.1.tar.xz"; }; }; kdepim-addons = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdepim-addons-17.08.0.tar.xz"; - sha256 = "0ksa8k1hssclq4q6q14gc9jjg7k8iy6fq2wsxv6i3yjvbslkiyzd"; - name = "kdepim-addons-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdepim-addons-17.08.1.tar.xz"; + sha256 = "105b8pf9g44b5fz8vy404jiysz7sccvllz0bvhi9ihv7a3g4gihg"; + name = "kdepim-addons-17.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdepim-apps-libs-17.08.0.tar.xz"; - sha256 = "0zlg5d4arf0qqdys5p30965868hwb24cj39h2xfbb4jqi7gh3nvv"; - name = "kdepim-apps-libs-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdepim-apps-libs-17.08.1.tar.xz"; + sha256 = "000gmblsgyzgml6h4v3ccr2n0n7s359rb91higiyrzkxi1cq0bh8"; + name = "kdepim-apps-libs-17.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdepim-runtime-17.08.0.tar.xz"; - sha256 = "0mdw7m16pl3z32ri0hng08apg045f0dhr3q68alq6cs743b74dy3"; - name = "kdepim-runtime-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdepim-runtime-17.08.1.tar.xz"; + sha256 = "0q19j5dr0lml9v88ma32vqypi3jzg2dkjzv9adl48k9d2yrywq5n"; + name = "kdepim-runtime-17.08.1.tar.xz"; + }; + }; + kde-runtime = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/kde-runtime-17.08.1.tar.xz"; + sha256 = "0gl24dpkxbkjq7kqj2i022w82daihxnyi2ccld0ql9680w73s3zg"; + name = "kde-runtime-17.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdesdk-kioslaves-17.08.0.tar.xz"; - sha256 = "0jpbv0rjc5pw1ym74khdkg0jm5qhszamb5ahj0l7da9bphshdj3v"; - name = "kdesdk-kioslaves-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdesdk-kioslaves-17.08.1.tar.xz"; + sha256 = "10nz2ai5iahva93psw1dd86npwcp5xlx80n12biwqfgwj5d380k8"; + name = "kdesdk-kioslaves-17.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdesdk-thumbnailers-17.08.0.tar.xz"; - sha256 = "09hh2m6mbblsj7a9wy9xpsl9irdw4agadwgrgpzi75ixdfwl998y"; - name = "kdesdk-thumbnailers-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdesdk-thumbnailers-17.08.1.tar.xz"; + sha256 = "11d7vch9fc5w42wlq8bz3wpb68sjslvvqpqs67d155w682z1q4q1"; + name = "kdesdk-thumbnailers-17.08.1.tar.xz"; }; }; kdf = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdf-17.08.0.tar.xz"; - sha256 = "1qqr4a65p9bxkmv6rnyy0qlg21nqi59zxaxg6p2qb35vy19n1izd"; - name = "kdf-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdf-17.08.1.tar.xz"; + sha256 = "09sjv6z5565mvgnicwaykisgrh859m7h8wfggmqs3rgldsi3iy0p"; + name = "kdf-17.08.1.tar.xz"; }; }; kdialog = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdialog-17.08.0.tar.xz"; - sha256 = "166q8nhxcnw4g727nq89vva7sidrg6jxi6v54rhdnlgqdvf1y5kb"; - name = "kdialog-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdialog-17.08.1.tar.xz"; + sha256 = "1j5ahq4xksl0jrxcisai0mnk6vr126qbabd9hnwq491f419l3zh1"; + name = "kdialog-17.08.1.tar.xz"; }; }; kdiamond = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kdiamond-17.08.0.tar.xz"; - sha256 = "0hz34w1anpihcb0wdx2kyp7ypi7ama48vjhax2520h5gaxfpy8lj"; - name = "kdiamond-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kdiamond-17.08.1.tar.xz"; + sha256 = "07is91glcffrznsg72drmyqmz3lyki62g6ijc14x5i7k8v26nlhi"; + name = "kdiamond-17.08.1.tar.xz"; }; }; keditbookmarks = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/keditbookmarks-17.08.0.tar.xz"; - sha256 = "0l26chf97ak4vqil8v5ya62376j7hh0xgabbav5ay8i1d0sk6p6z"; - name = "keditbookmarks-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/keditbookmarks-17.08.1.tar.xz"; + sha256 = "1k18if8ssjwj8mgp2jgxxwa8hh6x5w402i8fb2nsc7b4khw02y9q"; + name = "keditbookmarks-17.08.1.tar.xz"; }; }; kfilereplace = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kfilereplace-17.08.0.tar.xz"; - sha256 = "1a1hfjzv9vgfyf1n1ihr5rqzc5javpn4y7h70babl37s54i9k3xj"; - name = "kfilereplace-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kfilereplace-17.08.1.tar.xz"; + sha256 = "1ra01im1yp5k73m2hyz72d73qhwv3by1zyipn4l1m2m4r62kwjcr"; + name = "kfilereplace-17.08.1.tar.xz"; }; }; kfind = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kfind-17.08.0.tar.xz"; - sha256 = "1ryl0xwpyww8sipignr8j3dfq79cf1apm47vc4r8dk1704qzm4v9"; - name = "kfind-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kfind-17.08.1.tar.xz"; + sha256 = "114l6b081ddxx51ndkqjl9jnvy00nyydn245y1kskfbzk2yry1jb"; + name = "kfind-17.08.1.tar.xz"; }; }; kfloppy = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kfloppy-17.08.0.tar.xz"; - sha256 = "1gyrgii897r4habi9kmls258pv40zs6hrgyfhcyqibl3vk4ndgfb"; - name = "kfloppy-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kfloppy-17.08.1.tar.xz"; + sha256 = "1afnlbk42g6sm7y7xkqnxr24mz2s95qkaap2s3zqc469gj1vlnxa"; + name = "kfloppy-17.08.1.tar.xz"; }; }; kfourinline = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kfourinline-17.08.0.tar.xz"; - sha256 = "02zbriz434n9xk5rrb3y0y76hrizbf0mq3pl679fa89jcqaml1fj"; - name = "kfourinline-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kfourinline-17.08.1.tar.xz"; + sha256 = "12cy3sarcy361wivlbpx2cxc2yaffr2xfy4dwz3iz6vzx49mhyky"; + name = "kfourinline-17.08.1.tar.xz"; }; }; kgeography = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kgeography-17.08.0.tar.xz"; - sha256 = "03xwpdngikjiml4kxbp0n893xzvb21h6cyj4xp09j19db9gj0jd7"; - name = "kgeography-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kgeography-17.08.1.tar.xz"; + sha256 = "1mjfacc850pqsgylwfcvp7yv0c4f1qgk0y7pgwrx2nspf8i1wwhc"; + name = "kgeography-17.08.1.tar.xz"; }; }; kget = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kget-17.08.0.tar.xz"; - sha256 = "1h1svqyj2d8qpw65zidzk90smh0d4dbxzzsi8ar0hvgr8d0lq157"; - name = "kget-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kget-17.08.1.tar.xz"; + sha256 = "182l5hd5hfbpl88p9yzc54n8m0mi2fffp19sjdhhadmyx142inc1"; + name = "kget-17.08.1.tar.xz"; }; }; kgoldrunner = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kgoldrunner-17.08.0.tar.xz"; - sha256 = "0iw7f8760fgy08g9pncnvfv8ynj673glfb8bf6hmwylpa3nddz54"; - name = "kgoldrunner-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kgoldrunner-17.08.1.tar.xz"; + sha256 = "0rzhg7hk07yaghflskiz4wh5d3jdfvhzig3zyyhimwir90lj1gxx"; + name = "kgoldrunner-17.08.1.tar.xz"; }; }; kgpg = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kgpg-17.08.0.tar.xz"; - sha256 = "1kbndyswhx5l5s566gg22n8yqk372gpk53iiksizr6mrjx3wjvf8"; - name = "kgpg-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kgpg-17.08.1.tar.xz"; + sha256 = "1hcg9zv4f2bj1210fahxap1fnyk7zdj3gfpfpdrww6qga5z4dzcy"; + name = "kgpg-17.08.1.tar.xz"; }; }; khangman = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/khangman-17.08.0.tar.xz"; - sha256 = "1wvz8p05lsmip65wcwsxzii6sgk48vqw8plghafd7x2dlbzwv3bi"; - name = "khangman-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/khangman-17.08.1.tar.xz"; + sha256 = "17xk64lclbw2gcpnfpzi9sqryr8wl8g1v19gqrplvq4zw7qfanr5"; + name = "khangman-17.08.1.tar.xz"; }; }; khelpcenter = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/khelpcenter-17.08.0.tar.xz"; - sha256 = "00i9nq837z6khvz06bvfndv37vhpl72dg0mx9s8wnifni5nixshm"; - name = "khelpcenter-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/khelpcenter-17.08.1.tar.xz"; + sha256 = "1js7sk1hdp3k7d4gjk8rzq5rw1al8bh0ap5irw5551kvbagm5dp4"; + name = "khelpcenter-17.08.1.tar.xz"; }; }; kholidays = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kholidays-17.08.0.tar.xz"; - sha256 = "1dyy03dcm6j0wrn71pxmdfhxph7hgvdnkcsrl0q6g2br01yjy7fl"; - name = "kholidays-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kholidays-17.08.1.tar.xz"; + sha256 = "0gsvidakx0q0wqy2bgwq339hwghdcl882nvzj445hnmy10r2d6jk"; + name = "kholidays-17.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kidentitymanagement-17.08.0.tar.xz"; - sha256 = "0xwnydrsw4g8ym415qi93hkhmghspwrdyzl5kw6vhl8xwm67h7i5"; - name = "kidentitymanagement-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kidentitymanagement-17.08.1.tar.xz"; + sha256 = "1ippkav5nvfckp4145gcwa2hdl7zjw8bcaq6af5kcxqmvlcndvwv"; + name = "kidentitymanagement-17.08.1.tar.xz"; }; }; kig = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kig-17.08.0.tar.xz"; - sha256 = "1f7w40glwbpqv33alpssg8vapx7sw6q3wbdw22r3ivlrqfy3lfmb"; - name = "kig-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kig-17.08.1.tar.xz"; + sha256 = "0gzfdpi4qlmwg6hkx1slvnxlynsfgwv18a9law05hg35hs6zxzfk"; + name = "kig-17.08.1.tar.xz"; }; }; kigo = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kigo-17.08.0.tar.xz"; - sha256 = "04d4dg9w57cl6hfhwxc7l6hfas19q02l4wszvqbnagci333nqbsm"; - name = "kigo-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kigo-17.08.1.tar.xz"; + sha256 = "0c498rzvmfkl0q5hnhddlx38qwyzsz4lh05cy5v4zpq8idvnxzj5"; + name = "kigo-17.08.1.tar.xz"; }; }; killbots = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/killbots-17.08.0.tar.xz"; - sha256 = "1h5z310nvkn8dsamzifr4njwasyv9w32dy1i0qwkc6x8672n4xhi"; - name = "killbots-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/killbots-17.08.1.tar.xz"; + sha256 = "0yay6pr83rh5slklmxvw3jr2bky7k5cgf55a8r6al5b4vsx2802r"; + name = "killbots-17.08.1.tar.xz"; }; }; kimagemapeditor = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kimagemapeditor-17.08.0.tar.xz"; - sha256 = "0klal67dzrr8l9x3xw4z54llwgf2r19xc2jfi4a8qmn3kqm2inmm"; - name = "kimagemapeditor-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kimagemapeditor-17.08.1.tar.xz"; + sha256 = "158vrszvz2acnbzvmjprg1j2knarffvg8awwjcfg3zn2i6arwwsg"; + name = "kimagemapeditor-17.08.1.tar.xz"; }; }; kimap = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kimap-17.08.0.tar.xz"; - sha256 = "0s2sfdlzaz6bj5rz077hnli500ddx53j6lvka1pyz7pc2qfj5lpp"; - name = "kimap-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kimap-17.08.1.tar.xz"; + sha256 = "1vch7y153jg010mcz7qjxjp6f3gfxrczbfh3bvx8q70cqfmx7ssm"; + name = "kimap-17.08.1.tar.xz"; }; }; kio-extras = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kio-extras-17.08.0.tar.xz"; - sha256 = "0yfg3jjzblrpsi0mc08sfg5lyzr4q4bqg23vha1b4wk323kx758f"; - name = "kio-extras-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kio-extras-17.08.1.tar.xz"; + sha256 = "1hk09yavrr1dqvxjsdg9rmn6j8jzczhnfyn71hyfbglshvlhwm8m"; + name = "kio-extras-17.08.1.tar.xz"; }; }; kiriki = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kiriki-17.08.0.tar.xz"; - sha256 = "10f7qydq97l65wrcxfvjvd0amal5achp6zdl33k04sx3dv62wb63"; - name = "kiriki-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kiriki-17.08.1.tar.xz"; + sha256 = "0cxmxxwn6ps00kf64z61r3k7iyr5falrbzmf6gz19m535b79drhi"; + name = "kiriki-17.08.1.tar.xz"; }; }; kiten = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kiten-17.08.0.tar.xz"; - sha256 = "1j1qqz1vxgc8746qn9ss8p2qy8c099pfwscfsmd6fj3p04hm0xp7"; - name = "kiten-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kiten-17.08.1.tar.xz"; + sha256 = "1yp2r5linfkknvn5dx4vf2f6vxg3kzrpiqsrg34q957wvfsc91qm"; + name = "kiten-17.08.1.tar.xz"; }; }; kjumpingcube = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kjumpingcube-17.08.0.tar.xz"; - sha256 = "1a3lyyx7gx3brwyz3dzzf193088v510vjjr6vvlp7p1af0y5rxjp"; - name = "kjumpingcube-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kjumpingcube-17.08.1.tar.xz"; + sha256 = "161px7wad80a3p6hr27dj0990jb7j143q77q7ca308qysmffghnz"; + name = "kjumpingcube-17.08.1.tar.xz"; }; }; kldap = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kldap-17.08.0.tar.xz"; - sha256 = "1dn37m64sqp816c2mnjcd7vb58bl9zy3zpmf4zghyhnln4hljnjq"; - name = "kldap-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kldap-17.08.1.tar.xz"; + sha256 = "11j0ai0y022xxgiw7ac5cgv8vqb3qa1dbh7n9jqz9lg8rhjch2ix"; + name = "kldap-17.08.1.tar.xz"; }; }; kleopatra = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kleopatra-17.08.0.tar.xz"; - sha256 = "0bx4bs2ssjhasbfhvjkhwf4p22wiyfrdkkazp79vs2i1z2anjsqm"; - name = "kleopatra-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kleopatra-17.08.1.tar.xz"; + sha256 = "1z32xwlsslhzqzsq8ngdws1ry56myvx8j56b973scbhd29z15www"; + name = "kleopatra-17.08.1.tar.xz"; }; }; klettres = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/klettres-17.08.0.tar.xz"; - sha256 = "12vsp99x2j7xndgm31lhjxcvzp9v4plxmzjr9yn7l72ayvgf5s61"; - name = "klettres-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/klettres-17.08.1.tar.xz"; + sha256 = "0s7n83smr4mrrs91bpyr3hk2s1sl3ix73scnllb6spb6gx5hhr13"; + name = "klettres-17.08.1.tar.xz"; }; }; klickety = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/klickety-17.08.0.tar.xz"; - sha256 = "1nsf7yiqp1i0hzh053qr6b3pb6p25nr6w0z5kv6jnjpcvis1w3dj"; - name = "klickety-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/klickety-17.08.1.tar.xz"; + sha256 = "0zp836x7ssgk7y5fcni7ya9cfdc28ywgvlzc01f7bi7pwh57q50x"; + name = "klickety-17.08.1.tar.xz"; }; }; klines = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/klines-17.08.0.tar.xz"; - sha256 = "1w9hyxy4fdf9cj7c97lx8553phdp2gcx3z0c2y6gb3ic6nign4x7"; - name = "klines-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/klines-17.08.1.tar.xz"; + sha256 = "069igz40zrwbnyvw53d59rksn2n3dxycysb9fakb165qr27kb42h"; + name = "klines-17.08.1.tar.xz"; }; }; klinkstatus = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/klinkstatus-17.08.0.tar.xz"; - sha256 = "07zzi44x2s3sfnp373san27dbbcpcph2l6l7z5b31vmqbcr2fia1"; - name = "klinkstatus-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/klinkstatus-17.08.1.tar.xz"; + sha256 = "11fakg10rlf4finznc2i5h1lbh1qq37wvzd93yc8vdwax98pps44"; + name = "klinkstatus-17.08.1.tar.xz"; }; }; kmag = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmag-17.08.0.tar.xz"; - sha256 = "0fr4p707qhwnqz7nb52rh0xzrxwj5vxq64zpxcdxplapbhqczqkv"; - name = "kmag-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmag-17.08.1.tar.xz"; + sha256 = "1y69rsdl9pz11xrbfg8p0ihm1691y3blb5jay0v228prbwsy2gn3"; + name = "kmag-17.08.1.tar.xz"; }; }; kmahjongg = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmahjongg-17.08.0.tar.xz"; - sha256 = "0z6k2nc11h1y8qby9knwwzppnbsl6rw0x52a571ikidakm5jg2j8"; - name = "kmahjongg-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmahjongg-17.08.1.tar.xz"; + sha256 = "17f57shs79pbwdaqblb4i9ibs3b4psy38ys69i8k5j04v7mam48s"; + name = "kmahjongg-17.08.1.tar.xz"; }; }; kmail = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmail-17.08.0.tar.xz"; - sha256 = "1vdypb5a9fswnw4z6bj1mjmcp1kdrb0sc9yxigrj572w4hg31hjp"; - name = "kmail-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmail-17.08.1.tar.xz"; + sha256 = "1c3yds59nssnqi0pxb6fjajq6yaj6ki7l83gj59wlmpsyc1nm15d"; + name = "kmail-17.08.1.tar.xz"; }; }; kmail-account-wizard = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmail-account-wizard-17.08.0.tar.xz"; - sha256 = "06f0fa727fxzjbxch18lhnch9krcly0crk7waciajg4jnmg1v77b"; - name = "kmail-account-wizard-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmail-account-wizard-17.08.1.tar.xz"; + sha256 = "1vipb6330p67g4qpx2g1ps0fxnqb8w1agfwxnv61k3fccxpr4gkw"; + name = "kmail-account-wizard-17.08.1.tar.xz"; }; }; kmailtransport = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmailtransport-17.08.0.tar.xz"; - sha256 = "1liqqrk5xpzaim8kj87acavry33m5pidx7ajmbmk2hb01dhiq20z"; - name = "kmailtransport-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmailtransport-17.08.1.tar.xz"; + sha256 = "1r8xbccijiw5v92qq18rccvsdn87m8mwc6g53k8gxpjx37vxrba8"; + name = "kmailtransport-17.08.1.tar.xz"; }; }; kmbox = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmbox-17.08.0.tar.xz"; - sha256 = "1cg9cl6a4z09adyyim7yahlg95slsw4zw4r9lqhqznmjr5nyf9bq"; - name = "kmbox-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmbox-17.08.1.tar.xz"; + sha256 = "0bgjj69by4c11z7j7v7inx4gzcsn6106r28n1ds6lc1k0vv8zw2d"; + name = "kmbox-17.08.1.tar.xz"; }; }; kmime = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmime-17.08.0.tar.xz"; - sha256 = "1k4xicq14i35f2x3xkkhqrs2darql5rw2i2j3zd73gkmd37gdrai"; - name = "kmime-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmime-17.08.1.tar.xz"; + sha256 = "178bx5pasrrlqwzjz85ba06gs9r40prwk7z4v6ar6fr9q4pa088c"; + name = "kmime-17.08.1.tar.xz"; }; }; kmines = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmines-17.08.0.tar.xz"; - sha256 = "1wci2wrkj96ywwvvdpbjf4270qq8x7gdbppy9la860x5nvp34xvx"; - name = "kmines-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmines-17.08.1.tar.xz"; + sha256 = "1al98mzy8jrp17vq4j7np1bl5j9sd79drh78zd0343mrcqa7js28"; + name = "kmines-17.08.1.tar.xz"; }; }; kmix = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmix-17.08.0.tar.xz"; - sha256 = "1s3hmg2wdav2mn9ddcp2lp147xz1k5y52jql0q2w65i5dzcpav3a"; - name = "kmix-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmix-17.08.1.tar.xz"; + sha256 = "1w783p49zgsj52cy3mv4zgvh8f55mdij2drzgk3qr510wsyf0cg5"; + name = "kmix-17.08.1.tar.xz"; }; }; kmousetool = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmousetool-17.08.0.tar.xz"; - sha256 = "0287rgx7rgwa95zfhwl6754ia58scq86qd18max8yg6l5mwjny8v"; - name = "kmousetool-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmousetool-17.08.1.tar.xz"; + sha256 = "09rjvnp7f16d6cg3d5p1ah184j7710mziiiz5r0zxq7vdnkvxzlh"; + name = "kmousetool-17.08.1.tar.xz"; }; }; kmouth = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmouth-17.08.0.tar.xz"; - sha256 = "1gfh2akqxq4w9k8y4xpmafrn9q17c5xyc3f7vgl9r0h9jfrnndx8"; - name = "kmouth-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmouth-17.08.1.tar.xz"; + sha256 = "07s3fqybprw7gprksc271pspnh81yawm5prrz0lif2awvc7wp7pm"; + name = "kmouth-17.08.1.tar.xz"; }; }; kmplot = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kmplot-17.08.0.tar.xz"; - sha256 = "1bvx0298n3aa39qsnlzxv431w2ayhkinin1sj1indpjzs3qia8li"; - name = "kmplot-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kmplot-17.08.1.tar.xz"; + sha256 = "1gxhfkjdsrf8klqhqji6yzv9g4sdjcjhmyvx5j71wmrdc6pdpkpf"; + name = "kmplot-17.08.1.tar.xz"; }; }; knavalbattle = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/knavalbattle-17.08.0.tar.xz"; - sha256 = "1v52g5jr201cyvjdhd70vsjrxa75j95d8ssy5pqfvzdb0251pxdi"; - name = "knavalbattle-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/knavalbattle-17.08.1.tar.xz"; + sha256 = "187n5kn5ri87a98rybsf4g5jcwvyxdnb4601iaaf4jb6rg3yf2pm"; + name = "knavalbattle-17.08.1.tar.xz"; }; }; knetwalk = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/knetwalk-17.08.0.tar.xz"; - sha256 = "0aiasbf6ww9ccqsamvn2kljyjh4bzxccp5clysglhmliv1g6qx44"; - name = "knetwalk-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/knetwalk-17.08.1.tar.xz"; + sha256 = "10kjsw94yzz82af3adk9shm67kbg8f8p0xmh60jr97cm1lvz5186"; + name = "knetwalk-17.08.1.tar.xz"; }; }; knotes = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/knotes-17.08.0.tar.xz"; - sha256 = "07cbhgxsf1qdayzxvwv6ihlz1jfq3nn0csf1qscx7qj1a2jypcv6"; - name = "knotes-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/knotes-17.08.1.tar.xz"; + sha256 = "0654fxaiyvhfxjyfaw9hgvv352xkix2ls7wlvyw5b15d9iqa5cl0"; + name = "knotes-17.08.1.tar.xz"; }; }; kolf = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kolf-17.08.0.tar.xz"; - sha256 = "1y2dk5rfssnnl93wilmz3bkvk6jllyq3isy4aj6dp8v1qrisna0m"; - name = "kolf-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kolf-17.08.1.tar.xz"; + sha256 = "0cmqpyd157b3n3x18d6wiijyvjaavxp65nagw2r0prjz9dckd1cl"; + name = "kolf-17.08.1.tar.xz"; }; }; kollision = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kollision-17.08.0.tar.xz"; - sha256 = "1fqlxj4792g4k10pzfk53svvfp8kkaz126z7509qrwjngq8y4bji"; - name = "kollision-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kollision-17.08.1.tar.xz"; + sha256 = "00chxdib0ym5x94pzgfg3zx2lixf9h5b7sfcbg0chvjlc8imfv2b"; + name = "kollision-17.08.1.tar.xz"; }; }; kolourpaint = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kolourpaint-17.08.0.tar.xz"; - sha256 = "15xm9hf9b2bq4s66pbiqpjhshjfx7xf3gvk3cfc01xibly442xc9"; - name = "kolourpaint-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kolourpaint-17.08.1.tar.xz"; + sha256 = "18cf856r66gwdf149zyam53p0sqvm0bf5f0k0n62mkp80z76kbvm"; + name = "kolourpaint-17.08.1.tar.xz"; }; }; kompare = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kompare-17.08.0.tar.xz"; - sha256 = "1rh71a152vnlhx7f5046ndlk4gb15p4jy7sqfrmnx1ssmi2vhs8g"; - name = "kompare-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kompare-17.08.1.tar.xz"; + sha256 = "1whsbz99cdnivq6m7irvnj0vcq82s34z9mgzd4a50z3i7ms5hmvf"; + name = "kompare-17.08.1.tar.xz"; }; }; konqueror = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/konqueror-17.08.0.tar.xz"; - sha256 = "1ir47i0g48rabjh86xy426imw682wr6kff9cwvbf7lgl6gqkpafw"; - name = "konqueror-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/konqueror-17.08.1.tar.xz"; + sha256 = "1plq38ap1gdjq1s02s3km3pg8l2cgx0mkicb5jldz02qxj4z8rgy"; + name = "konqueror-17.08.1.tar.xz"; }; }; konquest = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/konquest-17.08.0.tar.xz"; - sha256 = "1b6bw8ga4wjaa7zw344y8cb3hiylpcq5m3mj96hasri6jyd1lwp8"; - name = "konquest-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/konquest-17.08.1.tar.xz"; + sha256 = "01ps82zkd95w06im3x7cazwbn2m4xbr80ky16gd71v3sdgg5zpw7"; + name = "konquest-17.08.1.tar.xz"; }; }; konsole = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/konsole-17.08.0.tar.xz"; - sha256 = "0il0hffq62plq7jdbq2a1y1djdb406639h2zz6jsmn6fbbrwxwh4"; - name = "konsole-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/konsole-17.08.1.tar.xz"; + sha256 = "00rrwk6i0ngg07md84bkfggdmmfknkpxiqbv37pb7xis1rvz9c8p"; + name = "konsole-17.08.1.tar.xz"; }; }; kontact = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kontact-17.08.0.tar.xz"; - sha256 = "0cs8sjq0dlhggly1kjcqsdsjxfg717mgjzg84ac64m2gdkk213sz"; - name = "kontact-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kontact-17.08.1.tar.xz"; + sha256 = "1z0mqnb6567xmx7shv7v60yb2cj6wh3ndqdd9nqxp12371mgm6i0"; + name = "kontact-17.08.1.tar.xz"; }; }; kontactinterface = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kontactinterface-17.08.0.tar.xz"; - sha256 = "01zz7zah35wfpqkmz46jxjljys4ngkh5m94ldirjg95pfrcxlsnc"; - name = "kontactinterface-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kontactinterface-17.08.1.tar.xz"; + sha256 = "09mpmdc65lm14s6hg1yq68i1wrawss0hl002bg9apgy2rfdk34k1"; + name = "kontactinterface-17.08.1.tar.xz"; }; }; kopete = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kopete-17.08.0.tar.xz"; - sha256 = "0f26ln78pxdj69rvsxpbzf8554hdwcij3z488pgv8j2h9j6pwgfd"; - name = "kopete-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kopete-17.08.1.tar.xz"; + sha256 = "1inbw80a2mwfc2id12qn0as4l52hz3wfcvzcz3n4p393g0qfz8an"; + name = "kopete-17.08.1.tar.xz"; }; }; korganizer = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/korganizer-17.08.0.tar.xz"; - sha256 = "0mqzbjyxb8625m2m2js8pqj8m9k8q1ali46wj96prfk1y9abnp5i"; - name = "korganizer-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/korganizer-17.08.1.tar.xz"; + sha256 = "0q35fyqxgwp5jv2qnpcjhfs1rkyp1jjrpmi28kqh93l04njmwvc0"; + name = "korganizer-17.08.1.tar.xz"; }; }; kpat = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kpat-17.08.0.tar.xz"; - sha256 = "04phaqbbyys0zz7rqivifz620xmw32pvv2kkax3n37spsdiyaq5j"; - name = "kpat-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kpat-17.08.1.tar.xz"; + sha256 = "1bqqm5gb6mc1v8h524qnz2rfcplvz6v87gvc0jg3zcqjf2c4xn4y"; + name = "kpat-17.08.1.tar.xz"; }; }; kpimtextedit = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kpimtextedit-17.08.0.tar.xz"; - sha256 = "01klpd4cqxq8cd0s32k9m44nly6w7ym41h385hw888xf356xsjpb"; - name = "kpimtextedit-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kpimtextedit-17.08.1.tar.xz"; + sha256 = "16ymcccfn8pw098gr6b2k1xvwinhnx8c3npawy9fiqg138a4bkh9"; + name = "kpimtextedit-17.08.1.tar.xz"; }; }; kppp = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kppp-17.08.0.tar.xz"; - sha256 = "1bzwsjw46vj36fwir0r6l26l1fr3mpj37g87wrg8zb3g9vz6ixnp"; - name = "kppp-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kppp-17.08.1.tar.xz"; + sha256 = "0783rn2gzgxscnfbins0drl8j8ka0lxyg3787v9778d5993fafpf"; + name = "kppp-17.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kqtquickcharts-17.08.0.tar.xz"; - sha256 = "1g487xniyv6yic2wyvd3rxn0rn95anrr4djf10nglvlxzcx3fnrc"; - name = "kqtquickcharts-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kqtquickcharts-17.08.1.tar.xz"; + sha256 = "1zym0lcim41krv1irdfvkfb4simymairqq2cp2kiagrp3ssz28km"; + name = "kqtquickcharts-17.08.1.tar.xz"; }; }; krdc = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/krdc-17.08.0.tar.xz"; - sha256 = "0hsp05nns2ddvg4md6lwywh8c58vxzrb8r4d512mlcvprm8w6qb4"; - name = "krdc-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/krdc-17.08.1.tar.xz"; + sha256 = "1lfh7w05b19bzdfmxydb0s55zgbizsh8j8vjblgsn2vihgm2f8lp"; + name = "krdc-17.08.1.tar.xz"; }; }; kremotecontrol = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kremotecontrol-17.08.0.tar.xz"; - sha256 = "1vxb73zycw1d2spnkhv93ml1b1m8hw1g3lac77l1vq17g873ibg5"; - name = "kremotecontrol-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kremotecontrol-17.08.1.tar.xz"; + sha256 = "1b146xb9dnq97lswb0qnppcgjbw5vwy1y9za2k0kl3bhfvxd4qj2"; + name = "kremotecontrol-17.08.1.tar.xz"; }; }; kreversi = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kreversi-17.08.0.tar.xz"; - sha256 = "1wi6s3rjqbc6269x856ri2a6iirnx1p9pizkqpq8yma7lpzl59ss"; - name = "kreversi-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kreversi-17.08.1.tar.xz"; + sha256 = "17y2iihszjshln2hwxp6nqz30iln79mwmfv8yb2bydchdy05g807"; + name = "kreversi-17.08.1.tar.xz"; }; }; krfb = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/krfb-17.08.0.tar.xz"; - sha256 = "0kyyl4zrrx4naj5nlczmc3fn0gbc7nrb42hm43hf4c0l5djsw4vj"; - name = "krfb-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/krfb-17.08.1.tar.xz"; + sha256 = "1dwyx0jdg0i64pxd7phm1kq7fyaj7jls8w08sfgq3730s4s59lfj"; + name = "krfb-17.08.1.tar.xz"; }; }; kross-interpreters = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kross-interpreters-17.08.0.tar.xz"; - sha256 = "0k7p1c2lpknw0q45ahgld9pcxi5f3nsbl4hima10s6n3jf91d4v9"; - name = "kross-interpreters-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kross-interpreters-17.08.1.tar.xz"; + sha256 = "0hzsn1kjcpy2vbqx9sxhxbz4p67wcmv6agg932iavv2hi7731j14"; + name = "kross-interpreters-17.08.1.tar.xz"; }; }; kruler = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kruler-17.08.0.tar.xz"; - sha256 = "0rfmn3wh1k8xigpk07mcj2xd0jq85jm81ymaka0pjm8ka98njbr6"; - name = "kruler-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kruler-17.08.1.tar.xz"; + sha256 = "1qmlhc35vhbzfllz6wrssr62d3s3xdq15s5rkpm3w05a70bilpyq"; + name = "kruler-17.08.1.tar.xz"; }; }; ksaneplugin = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ksaneplugin-17.08.0.tar.xz"; - sha256 = "1dyifhfyzg7p8j8h45k8m4vkvrq7nbj07810j5r8hqcmbpbjw2m1"; - name = "ksaneplugin-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ksaneplugin-17.08.1.tar.xz"; + sha256 = "08zl04ly9wggcr8y0azz69nvjkr4c8gnajx4w8cwlb1dkn1b5is4"; + name = "ksaneplugin-17.08.1.tar.xz"; }; }; kscd = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kscd-17.08.0.tar.xz"; - sha256 = "0bc6npz4s4fn2vzm3xpm0si06ql9k6a9gx9b1ghxn5y2dy3hjshy"; - name = "kscd-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kscd-17.08.1.tar.xz"; + sha256 = "08mlbhbck68abj17mkaz76fpy4rcn0x4h4smwgxnhy88ddb15wa1"; + name = "kscd-17.08.1.tar.xz"; }; }; kshisen = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kshisen-17.08.0.tar.xz"; - sha256 = "1b3q8fcm6pialqwljm2hwmk1k9fcwa77m55zxyb2wcyvgz9gpkjq"; - name = "kshisen-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kshisen-17.08.1.tar.xz"; + sha256 = "0rg465092qkzbshr0pj6z6d38nykdfz2alhzy50qi9i32r8iwy9m"; + name = "kshisen-17.08.1.tar.xz"; }; }; ksirk = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ksirk-17.08.0.tar.xz"; - sha256 = "1qcbr7lrj1zdbyb7agf2afnc39lvinam48yrzxbv0ry62l965c82"; - name = "ksirk-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ksirk-17.08.1.tar.xz"; + sha256 = "1v4xqjak0nf4vqsf7p7i37x5c08vbxq18nb63bhwjlb2fgnbg0yh"; + name = "ksirk-17.08.1.tar.xz"; }; }; ksnakeduel = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ksnakeduel-17.08.0.tar.xz"; - sha256 = "1vd9cspaxwxbs1lqbla292zwfyjj4giajx2n19m26x857xb6va0k"; - name = "ksnakeduel-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ksnakeduel-17.08.1.tar.xz"; + sha256 = "105rjym6vkzi9m0dmzwwb6491lfmb5y1dfqax9y2gi993x0l5ihl"; + name = "ksnakeduel-17.08.1.tar.xz"; }; }; kspaceduel = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kspaceduel-17.08.0.tar.xz"; - sha256 = "1y6nyyvig6y5s99bym21xyazxly0v7pdqygkwb3rq5152bf4xi78"; - name = "kspaceduel-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kspaceduel-17.08.1.tar.xz"; + sha256 = "11g362hax9x8b99wvcndd4hz6q918dxcn8js16cflfxn1ry80wb6"; + name = "kspaceduel-17.08.1.tar.xz"; }; }; ksquares = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ksquares-17.08.0.tar.xz"; - sha256 = "0fmx2zj5qrqyxg1yf2pbl2a4fq96rm088m7hmiq85ha7i1dd0wbw"; - name = "ksquares-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ksquares-17.08.1.tar.xz"; + sha256 = "1lw9qlfqfsmyry5v6fvhyjh23l8dj71iyp1z3y0xikaybc4rbbi1"; + name = "ksquares-17.08.1.tar.xz"; }; }; kstars = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kstars-17.08.0.tar.xz"; - sha256 = "1k2rln20qw7rm7dxxyd3yrxbmpjhkpbqd0v82xfnqal6i3cx8xdb"; - name = "kstars-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kstars-17.08.1.tar.xz"; + sha256 = "1qr8y4m6lqiv3zb7f2ys7c6iw7iryk9ayibdscq113nq0blm59zs"; + name = "kstars-17.08.1.tar.xz"; }; }; ksudoku = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ksudoku-17.08.0.tar.xz"; - sha256 = "1lysfddiy12fxnwampy3djbkrabfqch4vsvxn6hclpii8a6sx5nr"; - name = "ksudoku-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ksudoku-17.08.1.tar.xz"; + sha256 = "0fb9k5hdyq2alp42x17r1cfi5qz5hm9xzcwd3vz3c1kym4xavnjp"; + name = "ksudoku-17.08.1.tar.xz"; }; }; ksystemlog = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ksystemlog-17.08.0.tar.xz"; - sha256 = "0n4387si8q8183rysmbdbyqs9d5x09qdrkd47g66bxn0w4qbwmkq"; - name = "ksystemlog-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ksystemlog-17.08.1.tar.xz"; + sha256 = "0wiwak8dmdm9kih2zvw2xxg67qs94imp6s24dgfxgylqqpqirlnv"; + name = "ksystemlog-17.08.1.tar.xz"; }; }; kteatime = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kteatime-17.08.0.tar.xz"; - sha256 = "17jxrivkmrwnwrw641slm756lpqk5vg8chadn797b1w3ddr7vwl7"; - name = "kteatime-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kteatime-17.08.1.tar.xz"; + sha256 = "08ripkkc6b3wi499kgsng4fzk2n7kbp3i6212q47h6bmgxs8a4zp"; + name = "kteatime-17.08.1.tar.xz"; }; }; ktimer = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktimer-17.08.0.tar.xz"; - sha256 = "12aj0v1z3y797xs3bxqa3pd4z5k9bhjbpgp1v3kf87arpvrdb9q7"; - name = "ktimer-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktimer-17.08.1.tar.xz"; + sha256 = "116c61k99h5y0yph2x7cz0ff99rsfblgj3db7sczhn3hkbcimakx"; + name = "ktimer-17.08.1.tar.xz"; }; }; ktnef = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktnef-17.08.0.tar.xz"; - sha256 = "1j4yaxmz8kcar2hmsd39l7l757ca16fdzlvhljhjpii4br2lp17s"; - name = "ktnef-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktnef-17.08.1.tar.xz"; + sha256 = "07jflp67mf748vf0ph89dbzy2lifm8148kl957qw1z9i1h5sm869"; + name = "ktnef-17.08.1.tar.xz"; }; }; ktouch = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktouch-17.08.0.tar.xz"; - sha256 = "1g2kxdp0734yqz8044z7z1sgwyf0n7spql1r8vwzr6zisx6gy7pb"; - name = "ktouch-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktouch-17.08.1.tar.xz"; + sha256 = "19m8bp655ir9n2pz6vly9q2x42gdnpfjs47nkfiix28mg4y004qj"; + name = "ktouch-17.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-accounts-kcm-17.08.0.tar.xz"; - sha256 = "11z8g0pcv04lh70qx4gb5226h7wm7g7bm7n14mpw8xbcnlh2sax8"; - name = "ktp-accounts-kcm-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-accounts-kcm-17.08.1.tar.xz"; + sha256 = "1kghza63ywjndcscwlkabfqnsnalf1kprghb47gjj15qn844g019"; + name = "ktp-accounts-kcm-17.08.1.tar.xz"; }; }; ktp-approver = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-approver-17.08.0.tar.xz"; - sha256 = "03v2mz29r3lzwwa5bis8sn8zjjr7vdpq2f39fzkyvb3vjnkb0kh8"; - name = "ktp-approver-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-approver-17.08.1.tar.xz"; + sha256 = "07vkhhldqkabfga79sl9hdbfdk4fdizj066180dirwbdkllfwnpf"; + name = "ktp-approver-17.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-auth-handler-17.08.0.tar.xz"; - sha256 = "1yj8cn4s0p1fdlcd1zn8ai2l1rfhzg2n3qny9s2q1jz1wnbhxj1z"; - name = "ktp-auth-handler-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-auth-handler-17.08.1.tar.xz"; + sha256 = "1612gi5izaanp9rzwz163q776lszrs03a9rrx13qczdl231smyf6"; + name = "ktp-auth-handler-17.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-call-ui-17.08.0.tar.xz"; - sha256 = "1vddjzcq0qy25f8qqwhck2icl9v6arihlg63fdr4bz05cifhmip4"; - name = "ktp-call-ui-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-call-ui-17.08.1.tar.xz"; + sha256 = "0881lgmp04g157q3pp1im113imrw9aihxd08hhm6h5cla5z97m46"; + name = "ktp-call-ui-17.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-common-internals-17.08.0.tar.xz"; - sha256 = "1qw92sh1lhm3zmyj3jr4r1rhcnfbaipfnrr78bsfixdb784is7dk"; - name = "ktp-common-internals-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-common-internals-17.08.1.tar.xz"; + sha256 = "1nlcmlkbaj7j6y1i6gnmd7s6ks4qnmcdhwidxql4vgr6bjifr5n2"; + name = "ktp-common-internals-17.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-contact-list-17.08.0.tar.xz"; - sha256 = "162fzvs8x63091arc7c4njwzz1xn5bgzai0bh57va4fzqhzxs012"; - name = "ktp-contact-list-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-list-17.08.1.tar.xz"; + sha256 = "1xv0qaf05lvzwmgdfr31vynk768sc9gqrl0w1b270ks9jgsb3k9i"; + name = "ktp-contact-list-17.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-contact-runner-17.08.0.tar.xz"; - sha256 = "16j9ljcab4xmsjdbllr36a02s07w3xgpz0i4p0wzpwlfg42kb0nj"; - name = "ktp-contact-runner-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-contact-runner-17.08.1.tar.xz"; + sha256 = "150m1lr7n39n88b0kaz8494ch0ym7i68f8c3hgzaxpy0m62mskkv"; + name = "ktp-contact-runner-17.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-desktop-applets-17.08.0.tar.xz"; - sha256 = "1n0f5a5lfb3zn8h9dvqm4c6gs39pvlnglr7lvcgqmabhvncwdxbp"; - name = "ktp-desktop-applets-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-desktop-applets-17.08.1.tar.xz"; + sha256 = "167h8z1xd6q50xbgirfc6sxlnclliidpb5lg7s1baqdvlpg8rarz"; + name = "ktp-desktop-applets-17.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-filetransfer-handler-17.08.0.tar.xz"; - sha256 = "1jprbcc3cnz1h9491bbmfxs6rbq6plpl7mrkfha7p3f1qn72w0h0"; - name = "ktp-filetransfer-handler-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-filetransfer-handler-17.08.1.tar.xz"; + sha256 = "0hvy0vdznv9js9fjmhgbcmh3gq6jlnynz4mfdbj8bjff635q76az"; + name = "ktp-filetransfer-handler-17.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-kded-module-17.08.0.tar.xz"; - sha256 = "1676s6w8wcwvbzgmg5vfw6i88smrzicgjbbg6q5k5hzp5xaxr8yk"; - name = "ktp-kded-module-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-kded-module-17.08.1.tar.xz"; + sha256 = "0rsb6qgf6kdizpp6iw48gxr1aka1yljcwc0wx03p6s31a9aql47w"; + name = "ktp-kded-module-17.08.1.tar.xz"; }; }; ktp-send-file = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-send-file-17.08.0.tar.xz"; - sha256 = "153v1yzhjxh1afkq5r7spp45f7lzj07x61ziv74ignpshm28a69l"; - name = "ktp-send-file-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-send-file-17.08.1.tar.xz"; + sha256 = "1ncxr7cwfbqr8pwgkl3mg4zv6klss99pansmwkyh49bbjzjc9j3v"; + name = "ktp-send-file-17.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktp-text-ui-17.08.0.tar.xz"; - sha256 = "169lb6d07xra6v25wsdzmhbpj2lhbkjxdhvgyprwv3wlh7fyd6z2"; - name = "ktp-text-ui-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktp-text-ui-17.08.1.tar.xz"; + sha256 = "13isirx7in0vj4p3l2m9pnjz73bf48y586qbpn0rbzpwbc7xzbmz"; + name = "ktp-text-ui-17.08.1.tar.xz"; }; }; ktuberling = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/ktuberling-17.08.0.tar.xz"; - sha256 = "06iqdi5j7yywv4xfv6lciw8s80a1z41w0cw029l26r97yrm5qc3c"; - name = "ktuberling-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/ktuberling-17.08.1.tar.xz"; + sha256 = "04fsplvry85m596qkx2i7601l7pc9dag4x45sw4z325fkzvlzsx9"; + name = "ktuberling-17.08.1.tar.xz"; }; }; kturtle = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kturtle-17.08.0.tar.xz"; - sha256 = "0ds7n7bpg4m5av48k9nqjaka94jddrxqxn61dn54c8yxx8zwka1j"; - name = "kturtle-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kturtle-17.08.1.tar.xz"; + sha256 = "0nrsmhdmc1qdnpwsgrhs2gd91al8b0wrm85nwia2mmyxsfnbd45l"; + name = "kturtle-17.08.1.tar.xz"; }; }; kubrick = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kubrick-17.08.0.tar.xz"; - sha256 = "1azzy536xwcpcf37hvkrvqg63l9jn67vsw1nxa68a7vh7pw104hi"; - name = "kubrick-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kubrick-17.08.1.tar.xz"; + sha256 = "07lxc4i92i08hca2y6gqq3wsyp4mn857vwmy6ja40c2wh8sl6bix"; + name = "kubrick-17.08.1.tar.xz"; }; }; kwalletmanager = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kwalletmanager-17.08.0.tar.xz"; - sha256 = "03dam64smpw9fqpq4kqisn5kcwvwf2rl0x5jq1ws6pxdk72cn5wj"; - name = "kwalletmanager-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kwalletmanager-17.08.1.tar.xz"; + sha256 = "0dq8m160kwbrjmda4hvdgq5izdnr7nnlksb9l3cvbslpc685d8h0"; + name = "kwalletmanager-17.08.1.tar.xz"; }; }; kwave = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kwave-17.08.0.tar.xz"; - sha256 = "0zqv5iqn3nzijvhlwx303dhjj0f9ha9fvg0infn9170vhcx2v2mn"; - name = "kwave-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kwave-17.08.1.tar.xz"; + sha256 = "097viq7k2l4hkj0w07hnyfzfmz3apnri2n1g69ir1h37wq59fw89"; + name = "kwave-17.08.1.tar.xz"; }; }; kwordquiz = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/kwordquiz-17.08.0.tar.xz"; - sha256 = "0mxvx4br53grsp48mx1z5vf9awlrbj6s7yipz75mj1cskzq103pb"; - name = "kwordquiz-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/kwordquiz-17.08.1.tar.xz"; + sha256 = "14l419ghf6xvdp2fnsdskflppzzvvhlbciwn6cicrkzmdr9zkawz"; + name = "kwordquiz-17.08.1.tar.xz"; }; }; libgravatar = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libgravatar-17.08.0.tar.xz"; - sha256 = "1wijd89xpg82p36f4c5y3lphdpgisj66408idar7x4wfsz6x9ypj"; - name = "libgravatar-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libgravatar-17.08.1.tar.xz"; + sha256 = "0fn860y88pvq6mdpw1jw8msvkdmknradfp037gj9kvd5ykiicbvh"; + name = "libgravatar-17.08.1.tar.xz"; }; }; libkcddb = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkcddb-17.08.0.tar.xz"; - sha256 = "0cxhjf80kncmwl8gflf8mawghqz0bdwqb3sjipwy241p1irisyb4"; - name = "libkcddb-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkcddb-17.08.1.tar.xz"; + sha256 = "06i8gm7rysbdlm89nw5pd3jgbvz9vy5schwyfyhk6jbvlm43sx7z"; + name = "libkcddb-17.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkcompactdisc-17.08.0.tar.xz"; - sha256 = "16qa7mn9pxrghka56y4n3kg7i1wm9fp3njnpaczc5f8brl7fm8wk"; - name = "libkcompactdisc-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkcompactdisc-17.08.1.tar.xz"; + sha256 = "1xrpbpg4w275afd4fbnsmjvp737v6z5nsdz5lrfxbqg8x97xb2fm"; + name = "libkcompactdisc-17.08.1.tar.xz"; }; }; libkdcraw = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkdcraw-17.08.0.tar.xz"; - sha256 = "0c76c055i2h4hwxp7xpnkpyn86mg8rs5z8wxzamc9yjynsym29k6"; - name = "libkdcraw-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkdcraw-17.08.1.tar.xz"; + sha256 = "0r9prk1pnbm2hj5q93j7axb869lzr8v7msqhylpf3awghfmy32a0"; + name = "libkdcraw-17.08.1.tar.xz"; }; }; libkdegames = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkdegames-17.08.0.tar.xz"; - sha256 = "0zhfr0pq4vb7ax2wlspkczrfnqfs9w78r2l77777yhgha0mvs5hl"; - name = "libkdegames-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkdegames-17.08.1.tar.xz"; + sha256 = "12w8i91pqshgb2bx4h68yni3sj7ssbcxrcdybnicg18hpcf5fzpa"; + name = "libkdegames-17.08.1.tar.xz"; }; }; libkdepim = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkdepim-17.08.0.tar.xz"; - sha256 = "0xf1r07hzqwnjjwkbi0a61dpmpsa33a33ac41rlaknclpvmgakxl"; - name = "libkdepim-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkdepim-17.08.1.tar.xz"; + sha256 = "17pg8fwpcdkj04fwzyqgykh9a23xkmkz46mknk43b37n0bcjhxq0"; + name = "libkdepim-17.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkeduvocdocument-17.08.0.tar.xz"; - sha256 = "1x779zxawd3zg341a5lph669afg8qnnbvrbblv9rd775bpygwkhj"; - name = "libkeduvocdocument-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkeduvocdocument-17.08.1.tar.xz"; + sha256 = "0kv7yirw7q953qv23f0z3m1nmdpax6f6vsrbncpdz2057p51fwf4"; + name = "libkeduvocdocument-17.08.1.tar.xz"; }; }; libkexiv2 = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkexiv2-17.08.0.tar.xz"; - sha256 = "02i1nm4ggj72kgk8j0qkgqrc5kh4dg4qa62bp8q5lgi27fxijhxy"; - name = "libkexiv2-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkexiv2-17.08.1.tar.xz"; + sha256 = "06qwd9lnl95vyzmj7nwgxflx82rvs5wkkwx4vnp408gya8w7cpjc"; + name = "libkexiv2-17.08.1.tar.xz"; }; }; libkface = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkface-17.08.0.tar.xz"; - sha256 = "08k7ci77lry0z5178w5fm0rf0rvsvfcdlhs70xg3iwzbhha3crz7"; - name = "libkface-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkface-17.08.1.tar.xz"; + sha256 = "1w81dsmz9r2vx4aw5rkkg5s08jn4gqckgr1jscdxah6af354y052"; + name = "libkface-17.08.1.tar.xz"; }; }; libkgapi = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkgapi-17.08.0.tar.xz"; - sha256 = "1i0z16x77wmxk11w75kp1j6w6v00kr9knpryg7n3gpp4kbpnkj8c"; - name = "libkgapi-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkgapi-17.08.1.tar.xz"; + sha256 = "04nww7rip0qpz9cky28ygd9chfmpp1kycpri4s84cqdicwg691bv"; + name = "libkgapi-17.08.1.tar.xz"; }; }; libkgeomap = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkgeomap-17.08.0.tar.xz"; - sha256 = "02njkvk9qvd6zycfa1s85mlc66jal5icg23dbh5vliiwq3xqlyix"; - name = "libkgeomap-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkgeomap-17.08.1.tar.xz"; + sha256 = "0llh9ixa1wyafcvah48rfrbk4n897i97a6jrk3vnf0yrqhl8nps2"; + name = "libkgeomap-17.08.1.tar.xz"; }; }; libkipi = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkipi-17.08.0.tar.xz"; - sha256 = "0z1vllhfimwp7dgf2hfxwhpvfg0j6kg6n7m166ji7nalb8p5avd4"; - name = "libkipi-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkipi-17.08.1.tar.xz"; + sha256 = "089avdka9rvv5j137k42d6sz6kvqci771wb8433xksnnci8r52xb"; + name = "libkipi-17.08.1.tar.xz"; }; }; libkleo = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkleo-17.08.0.tar.xz"; - sha256 = "0i747aq06yzl8rzznyrgwyypff4g5fdmdc1k5v63z99yf8rb0zqg"; - name = "libkleo-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkleo-17.08.1.tar.xz"; + sha256 = "0d2rby5yfwpb1gy2j87kzffzn6hls3358886qhiq6pwpx2nq7chj"; + name = "libkleo-17.08.1.tar.xz"; }; }; libkmahjongg = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkmahjongg-17.08.0.tar.xz"; - sha256 = "0cya2gnqr8cjgw2abpnwvyqa243zjdr89h1dwvjyag8s0aw595af"; - name = "libkmahjongg-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkmahjongg-17.08.1.tar.xz"; + sha256 = "11ciqd54isvjfccw3xc1xrdvjjmvacgvsdsxy3arcbivikmbmdqi"; + name = "libkmahjongg-17.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libkomparediff2-17.08.0.tar.xz"; - sha256 = "0nrd6a5agvgmqcx5bvx11s4zal9ln6q6awavbyr5m1hvccch2k1r"; - name = "libkomparediff2-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libkomparediff2-17.08.1.tar.xz"; + sha256 = "0vp33mkm52yn2gqy469m4wfmsrbzppl6hw1d842nm1q1csnva0v5"; + name = "libkomparediff2-17.08.1.tar.xz"; }; }; libksane = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libksane-17.08.0.tar.xz"; - sha256 = "18s3d3m0ylbrrbf4vivc29lms9yz6ppkdb247kbmxxnwvzk867bl"; - name = "libksane-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libksane-17.08.1.tar.xz"; + sha256 = "0k2sjz86yw7lfij0kgn1byps2vd8c9hlrd4lizppflzxi2ajmkd0"; + name = "libksane-17.08.1.tar.xz"; }; }; libksieve = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/libksieve-17.08.0.tar.xz"; - sha256 = "10864y6d473y93ikkw0kiz7rl85x2whb5c4ifl24w5njri3szl89"; - name = "libksieve-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/libksieve-17.08.1.tar.xz"; + sha256 = "01d573a415i2advgad0xzxkg8f6z5fbfmyb0iim79qqhzkbmf6bm"; + name = "libksieve-17.08.1.tar.xz"; }; }; lokalize = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/lokalize-17.08.0.tar.xz"; - sha256 = "0aps3s5gbja1fngndfwbi21wg7kr8pr3l48hx5n4hgcpa4rxbf0n"; - name = "lokalize-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/lokalize-17.08.1.tar.xz"; + sha256 = "0gr1qj0ish0kp842654fli2irbrli77q1449xryik76frlyy16wj"; + name = "lokalize-17.08.1.tar.xz"; }; }; lskat = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/lskat-17.08.0.tar.xz"; - sha256 = "0xwbyfjlkfxccnmi4kmvrar1jds7976j1m2s8sd69knfccj43n6a"; - name = "lskat-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/lskat-17.08.1.tar.xz"; + sha256 = "1fhkg2vjy7xpp1rnx4cp9bpvxqc4i3nymyqgph92ankal0nnw2ai"; + name = "lskat-17.08.1.tar.xz"; }; }; mailcommon = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/mailcommon-17.08.0.tar.xz"; - sha256 = "1laqipa3mqyxzbx3xkg5jm6ah74a68fgyb37hjw52mkbf6jzqpsx"; - name = "mailcommon-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/mailcommon-17.08.1.tar.xz"; + sha256 = "0qw7hsy36r39l13x492mhfxj3x9inagd7fjsxvfblhgnh1c2ad0r"; + name = "mailcommon-17.08.1.tar.xz"; }; }; mailimporter = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/mailimporter-17.08.0.tar.xz"; - sha256 = "11677y558xy0rdn5g63cpjl3nz1w5x38dfr0ky0nsylary9diwwn"; - name = "mailimporter-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/mailimporter-17.08.1.tar.xz"; + sha256 = "0wwciyc8azx2sln5407gv4kqcx7zfl680szxgbw533iq9kccvl0z"; + name = "mailimporter-17.08.1.tar.xz"; }; }; marble = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/marble-17.08.0.tar.xz"; - sha256 = "1qi4fiagxp2734myd2grg38sf9bdbfys46rhmn0jp8p39dqic4di"; - name = "marble-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/marble-17.08.1.tar.xz"; + sha256 = "1jlz37m3a0jhnac4y6ix6n3hhxkp808qdnvxpd3my1gvn715wa58"; + name = "marble-17.08.1.tar.xz"; }; }; mbox-importer = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/mbox-importer-17.08.0.tar.xz"; - sha256 = "15iipvs5szfjnl1r0gfx30wr4rq1l5a74wywy8lm73ma9hgb0fpc"; - name = "mbox-importer-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/mbox-importer-17.08.1.tar.xz"; + sha256 = "0kjxx0nvxb6dshibaipgdf4i8magmsxnqhfnph831x13mig15bcs"; + name = "mbox-importer-17.08.1.tar.xz"; }; }; messagelib = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/messagelib-17.08.0.tar.xz"; - sha256 = "0qik1a4rka6qj28jdmdh5rk7m3p3gh27i0jcg9nxijrg7wz1hx98"; - name = "messagelib-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/messagelib-17.08.1.tar.xz"; + sha256 = "0srjcqbqzyk8ca9ssisrils9jwm9p6b62q4b7g9bya602cbrh38b"; + name = "messagelib-17.08.1.tar.xz"; }; }; minuet = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/minuet-17.08.0.tar.xz"; - sha256 = "1f9pd9wzai2sqs87m70ywgqsn9azr2xnpaj2msii7cl2mn6km6wb"; - name = "minuet-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/minuet-17.08.1.tar.xz"; + sha256 = "17vvsnvhvpqcyrb5qlchp4na1wk5f4qlkh7w8sj162jsd1lbxr9j"; + name = "minuet-17.08.1.tar.xz"; }; }; okteta = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/okteta-17.08.0.tar.xz"; - sha256 = "1f3041vn9p24avkj7svz9mb9sr5s5p16jvh9m7417svy307g1hii"; - name = "okteta-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/okteta-17.08.1.tar.xz"; + sha256 = "00wmkzjw7h99b1lmab0llwzlmh1m4xgv3yy506hjwb78z1c6wbq2"; + name = "okteta-17.08.1.tar.xz"; }; }; okular = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/okular-17.08.0.tar.xz"; - sha256 = "0fghjj149ji6p1hi7zlzfmgsp7zrwyhz3989ff2an9yx5qvmwayg"; - name = "okular-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/okular-17.08.1.tar.xz"; + sha256 = "027isffca4g98qm6yx7m69cp2xjplqhnh7gy00sr1b96hhnlc9c6"; + name = "okular-17.08.1.tar.xz"; }; }; palapeli = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/palapeli-17.08.0.tar.xz"; - sha256 = "1gv4hfjj9b7bgfsvpmdydvb8pmbqwvm2s0f0ip8mjxnfcayig4xn"; - name = "palapeli-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/palapeli-17.08.1.tar.xz"; + sha256 = "0nnplg88xipmnb24qj2ki5m090g8cbinbb3azkqadwsjfc13xk06"; + name = "palapeli-17.08.1.tar.xz"; }; }; parley = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/parley-17.08.0.tar.xz"; - sha256 = "1qx10l0h4099w6xl5jnlp259glq0whqjsxl4b4a6kj4ddz55ysyr"; - name = "parley-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/parley-17.08.1.tar.xz"; + sha256 = "034nc5qgiy50wpnkm3d8w3cf7svj6as23sarz0h5hks4ffw1bxhg"; + name = "parley-17.08.1.tar.xz"; }; }; picmi = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/picmi-17.08.0.tar.xz"; - sha256 = "03cl8hbxa5kfb9ji24x2svp2ids0jwyam847zncrdkg72gjmnjlb"; - name = "picmi-17.08.0.tar.xz"; - }; - }; - pim-data-exporter = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/pim-data-exporter-17.08.0.tar.xz"; - sha256 = "01n9m8ssyla5rz9cg61fv0rhl4gz02488cghak7idb18an36lfak"; - name = "pim-data-exporter-17.08.0.tar.xz"; - }; - }; - pim-sieve-editor = { - version = "17.08.0"; - src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/pim-sieve-editor-17.08.0.tar.xz"; - sha256 = "0i3ry6hrdiz3wdjqw1b6mqrya3jxphrv9lx1px8grp0gs8ci0gc4"; - name = "pim-sieve-editor-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/picmi-17.08.1.tar.xz"; + sha256 = "14kbrbq59kmqz1rd7izrp57i1a6d6nm8i73rwcl80vyla8cnvika"; + name = "picmi-17.08.1.tar.xz"; }; }; pimcommon = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/pimcommon-17.08.0.tar.xz"; - sha256 = "0vv3fxf6d9vx75gxn2lwmv43ifman5av9xxy17yzxsmvjpvf2mmv"; - name = "pimcommon-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/pimcommon-17.08.1.tar.xz"; + sha256 = "14vk8pnwbc4bvha26fxdfbyn0ipxj93qgan8f24kpxc7irjkr8ic"; + name = "pimcommon-17.08.1.tar.xz"; + }; + }; + pim-data-exporter = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/pim-data-exporter-17.08.1.tar.xz"; + sha256 = "0drzj44p66ds4p42wk45755yjcs2dpysw54mzg2qx4cdv8kf1snq"; + name = "pim-data-exporter-17.08.1.tar.xz"; + }; + }; + pim-sieve-editor = { + version = "17.08.1"; + src = fetchurl { + url = "${mirror}/stable/applications/17.08.1/src/pim-sieve-editor-17.08.1.tar.xz"; + sha256 = "1hclbjs596x5niszcccnzkr6x5avg2c982prq8qcrc68cdm1h7pg"; + name = "pim-sieve-editor-17.08.1.tar.xz"; }; }; poxml = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/poxml-17.08.0.tar.xz"; - sha256 = "1a68lddadm3iar64q4zfi4f0mp97zagfnfs3i1czdyq83hqp1c3x"; - name = "poxml-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/poxml-17.08.1.tar.xz"; + sha256 = "17g62xp5g4icfmbd001rhypn34a9asj8pcgj301q5v9065z44mmn"; + name = "poxml-17.08.1.tar.xz"; }; }; print-manager = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/print-manager-17.08.0.tar.xz"; - sha256 = "0cj8ijzl3xsxyrkcpigscqj84mza5lzwsaal586zqf1z2p8pabcx"; - name = "print-manager-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/print-manager-17.08.1.tar.xz"; + sha256 = "0f354qblzw3vkv4fypwp3fj3i29x6b478z79q5d2n6x9nk8li5in"; + name = "print-manager-17.08.1.tar.xz"; }; }; rocs = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/rocs-17.08.0.tar.xz"; - sha256 = "0cjz0n4bk21c6csqhr937dfyzhn8i8viy7h94pr3813vfwffd0mn"; - name = "rocs-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/rocs-17.08.1.tar.xz"; + sha256 = "18nygfbyiny8zpq2jm6mxs6r4b90c4dwxwzvs0a3vrc131fjc6bc"; + name = "rocs-17.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/signon-kwallet-extension-17.08.0.tar.xz"; - sha256 = "0nzgjrr8hgc2pmiwx3cdp9pcgw25hvr0y7mkjllyh2cigcnbw6dg"; - name = "signon-kwallet-extension-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/signon-kwallet-extension-17.08.1.tar.xz"; + sha256 = "1ax4l1whdxrfnl7bbs805vpp7j2m5zl55fq12vvrkw0x38m78v2h"; + name = "signon-kwallet-extension-17.08.1.tar.xz"; }; }; spectacle = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/spectacle-17.08.0.tar.xz"; - sha256 = "1lmh53rhgbkg81xxk1dhcsxwh7shzlxvfqfs3zflq88ghm53fnzf"; - name = "spectacle-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/spectacle-17.08.1.tar.xz"; + sha256 = "07x01i629zk0l409kl85yv5gws7cw7mzmp1mlwxrjix153sr4jr9"; + name = "spectacle-17.08.1.tar.xz"; }; }; step = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/step-17.08.0.tar.xz"; - sha256 = "0rqj6idzdlkljvfx6jwjlwc6ibpqmmb9w7fi4cax2h89s9fc4fqy"; - name = "step-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/step-17.08.1.tar.xz"; + sha256 = "11p9rdg0m42200g15lq61489zz0zkkhic2j6hyynb1z1lr9c2iga"; + name = "step-17.08.1.tar.xz"; }; }; svgpart = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/svgpart-17.08.0.tar.xz"; - sha256 = "0gqzhm6shsirkb2h933n5slhm5kwhvjrszqbdlpm7a28643r0jgq"; - name = "svgpart-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/svgpart-17.08.1.tar.xz"; + sha256 = "0xr0axiyn49szwwflq50sf9wp8i5xd7qs3krwznrdzlc8jcann9j"; + name = "svgpart-17.08.1.tar.xz"; }; }; sweeper = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/sweeper-17.08.0.tar.xz"; - sha256 = "0hxkf65jdy5qirrycr55v3v0d63x4bh3hd49wjvbh0qx4sbkazhs"; - name = "sweeper-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/sweeper-17.08.1.tar.xz"; + sha256 = "04gzc06p1fh7rnb3sbma2k8lav98v3w657k0sgscnv4dvsgbcqh9"; + name = "sweeper-17.08.1.tar.xz"; }; }; syndication = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/syndication-17.08.0.tar.xz"; - sha256 = "0z5jpygkphmq2xvmnnj8nyagcx320ngnjjqphwfymp14y8yp8cla"; - name = "syndication-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/syndication-17.08.1.tar.xz"; + sha256 = "0ihkway75n4r3zw18z07g5k2ggby5q1cz4cqi29cws1ay6s09qb9"; + name = "syndication-17.08.1.tar.xz"; }; }; umbrello = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/umbrello-17.08.0.tar.xz"; - sha256 = "09dnmafzqbhjymqpb8lcspaqwkprma11r4l0dhlqfmlzwbdhp9vg"; - name = "umbrello-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/umbrello-17.08.1.tar.xz"; + sha256 = "0xvxcncsxikmnxv98ar3gzcvxahsnja4jz1l23hiy2ib1lmcgcy7"; + name = "umbrello-17.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "17.08.0"; + version = "17.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/17.08.0/src/zeroconf-ioslave-17.08.0.tar.xz"; - sha256 = "16zw9gsd89qaadhlii5c5wjfd75c1jf9ivg55fmmfsqc5nqzjf4b"; - name = "zeroconf-ioslave-17.08.0.tar.xz"; + url = "${mirror}/stable/applications/17.08.1/src/zeroconf-ioslave-17.08.1.tar.xz"; + sha256 = "1crypk1cdh6cav1f6fx9p60ky1yf6hyyh1n6mih8mqjiibi1brz5"; + name = "zeroconf-ioslave-17.08.1.tar.xz"; }; }; } From aea9ed4bcb480faf9be018ac15f7509db7883d01 Mon Sep 17 00:00:00 2001 From: dywedir Date: Sun, 10 Sep 2017 22:47:46 +0300 Subject: [PATCH 073/115] rustRegistry: 2017-08-27 -> 2017-09-10 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 2bc4ea967054..6c39d865ac21 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,13 +7,13 @@ { stdenv, fetchFromGitHub, git }: stdenv.mkDerivation { - name = "rustRegistry-2017-08-27"; + name = "rustRegistry-2017-09-10"; src = fetchFromGitHub { owner = "rust-lang"; repo = "crates.io-index"; - rev = "2f344732d240aaa8b5090f0c280ea05382a1c8cb"; - sha256 = "19h8znbmq2skcrzmc0rcn1c6m3qqb58v8qfh8svkvmihhzpkmhmv"; + rev = "2e573cbbb2db591ff9d46339910f21e35b21339f"; + sha256 = "0sgpc2aygmvyjb3kinzh83bj4j92ny18159alqb1x8w26wqmisfq"; }; phases = [ "unpackPhase" "installPhase" ]; installPhase = '' From 19c46733104c680267a0a0dd3a2e6be893bd52b4 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 2 Sep 2017 14:00:47 +0200 Subject: [PATCH 074/115] nixpkgs-tests: add basic test for cc-wrapper --- pkgs/test/cc-wrapper/cc-main.c | 7 ++++ pkgs/test/cc-wrapper/cflags-main.c | 10 +++++ pkgs/test/cc-wrapper/core-foundation-main.c | 7 ++++ pkgs/test/cc-wrapper/cxx-main.cc | 7 ++++ pkgs/test/cc-wrapper/default.nix | 45 +++++++++++++++++++++ pkgs/test/cc-wrapper/foo.c | 4 ++ pkgs/test/cc-wrapper/ldflags-main.c | 12 ++++++ pkgs/top-level/all-packages.nix | 4 ++ 8 files changed, 96 insertions(+) create mode 100644 pkgs/test/cc-wrapper/cc-main.c create mode 100644 pkgs/test/cc-wrapper/cflags-main.c create mode 100644 pkgs/test/cc-wrapper/core-foundation-main.c create mode 100644 pkgs/test/cc-wrapper/cxx-main.cc create mode 100644 pkgs/test/cc-wrapper/default.nix create mode 100644 pkgs/test/cc-wrapper/foo.c create mode 100644 pkgs/test/cc-wrapper/ldflags-main.c diff --git a/pkgs/test/cc-wrapper/cc-main.c b/pkgs/test/cc-wrapper/cc-main.c new file mode 100644 index 000000000000..06f28bc33c69 --- /dev/null +++ b/pkgs/test/cc-wrapper/cc-main.c @@ -0,0 +1,7 @@ +#include + +int main(int argc, char **argv) +{ + fprintf(stderr, "ok\n"); + return 0; +} diff --git a/pkgs/test/cc-wrapper/cflags-main.c b/pkgs/test/cc-wrapper/cflags-main.c new file mode 100644 index 000000000000..9491232b5387 --- /dev/null +++ b/pkgs/test/cc-wrapper/cflags-main.c @@ -0,0 +1,10 @@ +#include +#include + +int main(int argc, char **argv) +{ + if (foo() != 42) + return 1; + fprintf(stderr, "ok\n"); + return 0; +} diff --git a/pkgs/test/cc-wrapper/core-foundation-main.c b/pkgs/test/cc-wrapper/core-foundation-main.c new file mode 100644 index 000000000000..fb3bd3126191 --- /dev/null +++ b/pkgs/test/cc-wrapper/core-foundation-main.c @@ -0,0 +1,7 @@ +#include + +int main(int argc, char** argv) +{ + CFShow(CFSTR("ok")); + return 0; +} diff --git a/pkgs/test/cc-wrapper/cxx-main.cc b/pkgs/test/cc-wrapper/cxx-main.cc new file mode 100644 index 000000000000..83f704617a46 --- /dev/null +++ b/pkgs/test/cc-wrapper/cxx-main.cc @@ -0,0 +1,7 @@ +#include + +int main(int argc, char **argv) +{ + std::cerr << "ok" << std::endl; + return 0; +} diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix new file mode 100644 index 000000000000..d8a5e1355815 --- /dev/null +++ b/pkgs/test/cc-wrapper/default.nix @@ -0,0 +1,45 @@ +{ stdenv }: + +let + shlib = if stdenv.isDarwin then "dylib" else "so"; +in + +stdenv.mkDerivation { + name = "cc-wrapper-test"; + + buildCommand = '' + NIX_DEBUG=1 $CC -v + NIX_DEBUG=1 $CXX -v + + printf "checking whether compiler builds valid C binaries... " >&2 + $CC -o cc-check ${./cc-main.c} + ./cc-check + + printf "checking whether compiler builds valid C++ binaries... " >&2 + $CXX -o cxx-check ${./cxx-main.cc} + ./cxx-check + + ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.isClang) '' + printf "checking whether compiler can build with CoreFoundation.framework... " >&2 + mkdir -p foo/lib + $CC -framework CoreFoundation -o core-foundation-check ${./core-foundation-main.c} + ./core-foundation-check + ''} + + printf "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2 + mkdir -p foo/include + cp ${./foo.c} foo/include/foo.h + NIX_CFLAGS_COMPILE="-Ifoo/include -DVALUE=42" $CC -o cflags-check ${./cflags-main.c} + ./cflags-check + + printf "checking whether compiler uses NIX_LDFLAGS... " >&2 + mkdir -p foo/lib + $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,@rpath/libfoo.dylib"} -DVALUE=42 -o foo/lib/libfoo.${shlib} ${./foo.c} + NIX_LDFLAGS="-L$NIX_BUILD_TOP/foo/lib -rpath $NIX_BUILD_TOP/foo/lib" $CC -lfoo -o ldflags-check ${./ldflags-main.c} + ./ldflags-check + + touch $out + ''; + + meta.platforms = stdenv.lib.platforms.all; +} diff --git a/pkgs/test/cc-wrapper/foo.c b/pkgs/test/cc-wrapper/foo.c new file mode 100644 index 000000000000..8be674be3103 --- /dev/null +++ b/pkgs/test/cc-wrapper/foo.c @@ -0,0 +1,4 @@ +unsigned int foo(void) +{ + return VALUE; +} diff --git a/pkgs/test/cc-wrapper/ldflags-main.c b/pkgs/test/cc-wrapper/ldflags-main.c new file mode 100644 index 000000000000..89832b3bbad2 --- /dev/null +++ b/pkgs/test/cc-wrapper/ldflags-main.c @@ -0,0 +1,12 @@ +#include + +extern unsigned int foo(void); + +int main(int argc, char **argv) +{ + if (foo() != 42) { + return 1; + } + fprintf(stderr, "ok\n"); + return 0; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bf0622e09a5..03d2a3a984a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19409,6 +19409,10 @@ with pkgs; # `recurseIntoAttrs` for sake of hydra, not nix-env tests = recurseIntoAttrs { + cc-wrapper = callPackage ../test/cc-wrapper { }; + cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = clangStdenv; }; + cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = libcxxStdenv; }; + macOSSierraShared = callPackage ../test/macos-sierra-shared {}; }; } From b91307c2e1bfa8a32eb450cc00613f70af2ad1f6 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 2 Sep 2017 23:48:55 +0200 Subject: [PATCH 075/115] nixpkgs-tests: add basic test for buildInputs --- pkgs/test/stdenv-inputs/bar.c | 3 ++ pkgs/test/stdenv-inputs/cc-main.c | 7 +++ pkgs/test/stdenv-inputs/default.nix | 64 ++++++++++++++++++++++++++ pkgs/test/stdenv-inputs/foo.c | 3 ++ pkgs/test/stdenv-inputs/include-main.c | 13 ++++++ pkgs/test/stdenv-inputs/lib-main.c | 14 ++++++ pkgs/top-level/all-packages.nix | 1 + 7 files changed, 105 insertions(+) create mode 100644 pkgs/test/stdenv-inputs/bar.c create mode 100644 pkgs/test/stdenv-inputs/cc-main.c create mode 100644 pkgs/test/stdenv-inputs/default.nix create mode 100644 pkgs/test/stdenv-inputs/foo.c create mode 100644 pkgs/test/stdenv-inputs/include-main.c create mode 100644 pkgs/test/stdenv-inputs/lib-main.c diff --git a/pkgs/test/stdenv-inputs/bar.c b/pkgs/test/stdenv-inputs/bar.c new file mode 100644 index 000000000000..2d7299c2d462 --- /dev/null +++ b/pkgs/test/stdenv-inputs/bar.c @@ -0,0 +1,3 @@ +unsigned int bar(void) { + return 42; +} diff --git a/pkgs/test/stdenv-inputs/cc-main.c b/pkgs/test/stdenv-inputs/cc-main.c new file mode 100644 index 000000000000..06f28bc33c69 --- /dev/null +++ b/pkgs/test/stdenv-inputs/cc-main.c @@ -0,0 +1,7 @@ +#include + +int main(int argc, char **argv) +{ + fprintf(stderr, "ok\n"); + return 0; +} diff --git a/pkgs/test/stdenv-inputs/default.nix b/pkgs/test/stdenv-inputs/default.nix new file mode 100644 index 000000000000..d1eb8b9bfe24 --- /dev/null +++ b/pkgs/test/stdenv-inputs/default.nix @@ -0,0 +1,64 @@ +{ stdenv }: + +let + shlib = if stdenv.isDarwin then "dylib" else "so"; + + foo = stdenv.mkDerivation { + name = "foo-test"; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/bin $out/include $out/lib + $CC -o $out/bin/foo ${./cc-main.c} + chmod +x $out/bin/foo + cp ${./foo.c} $out/include/foo.h + $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$out/lib/libfoo.dylib"} -o $out/lib/libfoo.${shlib} ${./foo.c} + ''; + }; + + bar = stdenv.mkDerivation { + name = "bar-test"; + outputs = [ "out" "dev" ]; + + unpackPhase = ":"; + + installPhase = '' + mkdir -p $out/bin $dev/include $dev/lib + $CC -o $out/bin/bar ${./cc-main.c} + chmod +x $out/bin/bar + cp ${./bar.c} $dev/include/bar.h + $CC -shared ${stdenv.lib.optionalString stdenv.isDarwin "-Wl,-install_name,$dev/lib/libbar.dylib"} -o $dev/lib/libbar.${shlib} ${./bar.c} + ''; + }; +in + +stdenv.mkDerivation { + name = "stdenv-inputs-test"; + phases = [ "buildPhase" ]; + + buildInputs = [ foo bar ]; + + buildPhase = '' + env + + printf "checking whether binaries are available... " >&2 + foo && bar + + printf "checking whether compiler can find headers... " >&2 + $CC -o include-check ${./include-main.c} + ./include-check + + printf "checking whether compiler can find headers... " >&2 + $CC -o include-check ${./include-main.c} + ./include-check + + printf "checking whether compiler can find libraries... " >&2 + $CC -lfoo -lbar -o lib-check ${./lib-main.c} + ./lib-check + + touch $out + ''; + + meta.platforms = stdenv.lib.platforms.all; +} diff --git a/pkgs/test/stdenv-inputs/foo.c b/pkgs/test/stdenv-inputs/foo.c new file mode 100644 index 000000000000..0253a26d5d2c --- /dev/null +++ b/pkgs/test/stdenv-inputs/foo.c @@ -0,0 +1,3 @@ +unsigned int foo(void) { + return 42; +} diff --git a/pkgs/test/stdenv-inputs/include-main.c b/pkgs/test/stdenv-inputs/include-main.c new file mode 100644 index 000000000000..35e5ee0d90f7 --- /dev/null +++ b/pkgs/test/stdenv-inputs/include-main.c @@ -0,0 +1,13 @@ +#include +#include +#include + +int main(int argc, char **argv) +{ + if (foo() != 42) + return 1; + if (bar() != 42) + return 1; + fprintf(stderr, "ok\n"); + return 0; +} diff --git a/pkgs/test/stdenv-inputs/lib-main.c b/pkgs/test/stdenv-inputs/lib-main.c new file mode 100644 index 000000000000..c9488fe43e55 --- /dev/null +++ b/pkgs/test/stdenv-inputs/lib-main.c @@ -0,0 +1,14 @@ +#include + +extern unsigned int foo(void); +extern unsigned int bar(void); + +int main(int argc, char **argv) +{ + if (foo() != 42) + return 1; + if (bar() != 42) + return 1; + fprintf(stderr, "ok\n"); + return 0; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03d2a3a984a2..6f449057a786 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19412,6 +19412,7 @@ with pkgs; cc-wrapper = callPackage ../test/cc-wrapper { }; cc-wrapper-clang = callPackage ../test/cc-wrapper { stdenv = clangStdenv; }; cc-wrapper-libcxx = callPackage ../test/cc-wrapper { stdenv = libcxxStdenv; }; + stdenv-inputs = callPackage ../test/stdenv-inputs { }; macOSSierraShared = callPackage ../test/macos-sierra-shared {}; }; From e916917acf4a7b51d08004f2391a4e7477b868f6 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 10 Sep 2017 17:23:05 -0400 Subject: [PATCH 076/115] ghc-8.2.1: Get rid of `preReleaseName` binding now that it is released No hashes should be changed --- pkgs/development/compilers/ghc/8.2.1.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.2.1.nix b/pkgs/development/compilers/ghc/8.2.1.nix index bce51f92c0bc..dde56df81313 100644 --- a/pkgs/development/compilers/ghc/8.2.1.nix +++ b/pkgs/development/compilers/ghc/8.2.1.nix @@ -10,12 +10,12 @@ let inherit (bootPkgs) ghc; version = "8.2.1"; - preReleaseName = "ghc-8.2.1"; + commonBuildInputs = [ alex autoconf automake ghc happy hscolour perl python3 sphinx ]; commonPreConfigure = '' sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/${preReleaseName}" + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" '' + stdenv.lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" '' + stdenv.lib.optionalString enableIntegerSimple '' @@ -26,7 +26,7 @@ in stdenv.mkDerivation (rec { name = "ghc-${version}"; src = fetchurl { - url = "https://downloads.haskell.org/~ghc/${version}/${preReleaseName}-src.tar.xz"; + url = "https://downloads.haskell.org/~ghc/${version}/${name}-src.tar.xz"; sha256 = "1w4k0n23b9fg8kmarqhfamzpmf91p6jcdr6xlwzfmb4df2bd9hng"; }; @@ -57,7 +57,7 @@ in stdenv.mkDerivation (rec { checkTarget = "test"; postInstall = '' - paxmark m $out/lib/${preReleaseName}/bin/{ghc,haddock} + paxmark m $out/lib/${name}/bin/{ghc,haddock} # Install the bash completion file. install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/ghc From 114a2bcc80ac0b414e23d9c70722928f7136086c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 10 Sep 2017 19:21:31 -0400 Subject: [PATCH 077/115] linux-copperhead: 4.13.a -> 4.13.1.a --- pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix index 0d385c444f20..ef79b3f7fb76 100644 --- a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix +++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix @@ -3,9 +3,9 @@ with stdenv.lib; let - version = "4.13"; + version = "4.13.1"; revision = "a"; - sha256 = "1d118yi40yqzfjxdwl00h7alp1z0qq7rk5q14w3hs281ig773aip"; + sha256 = "19x3rg75r4xm67wbr54iypbjsrfka7mz2vp3yswp4x4x94g457bh"; # modVersion needs to be x.y.z, will automatically add .0 if needed modVersion = concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))); From 3c02edc29018df557b334b12d0c007e4b085c91c Mon Sep 17 00:00:00 2001 From: romildo Date: Sun, 10 Sep 2017 22:05:43 -0300 Subject: [PATCH 078/115] greybird: 3.22.4 -> 3.22.5 --- pkgs/misc/themes/greybird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index b1e104b7c3ef..5800bd5c0459 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "greybird"; - version = "3.22.4"; + version = "3.22.5"; src = fetchFromGitHub { owner = "shimmerproject"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1xh6vi4rmxmkrgy9qskcl8q6014qnsn19xjjwbmwf8n6yr07scl3"; + sha256 = "0l107q9fcbgp73r4p4fmyy3a7pmc4mi4km5hgp67fm2a4dna7rkd"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; From 1b261730f262a974a37126004b2df29e5f7f67cd Mon Sep 17 00:00:00 2001 From: dywedir Date: Sun, 10 Sep 2017 22:25:26 +0300 Subject: [PATCH 079/115] feh: 2.19.3 -> 2.20 --- pkgs/applications/graphics/feh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 2b24b93282f1..f1b992bea1a0 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "feh-${version}"; - version = "2.19.3"; + version = "2.20"; src = fetchurl { - url = "http://feh.finalrewind.org/${name}.tar.bz2"; - sha256 = "1l3yvv0l0ggwlfyhk84p2g9mrqvzqrg1fgalf88kzppvb9jppjay"; + url = "https://feh.finalrewind.org/${name}.tar.bz2"; + sha256 = "02vhdv16nf4kjna4inpbfy4k3p40bhl7xpc4kh4xvily14146l2b"; }; outputs = [ "out" "man" "doc" ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { description = "A light-weight image viewer"; - homepage = https://derf.homelinux.org/projects/feh/; + homepage = "https://feh.finalrewind.org/"; license = licenses.mit; maintainers = [ maintainers.viric maintainers.willibutz ]; platforms = platforms.unix; From d6f9c0b35390bbd7b61d589c6c1f18c728d6461d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 11 Sep 2017 07:35:19 +0200 Subject: [PATCH 080/115] nixos tests: restrict sysctl and plasma5 to x86_64-linux - sysctl is new and never succeeded on i686-linux > cannot stat /proc/sys/net/core/bpf_jit_enable: No such file or directory - testing plasma5 on i686 would defeat part of the reason why we ended supporting i686 (lots of stuff built on Hydra) --- nixos/release-combined.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 6e921ba7fb9f..a7ceb104b577 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -93,7 +93,7 @@ in rec { (all nixos.tests.keymap.dvp) (all nixos.tests.keymap.neo) (all nixos.tests.keymap.qwertz) - (all nixos.tests.plasma5) + nixos.tests.plasma5.x86_64-linux # avoid big build on i686 (all nixos.tests.kernel-latest) (all nixos.tests.kernel-lts) (all nixos.tests.kernel-params) @@ -119,7 +119,7 @@ in rec { (all nixos.tests.sddm.default) (all nixos.tests.simple) (all nixos.tests.slim) - (all nixos.tests.sysctl) + nixos.tests.sysctl.x86_64-linux # i686 fails (all nixos.tests.udisks2) (all nixos.tests.xfce) From 90b3d2db91cc604f57e304cc9765988c64a71eda Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 11 Sep 2017 14:54:48 +0800 Subject: [PATCH 081/115] qtox: drop gtk2 dependency Tray icon still works without gtk2. --- .../instant-messengers/qtox/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index c8c13a242ffb..aee739256746 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -2,8 +2,8 @@ libtoxcore, libpthreadstubs, libXdmcp, libXScrnSaver, qtbase, qtsvg, qttools, qttranslations, - atk, cairo, ffmpeg, filter-audio, gdk_pixbuf, glib, gtk2, libsodium, libopus, - libvpx, openal, opencv, pango, pcre, qrencode, sqlcipher }: + ffmpeg, filter-audio, libsodium, libopus, + libvpx, openal, opencv, pcre, qrencode, sqlcipher }: mkDerivation rec { name = "qtox-${version}"; @@ -20,28 +20,25 @@ mkDerivation rec { libtoxcore libpthreadstubs libXdmcp libXScrnSaver qtbase qtsvg qttools qttranslations - atk cairo ffmpeg filter-audio gdk_pixbuf glib gtk2 libopus libsodium - libvpx openal opencv pango pcre qrencode sqlcipher + ffmpeg filter-audio libopus libsodium + libvpx openal opencv pcre qrencode sqlcipher ]; nativeBuildInputs = [ cmake pkgconfig ]; + enableParallelBuilding = true; + cmakeFlags = [ "-DGIT_DESCRIBE=${version}" + "-DENABLE_STATUSNOTIFIER=False" + "-DENABLE_GTK_SYSTRAY=False" + "-DENABLE_APPINDICATOR=False" ]; - installPhase = '' - runHook preInstall - - install -Dm755 qtox $out/bin/qtox - - runHook postInstall - ''; - meta = with lib; { description = "Qt Tox client"; - license = licenses.gpl3; + license = licenses.gpl3; maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ]; - platforms = platforms.all; + platforms = platforms.all; }; } From 38563d61300406b2f4031c8cec77a753fa891836 Mon Sep 17 00:00:00 2001 From: "hiberno (Christian Lask)" Date: Mon, 11 Sep 2017 11:25:59 +0200 Subject: [PATCH 082/115] tasksh: Add readline support. --- pkgs/applications/misc/tasksh/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 8c7bd107c8ae..11bc76203689 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libuuid, gnutls }: +{ stdenv, fetchurl, cmake, libuuid, gnutls, readline }: stdenv.mkDerivation rec { name = "tasksh-${version}"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1z8zw8lld62fjafjvy248dncjk0i4fwygw0ahzjdvyyppx4zjhkf"; }; + buildInputs = [ readline ]; nativeBuildInputs = [ cmake ]; meta = with stdenv.lib; { From 373b2231be61032fdf1ff8eca37699577332ead9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 11 Sep 2017 13:50:24 +0300 Subject: [PATCH 083/115] pythonPackages.ssdeep: Mark broken https://hydra.nixos.org/build/59943791 This package is a library and has no reverse dependencies. (It was once used by diffoscope, but it changed to use a different library). --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11b9fd5e067d..3d936e43ad92 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8023,6 +8023,7 @@ in { buildInputs = with pkgs; [ ssdeep ]; propagatedBuildInputs = with self; [ cffi six ]; + meta.broken = true; # Tests fail, and no reverse-dependencies anyway }; From c7a152e5d05f14638fb67e34f341501e49094125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 11 Sep 2017 13:00:30 +0200 Subject: [PATCH 084/115] vm: bump trusty-updates hash In future we might just not use the updates if hash changes too often. --- pkgs/build-support/vm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index e9310c0c516c..b7d9203a0b63 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1689,7 +1689,7 @@ rec { }) (fetchurl { url = mirror://ubuntu/dists/trusty-updates/main/binary-amd64/Packages.bz2; - sha256 = "0hrrcx9kqszla5qkd31gjm87b7hnvjin9vvpga2skb9wl3h7ys2f"; + sha256 = "03vd582p8b78s8sq6hz3nynn9vr7syccmn77i5mzayvsadb74cfy"; }) ]; urlPrefix = mirror://ubuntu; From 6e6a3c9ba5678c180760cfdd81243252212047d3 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Mon, 11 Sep 2017 13:49:36 +0200 Subject: [PATCH 085/115] andviro/flake8-vim: init at 2017-02-17 --- pkgs/misc/vim-plugins/default.nix | 11 +++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 12 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index cd105793a9ad..32a126f453d8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -473,6 +473,17 @@ rec { }; + flake8-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "flake8-vim-2017-02-17"; + src = fetchgit { + url = "https://github.com/andviro/flake8-vim"; + rev = "01c4af4c68f33b2b3785314bfbf5b3d8d1451795"; + sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; + }; + dependencies = []; + + }; + vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-css-color-2017-02-09"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 608e14ef9468..09a157e6812a 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -29,6 +29,7 @@ "github:ajh17/Spacegray.vim" "github:albfan/nerdtree-git-plugin" "github:alvan/vim-closetag" +"github:andviro/flake8-vim" "github:ap/vim-css-color" "github:bbchung/clighter8" "github:benekastah/neomake" From cf497c60f0278a2917b91672e7bbeb37e774503d Mon Sep 17 00:00:00 2001 From: James Kay Date: Mon, 11 Sep 2017 13:25:53 +0100 Subject: [PATCH 086/115] buildbot: 0.9.9post2 -> 0.9.11 --- .../tools/build-managers/buildbot/default.nix | 10 +++++----- .../tools/build-managers/buildbot/worker.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index 2ed436981e00..a2d77f0321a3 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -3,6 +3,7 @@ let withPlugins = plugins: runCommand "wrapped-${package.name}" { buildInputs = [ makeWrapper ] ++ plugins; + propagatedBuildInputs = package.propagatedBuildInputs; passthru.withPlugins = moarPlugins: withPlugins (moarPlugins ++ plugins); } '' makeWrapper ${package}/bin/buildbot $out/bin/buildbot \ @@ -10,14 +11,14 @@ let ln -sfv ${package}/lib $out/lib ''; - package = pythonPackages.buildPythonApplication (rec { + package = pythonPackages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.9.post2"; + version = "0.9.11"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "0g932pvkxqq3ijwkwwa29jd9sp5895gv40c3k7m2acc5dp8ygb9w"; + sha256 = "1s3y218wry7502xp4zxccf3z996xm8cnp3dcxl7m5ldmmb055qwv"; }; buildInputs = with pythonPackages; [ @@ -39,7 +40,6 @@ let ]; propagatedBuildInputs = with pythonPackages; [ - # core twisted jinja2 @@ -87,5 +87,5 @@ let maintainers = with maintainers; [ nand0p ryansydnor ]; license = licenses.gpl2; }; - }); + }; in package diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index f87e8db85554..4fe728b9ce64 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -3,11 +3,11 @@ pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot-worker"; - version = "0.9.9.post2"; + version = "0.9.11"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1wb2fw0djamhn1sb7rwnf12i4ijdq9y4k33ri7dcwxxcavxsvqa0"; + sha256 = "0lb8kwg3m9jgrww929d5nrjs4rj489mb4dnsdxcbdb358jbbym22"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; From 28f780b3200bf7abdbc5b985cb255a908e46faf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 9 Sep 2017 10:55:44 +0200 Subject: [PATCH 087/115] eagle: 7.5 -> 7.7 This is the latest release from Cadsoft, before they were bought by Autocad. Autocad has released 8.x, but - it requires reworking the Nix expression (different packaging) - the paid license version requires a monthly subscription fee, you never "own" the software (AFAICT). Due to the licensing change in 8.x, I think keeping Eagle 7.x around is a good idea. --- .../applications/science/electronics/eagle/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index edc5845e9887..b9294ef3639a 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -14,18 +14,18 @@ in stdenv.mkDerivation rec { name = "eagle-${version}"; - version = "7.5.0"; + version = "7.7.0"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin32-${version}.run"; - sha256 = "1yfpfv2bqppc95964dhn38g0hq198wnz88lq2dmh517z7jlq9j5g"; + url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin32-${version}.run"; + sha256 = "16fa66p77xigc7zvzfm7737mllrcs6nrgk2p7wvkjw3p9lvbz7z1"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "ftp://ftp.cadsoft.de/eagle/program/7.5/eagle-lin64-${version}.run"; - sha256 = "0msd0sn8yfln96mf7j5rc3b8amprxn87vmpq4wsz2cnmgd8xq0s9"; + url = "ftp://ftp.cadsoft.de/eagle/program/7.7/eagle-lin64-${version}.run"; + sha256 = "18dcn6wqph1sqh0ah98qzfi05wip8a8ifbkaq79iskbrsi8iqnrg"; } else throw "Unsupported system: ${stdenv.system}"; From 1011c765983050a60da3e6fb7738022bb8829016 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Sep 2017 15:13:08 +0200 Subject: [PATCH 088/115] dynamips: init at 0.2.17 --- .../virtualization/dynamips/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/virtualization/dynamips/default.nix diff --git a/pkgs/applications/virtualization/dynamips/default.nix b/pkgs/applications/virtualization/dynamips/default.nix new file mode 100644 index 000000000000..811e5cf47c3b --- /dev/null +++ b/pkgs/applications/virtualization/dynamips/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, cmake, libelf, libpcap }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "dynamips"; + version = "0.2.17"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "12c45jcp9isz57dbshxrvvhqbvmf9cnrr7ddac5m6p34in4hk01n"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libelf libpcap ]; + + cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ]; + + meta = with stdenv.lib; { + description = "A Cisco router emulator"; + longDescription = '' + Dynamips is an emulator computer program that was written to emulate Cisco + routers. + ''; + inherit (src.meta) homepage; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f449057a786..8d2457236c9d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13949,6 +13949,8 @@ with pkgs; patches = config.dwm.patches or []; }; + dynamips = callPackage ../applications/virtualization/dynamips { }; + evilwm = callPackage ../applications/window-managers/evilwm { patches = config.evilwm.patches or []; }; From e61022ac5553b2d62aa4c82517b2ca0f203533da Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 11 Sep 2017 16:31:43 +0300 Subject: [PATCH 089/115] dbench: Disable on Darwin Assumes Linux versions of xattr system calls. Has never built successfully. https://hydra.nixos.org/build/60443210 --- pkgs/development/tools/misc/dbench/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/dbench/default.nix b/pkgs/development/tools/misc/dbench/default.nix index d7dad8cb0eab..997b1e18fd78 100644 --- a/pkgs/development/tools/misc/dbench/default.nix +++ b/pkgs/development/tools/misc/dbench/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "Filesystem benchmark tool based on load patterns"; homepage = https://dbench.samba.org/; license = licenses.gpl3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; } From fdaaaea31edc66ee3038d3af9cd1db44bf6bb4e6 Mon Sep 17 00:00:00 2001 From: timor Date: Mon, 11 Sep 2017 16:09:15 +0200 Subject: [PATCH 090/115] perl-Devel-NYTProf: init at 6.04 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55f543e68baf..78d980094a8e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4005,6 +4005,20 @@ let self = _self // overrides; _self = with self; { }; }; + DevelNYTProf = buildPerlPackage rec { + name = "Devel-NYTProf-6.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TI/TIMB/${name}.tar.gz"; + sha256 = "c04c9f03663b7e4e9cc159f30bcdc0bab5652889c88c425ec157e831318d4891"; + }; + propagatedBuildInputs = [ FileWhich JSONMaybeXS TestDifferences ]; + meta = { + homepage = https://code.google.com/p/perl-devel-nytprof/; + description = "Powerful fast feature-rich Perl source code profiler"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + DevelPartialDump = buildPerlPackage { name = "Devel-PartialDump-0.15"; src = fetchurl { From 60bb058cf5549b6067657c65382910d76807aaab Mon Sep 17 00:00:00 2001 From: timor Date: Mon, 11 Sep 2017 16:13:21 +0200 Subject: [PATCH 091/115] perl-Devel-DProf: deprecated, remove does not build --- pkgs/top-level/perl-packages.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55f543e68baf..df377fe1d1a9 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3644,19 +3644,6 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ DataCompare FileFindRule ]; }; - DevelDProf = buildPerlPackage { - name = "Devel-DProf-20110802.00"; - src = fetchurl { - url = mirror://cpan/authors/id/F/FL/FLORA/Devel-DProf-20110802.00.tar.gz; - sha256 = "b9eec466ab77aa9f6ab48d33134694d1aa5a8cd221b1aa0a00d09c93ab69643c"; - }; - meta = { - homepage = http://search.cpan.org/dist/Devel-DProf; - description = "A DEPRECATED Perl code profiler"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - }; - }; - DevelPatchPerl = buildPerlPackage rec { name = "Devel-PatchPerl-1.38"; src = fetchurl { From bb2e6d131e2aa004a1bd9c196f1e321733c239fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 11 Sep 2017 15:57:45 +0100 Subject: [PATCH 092/115] altcoins: remove pkgs non-sense --- pkgs/applications/altcoins/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 01e34a953bb3..0fbc8cd3d171 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,4 +1,4 @@ -{ callPackage, pkgs }: +{ callPackage, boost155, boost162, boost163, openssl_1_1_0, haskellPackages }: rec { @@ -8,8 +8,8 @@ rec { bitcoin-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = true; }; bitcoind-unlimited = callPackage ./bitcoin-unlimited.nix { withGui = false; }; - bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; boost = pkgs.boost; }; - bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = pkgs.boost; }; + bitcoin-classic = callPackage ./bitcoin-classic.nix { withGui = true; boost = boost162; }; + bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; boost = boost162; }; bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; @@ -22,12 +22,12 @@ rec { dogecoin = callPackage ./dogecoin.nix { withGui = true; }; dogecoind = callPackage ./dogecoin.nix { withGui = false; }; - freicoin = callPackage ./freicoin.nix { boost = pkgs.boost155; }; + freicoin = callPackage ./freicoin.nix { boost = boost155; }; go-ethereum = callPackage ./go-ethereum.nix { }; go-ethereum-classic = callPackage ./go-ethereum-classic { }; - hivemind = callPackage ./hivemind.nix { withGui = true; boost = pkgs.boost162; }; - hivemindd = callPackage ./hivemind.nix { withGui = false; boost = pkgs.boost162; }; + hivemind = callPackage ./hivemind.nix { withGui = true; boost = boost162; }; + hivemindd = callPackage ./hivemind.nix { withGui = false; boost = boost162; }; litecoin = callPackage ./litecoin.nix { withGui = true; }; litecoind = callPackage ./litecoin.nix { withGui = false; }; @@ -43,7 +43,7 @@ rec { seth = callPackage ./seth.nix { }; dapp = callPackage ./dapp.nix { }; - hsevm = (pkgs.haskellPackages.callPackage ./hsevm.nix {}); + hsevm = (haskellPackages.callPackage ./hsevm.nix {}); primecoin = callPackage ./primecoin.nix { withGui = true; }; primecoind = callPackage ./primecoin.nix { withGui = false; }; @@ -52,7 +52,7 @@ rec { zcash = callPackage ./zcash { withGui = false; - openssl = pkgs.openssl_1_1_0; - boost = pkgs.boost163; + openssl = openssl_1_1_0; + boost = boost163; }; } From 383b7c658a2b430750536e141dee3f4f6f089ec6 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Mon, 11 Sep 2017 15:52:10 +0200 Subject: [PATCH 093/115] mopidy-iris: 3.3.3 -> 3.4.1 --- pkgs/applications/audio/mopidy-iris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy-iris/default.nix b/pkgs/applications/audio/mopidy-iris/default.nix index b85e4a39a8ec..6e2312c33907 100644 --- a/pkgs/applications/audio/mopidy-iris/default.nix +++ b/pkgs/applications/audio/mopidy-iris/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { name = "mopidy-iris-${version}"; - version = "3.3.3"; + version = "3.4.1"; src = pythonPackages.fetchPypi { inherit version; pname = "Mopidy-Iris"; - sha256 = "1lfqkmjvdmc2pb3xx9z21ay095b2bk5cvdwharxqqx8fjq6n27hq"; + sha256 = "04fjj2n5v53ykxnjgna1y8bvk7g3x0yiqisvzrdva693lfz9cbgx"; }; propagatedBuildInputs = [ From 0177902337aede7545d099f5bd3dc5c6809f86ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 16:01:01 +0200 Subject: [PATCH 094/115] ascii: 3.15 -> 3.18 --- pkgs/tools/text/ascii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ascii/default.nix b/pkgs/tools/text/ascii/default.nix index 4cc033938553..20777f990e26 100644 --- a/pkgs/tools/text/ascii/default.nix +++ b/pkgs/tools/text/ascii/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ascii-${version}"; - version = "3.15"; + version = "3.18"; src = fetchurl { url = "http://www.catb.org/~esr/ascii/${name}.tar.gz"; - sha256 = "0pzzfljg2ijnnys3fzj3f2p288sl5cgk83a2mpcm679pcj5xpqdc"; + sha256 = "0b87vy06s8s3a8q70pqavsbk4m4ff034sdml2xxa6qfsykaj513j"; }; prePatch = '' From 0a7d124eb0bdca1a6e8fd56cef8ebeae10292c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 16:06:22 +0200 Subject: [PATCH 095/115] basex: 8.6.4 -> 8.6.6 --- pkgs/tools/text/xml/basex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix index 4a7a478a12ac..0650270bb6a0 100644 --- a/pkgs/tools/text/xml/basex/default.nix +++ b/pkgs/tools/text/xml/basex/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "basex-${version}"; - version = "8.6.4"; + version = "8.6.6"; src = fetchurl { - url = "http://files.basex.org/releases/${version}/BaseX864.zip"; - sha256 = "14320hfw53m0zl1v4377p0vcjvdnwfpa4gkj2y2wlrplma76y0w7"; + url = "http://files.basex.org/releases/${version}/BaseX866.zip"; + sha256 = "1kws6swisdaa17yhijjvkh2ikwz9rd5cw8mdjvkqw6vlcp1nq6m4"; }; buildInputs = [ unzip jre ]; From 421949e43658d6a07ed2c10d7c56ac370b9fd929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 16:24:36 +0200 Subject: [PATCH 096/115] gsoap: 2.8.49 -> 2.8.53 --- pkgs/development/libraries/gsoap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsoap/default.nix b/pkgs/development/libraries/gsoap/default.nix index 7d44b8e2dbfc..f099d3fabc04 100644 --- a/pkgs/development/libraries/gsoap/default.nix +++ b/pkgs/development/libraries/gsoap/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { name = "gsoap-${version}"; - version = "${majorVersion}.49"; + version = "${majorVersion}.53"; src = fetchurl { url = "mirror://sourceforge/project/gsoap2/gsoap-${majorVersion}/gsoap_${version}.zip"; - sha256 = "0414q7zabkq3iiccl2yql3vbihbr7ach9d517b37zv3mp7nhj2aj"; + sha256 = "0n35dh32gidi65c36cwjd91304pwiabfblvd64kg21djpjl06qcr"; }; buildInputs = [ openssl zlib ]; From 835b2ccfa875879414d7fcdfb68aa0e499bf46b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 16:44:28 +0200 Subject: [PATCH 097/115] t1utils: 1.39 -> 1.41 --- pkgs/tools/misc/t1utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/t1utils/default.nix b/pkgs/tools/misc/t1utils/default.nix index d68ab942e494..a256b8e4fdb3 100644 --- a/pkgs/tools/misc/t1utils/default.nix +++ b/pkgs/tools/misc/t1utils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "t1utils-1.39"; + name = "t1utils-1.41"; src = fetchurl { url = "http://www.lcdf.org/type/${name}.tar.gz"; - sha256 = "1i6ln194ns2g4j5zjlj4bfzxpkfpnxvy37n9baq3hywjqkjz7bhg"; + sha256 = "09rlc837dr69hyiiicha3il37mchsvz84qw8hnvb60lrh9zdsppw"; }; meta = with stdenv.lib; { From f4bac5cdb782f087ffc2d633fce5ca4feca36354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 16:47:15 +0200 Subject: [PATCH 098/115] wireshark: 2.4.0 -> 2.4.1 Remove patches that have been merged upstream. --- .../wireshark/add_missing_udpdump_pod.patch | 132 ------------------ .../networking/sniffers/wireshark/default.nix | 18 +-- 2 files changed, 3 insertions(+), 147 deletions(-) delete mode 100644 pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch diff --git a/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch b/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch deleted file mode 100644 index a009057307b0..000000000000 --- a/pkgs/applications/networking/sniffers/wireshark/add_missing_udpdump_pod.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff -Nur wireshark-2.4.0/doc/udpdump.pod wireshark-2.4.0-p/doc/udpdump.pod ---- wireshark-2.4.0/doc/udpdump.pod 1970-01-01 01:00:00.000000000 +0100 -+++ wireshark-2.4.0-p/doc/udpdump.pod 2017-08-01 10:48:40.551431319 +0200 -@@ -0,0 +1,128 @@ -+ -+=head1 NAME -+ -+udpdump - Provide an UDP receiver that gets packets from network devices (like Aruba routers) and exports them in PCAP format. -+ -+=head1 SYNOPSIS -+ -+B -+S<[ B<--help> ]> -+S<[ B<--version> ]> -+S<[ B<--extcap-interfaces> ]> -+S<[ B<--extcap-dlts> ]> -+S<[ B<--extcap-interface>=EinterfaceE ]> -+S<[ B<--extcap-config> ]> -+S<[ B<--capture> ]> -+S<[ B<--fifo>=Epath to file or pipeE ]> -+S<[ B<--port>=EportE ]> -+S<[ B<--payload>=EtypeE ]> -+ -+=head1 DESCRIPTION -+ -+B is a extcap tool that provides an UDP receiver that listens for exported datagrams coming from -+any source (like Aruba routers) and exports them in PCAP format. This provides the user two basic -+functionalities: the first one is to have a listener that prevents the localhost to send back an ICMP -+port-unreachable packet. The second one is to strip out the lower layers (layer 2, IP, UDP) that are useless -+(are used just as export vector). The format of the exported datagrams are EXPORTED_PDU, as specified in -+https://code.wireshark.org/review/gitweb?p=wireshark.git;a=blob;f=epan/exported_pdu.h;hb=refs/heads/master -+ -+=head1 OPTIONS -+ -+=over 4 -+ -+=item --help -+ -+Print program arguments. -+ -+=item --version -+ -+Print program version. -+ -+=item --extcap-interfaces -+ -+List available interfaces. -+ -+=item --extcap-interface=EinterfaceE -+ -+Use specified interfaces. -+ -+=item --extcap-dlts -+ -+List DLTs of specified interface. -+ -+=item --extcap-config -+ -+List configuration options of specified interface. -+ -+=item --capture -+ -+Start capturing from specified interface save saved it in place specified by --fifo. -+ -+=item --fifo=Epath to file or pipeE -+ -+Save captured packet to file or send it through pipe. -+ -+=item --port=EportE -+ -+Set the listerner port. Port 5555 is the default. -+ -+=item --payload=EtypeE -+ -+Set the payload of the exported PDU. Default: data. -+ -+=back -+ -+=head1 EXAMPLES -+ -+To see program arguments: -+ -+ udpdump --help -+ -+To see program version: -+ -+ udpdump --version -+ -+To see interfaces: -+ -+ udpdump --extcap-interfaces -+ -+ Example output: -+ interface {value=udpdump}{display=UDP Listener remote capture} -+ -+To see interface DLTs: -+ -+ udpdump --extcap-interface=udpdump --extcap-dlts -+ -+ Example output: -+ dlt {number=252}{name=udpdump}{display=Exported PDUs} -+ -+To see interface configuration options: -+ -+ udpdump --extcap-interface=udpdump --extcap-config -+ -+ Example output: -+ arg {number=0}{call=--port}{display=Listen port}{type=unsigned}{range=1,65535}{default=5555}{tooltip=The port the receiver listens on} -+ -+To capture: -+ -+ udpdump --extcap-interface=randpkt --fifo=/tmp/randpkt.pcapng --capture -+ -+NOTE: To stop capturing CTRL+C/kill/terminate application. -+ -+=head1 SEE ALSO -+ -+wireshark(1), tshark(1), dumpcap(1), extcap(4) -+ -+=head1 NOTES -+ -+B is part of the B distribution. The latest version -+of B can be found at L. -+ -+HTML versions of the Wireshark project man pages are available at: -+L. -+ -+=head1 AUTHORS -+ -+ Original Author -+ --------------- -+ Dario Lombardo diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 340c2e0babe3..a4a3741aeee2 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -12,7 +12,7 @@ assert withQt -> !withGtk && qt5 != null; with stdenv.lib; let - version = "2.4.0"; + version = "2.4.1"; variant = if withGtk then "gtk" else if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "011vvrj76z1azkpvyy2j40b1x1z56ymld508zfc4xw3gh8dv82w9"; + sha256 = "1k8zj44pkb2ny2x46f100y7cxddm1kh0zh7f6qggm78gn7wvrp82"; }; cmakeFlags = optional withGtk "-DBUILD_wireshark_gtk=TRUE"; @@ -37,19 +37,7 @@ in stdenv.mkDerivation { ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; - patches = [ ./wireshark-lookup-dumpcap-in-path.patch - - # Backported from master. Will probably have to be dropped during next - # update. - (fetchpatch { - name = "AUTHORS_add_newline_after_bracket"; - url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=patch;h=27c6b12626d6e7b8e4d7a11784c2c5e2bfb87fde"; - sha256 = "1x30rkrq7dzgdlwrjv2r5ibdpdgwnn5wzvki77rdf13b0547vcw3"; - }) - # A file is missing from distribution. This should be fixed in upcoming - # releases - ./add_missing_udpdump_pod.patch - ]; + patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; postInstall = optionalString (withQt || withGtk) '' ${optionalString withGtk '' From dcdbe960f8d6852599e01e46f0467ef7546aa39e Mon Sep 17 00:00:00 2001 From: timor Date: Mon, 11 Sep 2017 15:39:28 +0200 Subject: [PATCH 099/115] perl-Data-Dumper: 2.154 -> 2.161 + build fix --- pkgs/top-level/perl-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 55f543e68baf..6c6012a529f0 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2945,11 +2945,15 @@ let self = _self // overrides; _self = with self; { }; }; - DataDumper = buildPerlPackage { - name = "Data-Dumper-2.154"; + DataDumper = buildPerlPackage rec { + name = "Data-Dumper-2.161"; src = fetchurl { - url = mirror://cpan/authors/id/S/SM/SMUELLER/Data-Dumper-2.154.tar.gz; - sha256 = "e30fcb6dea290cda85b67fc46d227a2ea890a8bd36c213557adec9c99ebd212f"; + url = "mirror://cpan/authors/id/S/SM/SMUELLER/${name}.tar.gz"; + sha256 = "3aa4ac1b042b3880438165fb2b2139d377564a8e9928ffe689ede5304ee90558"; + }; + outputs = [ "out" ]; + meta = { + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From 1b1fc6550559f9d73ddf7cea611c387a847bf03b Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 11 Sep 2017 18:12:50 +0200 Subject: [PATCH 100/115] NixOS Manual: document assertions and warnings (#29206) * NixOS Manual: document assertions and warnings * NixOS manual: re-wrap assertions text --- nixos/doc/manual/configuration/summary.xml | 3 +- nixos/doc/manual/development/assertions.xml | 80 +++++++++++++++++++ .../manual/development/writing-modules.xml | 1 + 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 nixos/doc/manual/development/assertions.xml diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index 6ff0390c0ed3..be1f2263149e 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -113,7 +113,8 @@ manual for the rest. assert 1 + 1 == 2; "yes!" - Assertion check (evaluates to "yes!") + Assertion check (evaluates to "yes!"). See for using assertions in modules let x = "foo"; y = "bar"; in x + y diff --git a/nixos/doc/manual/development/assertions.xml b/nixos/doc/manual/development/assertions.xml new file mode 100644 index 000000000000..d3434e1f112e --- /dev/null +++ b/nixos/doc/manual/development/assertions.xml @@ -0,0 +1,80 @@ +
+ +Warnings and Assertions + + + When configuration problems are detectable in a module, it is a good + idea to write an assertion or warning. Doing so provides clear + feedback to the user and prevents errors after the build. + + + + Although Nix has the abort and + builtins.trace functions to perform such tasks, + they are not ideally suited for NixOS modules. Instead of these + functions, you can declare your warnings and assertions using the + NixOS module system. + + +
+ +Warnings + + + This is an example of using warnings. + + + + + + +
+ +
+ +Assertions + + + + This example, extracted from the + + syslogd module + shows how to use assertions. Since there + can only be one active syslog daemon at a time, an assertion is useful to + prevent such a broken system from being built. + + + + + + +
+ +
diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index 5bdcad5ceb57..cb363b45675b 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -178,6 +178,7 @@ in { + From 886837f479baba220f4c7f45b68c755c4b8b7fea Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Mon, 11 Sep 2017 19:19:58 +0300 Subject: [PATCH 101/115] make-fonts-cache.nix: Don't build-depend on unnecessary outputs of fontconfig --- pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 53c2a335cc0b..9aa1a905ec98 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -2,7 +2,7 @@ runCommand "fc-cache" rec { - buildInputs = [ fontconfig ]; + buildInputs = [ fontconfig.bin ]; passAsFile = [ "fontDirs" ]; fontDirs = '' From f6537dafe2bdb1cae9b4f03f141fb80a18ace833 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 11 Sep 2017 18:25:37 +0200 Subject: [PATCH 102/115] perl-Log-Contextual: 0.006003 -> 0.007001 --- pkgs/top-level/perl-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6c6012a529f0..02d8480bf955 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7914,18 +7914,18 @@ let self = _self // overrides; _self = with self; { }; }; - LogContextual = buildPerlPackage { - name = "Log-Contextual-0.006003"; + LogContextual = buildPerlPackage rec { + name = "Log-Contextual-0.007001"; src = fetchurl { - url = mirror://cpan/authors/id/F/FR/FREW/Log-Contextual-0.006003.tar.gz; - sha256 = "0940s910n67arqvz7aji4z6vgzzl52aq3l3jg8vq4ygnkn7c9k21"; + url = "mirror://cpan/authors/id/F/FR/FREW/${name}.tar.gz"; + sha256 = "163c46f9cf4ed921356d300925a1c3ec4d7e0d20d1c678ade9ccc24efd990cd6"; }; buildInputs = [ TestFatal ]; propagatedBuildInputs = [ DataDumperConcise ExporterDeclare Moo ]; meta = { + homepage = https://github.com/frioux/Log-Contextual; description = "Simple logging interface with a contextual log"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ]; platforms = stdenv.lib.platforms.unix; }; }; From 99b09a200675f83d310f9cccd813c37f5dc997c1 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 11 Sep 2017 18:26:08 +0200 Subject: [PATCH 103/115] perl-Data-Dumper-Concise: 2.022 -> 2.023 --- pkgs/top-level/perl-packages.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 02d8480bf955..031c716cbc6c 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2958,10 +2958,14 @@ let self = _self // overrides; _self = with self; { }; DataDumperConcise = buildPerlPackage rec { - name = "Data-Dumper-Concise-2.022"; + name = "Data-Dumper-Concise-2.023"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Data/${name}.tar.gz"; - sha256 = "0z7vxgk1f2kw2zpiimdsyf7jq9f4s5dhh3dlimq5yrirypnk03sc"; + url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; + sha256 = "a6c22f113caf31137590def1b7028a7e718eface3228272d0672c25e035d5853"; + }; + meta = { + description = "Less indentation and newlines plus sub deparsing"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From 3a377e26b2ebb2bd2951e47a9013ebc9da6fe2b1 Mon Sep 17 00:00:00 2001 From: lewo Date: Mon, 11 Sep 2017 18:33:33 +0200 Subject: [PATCH 104/115] nixos/nova-image: cleanup image builders (#29242) There are currently two ways to build Openstack image. This just picks best of both, to keep only one! - Image is resizable - Cloudinit is enable - Password authentication is disable by default - Use the same layer than other image builders (ec2, gce...) --- .../scripts/openstack/nova-image.nix | 2 + nixos/modules/virtualisation/cloud-image.nix | 44 ------------------- nixos/modules/virtualisation/nova-config.nix | 9 +++- 3 files changed, 9 insertions(+), 46 deletions(-) delete mode 100644 nixos/modules/virtualisation/cloud-image.nix diff --git a/nixos/maintainers/scripts/openstack/nova-image.nix b/nixos/maintainers/scripts/openstack/nova-image.nix index fa9cfb74bd6c..b6f3a5b15200 100644 --- a/nixos/maintainers/scripts/openstack/nova-image.nix +++ b/nixos/maintainers/scripts/openstack/nova-image.nix @@ -1,3 +1,5 @@ +# nix-build '' -A config.system.build.novaImage --arg configuration "{ imports = [ ./nixos/maintainers/scripts/openstack/nova-image.nix ]; }" + { config, lib, pkgs, ... }: with lib; diff --git a/nixos/modules/virtualisation/cloud-image.nix b/nixos/modules/virtualisation/cloud-image.nix deleted file mode 100644 index 0f0141abfb16..000000000000 --- a/nixos/modules/virtualisation/cloud-image.nix +++ /dev/null @@ -1,44 +0,0 @@ -# Usage: -# $ NIX_PATH=`pwd`:nixos-config=`pwd`/nixpkgs/nixos/modules/virtualisation/cloud-image.nix nix-build '' -A config.system.build.cloudImage - -{ config, lib, pkgs, ... }: - -with lib; - -{ - system.build.cloudImage = import ../../lib/make-disk-image.nix { - inherit pkgs lib config; - partitioned = true; - diskSize = 1 * 1024; - configFile = pkgs.writeText "configuration.nix" - '' - { config, lib, pkgs, ... }: - - with lib; - - { - imports = [ ]; - } - ''; - }; - - imports = [ ../profiles/qemu-guest.nix ]; - - fileSystems."/".device = "/dev/disk/by-label/nixos"; - - boot = { - kernelParams = [ "console=ttyS0" ]; - loader.grub.device = "/dev/vda"; - loader.timeout = 0; - }; - - networking.hostName = mkDefault ""; - - services.openssh = { - enable = true; - permitRootLogin = "without-password"; - passwordAuthentication = mkDefault false; - }; - - services.cloud-init.enable = true; -} diff --git a/nixos/modules/virtualisation/nova-config.nix b/nixos/modules/virtualisation/nova-config.nix index aac11ec8a178..c865cf451e40 100644 --- a/nixos/modules/virtualisation/nova-config.nix +++ b/nixos/modules/virtualisation/nova-config.nix @@ -22,8 +22,13 @@ with lib; boot.loader.timeout = 0; # Allow root logins - services.openssh.enable = true; - services.openssh.permitRootLogin = "prohibit-password"; + services.openssh = { + enable = true; + permitRootLogin = "prohibit-password"; + passwordAuthentication = mkDefault false; + }; + + services.cloud-init.enable = true; # Put /tmp and /var on /ephemeral0, which has a lot more space. # Unfortunately we can't do this with the `fileSystems' option From f717af03ad85119f24cafc6eeef9ac2120602ab4 Mon Sep 17 00:00:00 2001 From: timor Date: Mon, 11 Sep 2017 15:50:23 +0200 Subject: [PATCH 105/115] perl-Class-Autouse: 1.99_02 -> 2.01 --- pkgs/top-level/perl-packages.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ace83f80e799..3d8f7622d030 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1827,11 +1827,15 @@ let self = _self // overrides; _self = with self; { }; }; - ClassAutouse = buildPerlPackage { - name = "Class-Autouse-1.99_02"; + ClassAutouse = buildPerlPackage rec { + name = "Class-Autouse-2.01"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Class-Autouse-1.99_02.tar.gz; - sha256 = "1jkhczx2flxrz154ps90fj9wcchkpmnp5sapwc0l92rpn7jpsf08"; + url = "mirror://cpan/authors/id/A/AD/ADAMK/${name}.tar.gz"; + sha256 = "c05b3236c05719d819c20db0fdeb6d0954747e43d7a738294eed7fbcf36ecf1b"; + }; + meta = { + description = "Run-time load a class the first time you call a method in it"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; From 6373c9606d1cadceaa9831c1507341aea2b51487 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Sep 2017 18:48:13 +0200 Subject: [PATCH 106/115] vpcs: init at 0.8 --- .../virtualization/vpcs/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/virtualization/vpcs/default.nix diff --git a/pkgs/applications/virtualization/vpcs/default.nix b/pkgs/applications/virtualization/vpcs/default.nix new file mode 100644 index 000000000000..cac997e43b56 --- /dev/null +++ b/pkgs/applications/virtualization/vpcs/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake, glibc, buildPlatform }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "vpcs"; + version = "0.8"; + + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${version}/${name}-src.tbz"; + sha256 = "14y9nflcyq486vvw0na0fkfmg5dac004qb332v4m5a0vaz8059nw"; + }; + + unpackCmd = "tar -xjf $src"; + + buildInputs = [ glibc.static ]; + + buildPhase = '' + cd src + ./mk.sh ${buildPlatform.platform.kernelArch} + ''; + + installPhase = '' + cd .. + + install -D -m555 src/vpcs $out/bin/vpcs; + install -D -m444 man/vpcs.1 $out/share/man/man1/vpcs.1; + ''; + + meta = with stdenv.lib; { + description = "Virtual PC simulator"; + longDescription = '' + The VPCS can simulate up to 9 PCs. You can ping/traceroute them, or + ping/traceroute the other hosts/routers from the VPCS when you study the + Cisco routers in the dynamips. + ''; + homepage = "https://sourceforge.net/projects/vpcs/"; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbeb4b2be392..95b9db6ba70a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16686,6 +16686,8 @@ with pkgs; else null; }; + vpcs = callPackage ../applications/virtualization/vpcs { }; + primusLib = callPackage ../tools/X11/primus/lib.nix { nvidia_x11 = linuxPackages.nvidia_x11.override { libsOnly = true; }; }; From 89ae07b05b4d0ea258262297ac50dba6eb84abb6 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Sep 2017 19:21:49 +0200 Subject: [PATCH 107/115] iouyap: init at 0.97 --- pkgs/tools/networking/iouyap/default.nix | 28 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/iouyap/default.nix diff --git a/pkgs/tools/networking/iouyap/default.nix b/pkgs/tools/networking/iouyap/default.nix new file mode 100644 index 000000000000..c37b409cdfb5 --- /dev/null +++ b/pkgs/tools/networking/iouyap/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, bison, flex }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "iouyap"; + version = "0.97"; + + src = fetchFromGitHub { + owner = "GNS3"; + repo = pname; + rev = "v${version}"; + sha256 = "028s9kx67b9x7gwzg0fhc6546diw4n0x4kk1xhl3v7hbsz3wdh6s"; + }; + + buildInputs = [ bison flex ]; + + installPhase = '' + install -D -m555 iouyap $out/bin/iouyap; + ''; + + meta = with stdenv.lib; { + description = "Bridge IOU to UDP, TAP and Ethernet"; + inherit (src.meta) homepage; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95b9db6ba70a..7a29d08e2e96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2655,13 +2655,15 @@ with pkgs; intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; + iodine = callPackage ../tools/networking/iodine { }; + ioping = callPackage ../tools/system/ioping { }; iops = callPackage ../tools/system/iops { }; ior = callPackage ../tools/system/ior { }; - iodine = callPackage ../tools/networking/iodine { }; + iouyap = callPackage ../tools/networking/iouyap { }; ip2location = callPackage ../tools/networking/ip2location { }; From 4b84127f1c98699b7c44668a32ab9b3d7b52ca02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 19:58:11 +0200 Subject: [PATCH 108/115] qmmp: 1.1.5 -> 1.1.9 --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index b28f66aaad70..cb439704abac 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.1.5"; + name = "qmmp-1.1.9"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "1gfx6nm9v6qrx58gxib6grfhb45mnib1n4wdsnjq16br6bs8h4lv"; + sha256 = "0bnzyf4dgif92z91jn8yyv9wr0rialnj5v66h7gr69qqnh7zqnz2"; }; buildInputs = From 88ae2984679d551c2b512bc710da1d2b28ac79d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 11 Sep 2017 20:07:03 +0200 Subject: [PATCH 109/115] qmmp: 1.1.9 -> 1.1.10 --- pkgs/applications/audio/qmmp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index cb439704abac..77c82f1737c6 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -29,11 +29,11 @@ # handle that. stdenv.mkDerivation rec { - name = "qmmp-1.1.9"; + name = "qmmp-1.1.10"; src = fetchurl { url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2"; - sha256 = "0bnzyf4dgif92z91jn8yyv9wr0rialnj5v66h7gr69qqnh7zqnz2"; + sha256 = "16hb3s48filq0q18m7x9vmhpirk4fh0aqj8kwbapv8mkcnzq2mqy"; }; buildInputs = From f6e4c4e6c9b03448e6b332dbedd2f151161a48e8 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 11 Sep 2017 20:14:12 +0200 Subject: [PATCH 110/115] blitz++: mark as broken --- pkgs/development/libraries/blitz/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index 4ae47d338a67..498c8f005f0f 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -75,5 +75,7 @@ stdenv.mkDerivation rec { random number generators, and small vectors (useful for representing multicomponent or vector fields). ''; + + broken = true; # failing test, ancient version, no library user in nixpkgs => if you care to fix it, go ahead }; } From 334e23d244d46f949feef7863ae5eb91e35e33e8 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 11 Sep 2017 20:17:00 +0200 Subject: [PATCH 111/115] nixos/prometheus-collectd-exporter: init module (#29212) * prometheus-collectd-exporter service: init module Supports JSON and binary (optional) protocol of collectd. * nixos/prometheus-collectd-exporter: submodule is not needed for collectdBinary --- nixos/modules/module-list.nix | 1 + .../prometheus/collectd-exporter.nix | 128 ++++++++++++++++++ 2 files changed, 129 insertions(+) create mode 100644 nixos/modules/services/monitoring/prometheus/collectd-exporter.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a46448b94378..900f04662b22 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -363,6 +363,7 @@ ./services/monitoring/prometheus/default.nix ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/prometheus/blackbox-exporter.nix + ./services/monitoring/prometheus/collectd-exporter.nix ./services/monitoring/prometheus/fritzbox-exporter.nix ./services/monitoring/prometheus/json-exporter.nix ./services/monitoring/prometheus/nginx-exporter.nix diff --git a/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix new file mode 100644 index 000000000000..f8a5b9576a11 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/collectd-exporter.nix @@ -0,0 +1,128 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.collectdExporter; + + collectSettingsArgs = if (cfg.collectdBinary.enable) then '' + -collectd.listen-address ${optionalString (cfg.collectdBinary.listenAddress != null) cfg.collectdBinary.listenAddress}:${toString cfg.collectdBinary.port} \ + -collectd.security-level ${cfg.collectdBinary.securityLevel} \ + '' else ""; + +in { + options = { + services.prometheus.collectdExporter = { + enable = mkEnableOption "prometheus collectd exporter"; + + port = mkOption { + type = types.int; + default = 9103; + description = '' + Port to listen on. + This is used for scraping as well as the to receive collectd data via the write_http plugin. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "0.0.0.0"; + description = '' + Address to listen on for web interface, telemetry and collectd JSON data. + ''; + }; + + collectdBinary = { + enable = mkEnableOption "collectd binary protocol receiver"; + + authFile = mkOption { + default = null; + type = types.nullOr types.path; + description = "File mapping user names to pre-shared keys (passwords)."; + }; + + port = mkOption { + type = types.int; + default = 25826; + description = ''Network address on which to accept collectd binary network packets.''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "0.0.0.0"; + description = '' + Address to listen on for binary network packets. + ''; + }; + + securityLevel = mkOption { + type = types.enum ["None" "Sign" "Encrypt"]; + default = "None"; + description = '' + Minimum required security level for accepted packets. + ''; + }; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the collectd exporter. + ''; + }; + + logFormat = mkOption { + type = types.str; + default = "logger:stderr"; + example = "logger:syslog?appname=bob&local=7 or logger:stdout?json=true"; + description = '' + Set the log target and format. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "info"; + description = '' + Only log messages with the given severity or above. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = (optional cfg.openFirewall cfg.port) ++ + (optional (cfg.openFirewall && cfg.collectdBinary.enable) cfg.collectdBinary.port); + + systemd.services.prometheus-collectd-exporter = { + description = "Prometheus exporter for Collectd metrics"; + unitConfig.Documentation = "https://github.com/prometheus/collectd_exporter"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecStart = '' + ${pkgs.prometheus-collectd-exporter}/bin/collectd_exporter \ + -log.format ${cfg.logFormat} \ + -log.level ${cfg.logLevel} \ + -web.listen-address ${optionalString (cfg.listenAddress != null) cfg.listenAddress}:${toString cfg.port} \ + ${collectSettingsArgs} \ + ${concatStringsSep " " cfg.extraFlags} + ''; + }; + }; + }; +} From 124b3c8eadf2d97c77d50121d1a884b59ec041b7 Mon Sep 17 00:00:00 2001 From: timor Date: Mon, 11 Sep 2017 20:26:24 +0200 Subject: [PATCH 112/115] qfsm: fix build with gcc 6 (#29245) --- .../science/electronics/qfsm/default.nix | 5 ++++- .../science/electronics/qfsm/gcc6-fixes.patch | 20 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch diff --git a/pkgs/applications/science/electronics/qfsm/default.nix b/pkgs/applications/science/electronics/qfsm/default.nix index 56bc66eb3caf..0e2295479af3 100644 --- a/pkgs/applications/science/electronics/qfsm/default.nix +++ b/pkgs/applications/science/electronics/qfsm/default.nix @@ -10,7 +10,10 @@ stdenv.mkDerivation rec { buildInputs = [ qt4 cmake graphviz pkgconfig ]; - patches = [ ./drop-hardcoded-prefix.patch ]; + patches = [ + ./drop-hardcoded-prefix.patch + ./gcc6-fixes.patch + ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch b/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch new file mode 100644 index 000000000000..5cedc6476397 --- /dev/null +++ b/pkgs/applications/science/electronics/qfsm/gcc6-fixes.patch @@ -0,0 +1,20 @@ +--- qfsm-0.54.0-Source-orig/src/FileIO.cpp 2015-01-02 19:01:46.000000000 +0100 ++++ qfsm-0.54.0-Source/src/FileIO.cpp 2017-09-11 19:53:30.579488402 +0200 +@@ -1617,7 +1617,7 @@ + QString ext; + + if (!imp) +- return FALSE; ++ return NULL; + + Project* p=NULL; + importdlg->setAcceptMode(QFileDialog::AcceptOpen); +@@ -1641,7 +1641,7 @@ + ifstream fin(act_importfile); + + if (!fin) +- return FALSE; ++ return NULL; + + emit setWaitCursor(); + From 9f4fa7339b345b43bb399acfb6316e62414cd5b2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 11 Sep 2017 20:31:27 +0200 Subject: [PATCH 113/115] lf: 2017-05-15 -> 2017-09-06 --- pkgs/tools/misc/lf/default.nix | 6 +++--- pkgs/tools/misc/lf/deps.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 503f24946443..b10b7891e5d1 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-05-15"; + version = "2017-09-06"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "9962b378a816c2f792dcbfe9e3f58ae16d5969dd"; # nightly - sha256 = "1ln14ma2iajlp9klj4bhrq0y9955rpw9aggvj7hcj1m5yqa0sdqn"; + rev = "ae4a29e5501f805fadb115658e83df6744a258b2"; # nightly + sha256 = "099ckbnyk08a716fc5qz7yldalb1p9gn2zn8kqp7bp4adi541hid"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index bb136e98d66d..5b014d18dc1c 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "7994c181db7761ca3c67a217068cf31826113f5f"; # master - sha256 = "0ssc54wamn3h8z68kv4fdgvk3kjii95psi2kk0slsilmg5v6jzhj"; + rev = "4ed959e0540971545eddb8c75514973d670cf739"; # master + sha256 = "1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9"; }; } { From bdb120c21e009c25294acc43f976fa08416b2b32 Mon Sep 17 00:00:00 2001 From: Klaas van Schelven Date: Sun, 10 Sep 2017 11:51:54 +0200 Subject: [PATCH 114/115] python.pkgs.recaptcha-client: disable broken versions It seems that the recaptcha-client package is no longer maintained. * The latest released version (1.0.6) is from the year 2011; * The project page does not mention which Python versions are supported * The project is hosted on google code, which is discontinued I was able to succesfully build with Python versions 3.3, 3.4, but not 3.5, 3.6. --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d936e43ad92..baf7bd207aff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18717,6 +18717,8 @@ in { sha256 = "28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f"; }; + disabled = isPy35 || isPy36; + meta = { description = "A CAPTCHA for Python using the reCAPTCHA service"; homepage = http://recaptcha.net/; From 27a4820c748d5e970b8e1abd4dba9b31ce00e850 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Mon, 11 Sep 2017 23:26:40 +0300 Subject: [PATCH 115/115] trezord: rebuild protobuf files This allows it to build with Protobuf 3.6 --- pkgs/servers/trezord/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/trezord/default.nix b/pkgs/servers/trezord/default.nix index 71e51d4c765c..bdc37b700e5d 100644 --- a/pkgs/servers/trezord/default.nix +++ b/pkgs/servers/trezord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp +{ stdenv, fetchgit, fetchFromGitHub, curl, cmake, boost, gcc, protobuf, pkgconfig, jsoncpp , libusb1, libmicrohttpd }: @@ -15,6 +15,13 @@ stdenv.mkDerivation rec { sha256 = "1iaxmwyidjdcrc6jg0859v6v5x3qnz5b0p78pq0bypvmgyijhpm4"; }; + common = fetchFromGitHub { + owner = "trezor"; + repo = "trezor-common"; + rev = "b55fb61218431e9c99c9d6c1673801902fc9e92e"; + sha256 = "1zanbgz1qjs8wfwp0z91sqcvj77a9iis694k415jyd2dn4riqhdg"; + }; + meta = with stdenv.lib; { description = "TREZOR Bridge daemon for TREZOR bitcoin hardware wallet"; homepage = https://mytrezor.com; @@ -40,8 +47,15 @@ stdenv.mkDerivation rec { jsoncpp ]; + preConfigure = '' + ( cd src/config + ln -s $common/protob/config.proto + protoc -I . --cpp_out=. config.proto + ) + ''; + LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ curl ]}"; - cmakeFlags="-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'"; + cmakeFlags = [ "-DJSONCPP_LIBRARY='${jsoncpp}/lib/libjsoncpp.so'" ]; installPhase = '' mkdir -p $out/bin