From 0c726497a221b960c9b019708d6e05affa8165a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 12:43:36 +0100 Subject: [PATCH 001/107] maintainers: added mguentner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b15f4542fb55..39f50d8433c3 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -273,6 +273,7 @@ mdaiter = "Matthew S. Daiter "; meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; + mguentner = "Maximilian Güntner "; mic92 = "Jörg Thalheim "; michaelpj = "Michael Peyton Jones "; michalrus = "Michal Rus "; From 7897a6613e7440343b7743fef28bafcd75812015 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 10 Nov 2016 21:54:37 -0500 Subject: [PATCH 002/107] libLAS: 1.8.0 -> 1.8.1 --- pkgs/development/libraries/libLAS/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libLAS/default.nix b/pkgs/development/libraries/libLAS/default.nix index c67b3701ec91..20531adcd1c7 100644 --- a/pkgs/development/libraries/libLAS/default.nix +++ b/pkgs/development/libraries/libLAS/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, boost, cmake, gdal, libgeotiff, libtiff, LASzip }: stdenv.mkDerivation rec { - name = "libLAS-1.8.0"; + name = "libLAS-1.8.1"; src = fetchurl { url = "http://download.osgeo.org/liblas/${name}.tar.bz2"; - md5 = "599881281d45db4ce9adb2d75458391e"; + sha256 = "0xjfxb3ydvr2258ji3spzyf81g9caap19ql2pk91wiivqsc4mnws"; }; - buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip]; + buildInputs = [ boost cmake gdal libgeotiff libtiff LASzip ]; meta = { From 2350c543f61259469af0594fe7800c067b258484 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 9 Nov 2016 21:51:43 +0100 Subject: [PATCH 003/107] protobuf: refactoring Versions 3.x use a common derivation such as 2.x versions. --- .../libraries/protobuf/3.0.0-beta-2.nix | 43 ++--------------- pkgs/development/libraries/protobuf/3.0.nix | 43 ++--------------- .../libraries/protobuf/generic-v3.nix | 47 +++++++++++++++++++ 3 files changed, 53 insertions(+), 80 deletions(-) create mode 100644 pkgs/development/libraries/protobuf/generic-v3.nix diff --git a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix index a06d4cef968a..26b829669b8e 100644 --- a/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix +++ b/pkgs/development/libraries/protobuf/3.0.0-beta-2.nix @@ -1,43 +1,6 @@ -{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: - -stdenv.mkDerivation rec { - name = "protobuf-${version}"; +{ callPackage, ... }: +callPackage ./generic-v3.nix { version = "3.0.0-beta-2"; - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gmock.source} gmock - chmod -R a+w gmock - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - buildInputs = [ autoreconfHook zlib ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; - }; - - passthru.version = version; + sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1"; } diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix index 16a39daf7907..f80acf462b85 100644 --- a/pkgs/development/libraries/protobuf/3.0.nix +++ b/pkgs/development/libraries/protobuf/3.0.nix @@ -1,43 +1,6 @@ -{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }: - -stdenv.mkDerivation rec { - name = "protobuf-${version}"; +{ callPackage, ... }: +callPackage ./generic-v3.nix { version = "3.0.0"; - # make sure you test also -A pythonPackages.protobuf - src = fetchFromGitHub { - owner = "google"; - repo = "protobuf"; - rev = "v${version}"; - sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; - }; - - postPatch = '' - rm -rf gmock - cp -r ${gmock.source} gmock - chmod -R a+w gmock - '' + stdenv.lib.optionalString stdenv.isDarwin '' - substituteInPlace src/google/protobuf/testing/googletest.cc \ - --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' - ''; - - buildInputs = [ autoreconfHook zlib ]; - - enableParallelBuilding = true; - - doCheck = true; - - meta = { - description = "Google's data interchange format"; - longDescription = - ''Protocol Buffers are a way of encoding structured data in an efficient - yet extensible format. Google uses Protocol Buffers for almost all of - its internal RPC protocols and file formats. - ''; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - homepage = https://developers.google.com/protocol-buffers/; - }; - - passthru.version = version; + sha256 = "05qkcl96lkdama848m7q3nzzzdckjc158iiyvgmln0zi232xx7g7"; } diff --git a/pkgs/development/libraries/protobuf/generic-v3.nix b/pkgs/development/libraries/protobuf/generic-v3.nix new file mode 100644 index 000000000000..5a3738564d7a --- /dev/null +++ b/pkgs/development/libraries/protobuf/generic-v3.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, autoreconfHook, zlib, gmock +, version, sha256 +, ... +}: + +stdenv.mkDerivation rec { + name = "protobuf-${version}"; + + # make sure you test also -A pythonPackages.protobuf + src = fetchFromGitHub { + owner = "google"; + repo = "protobuf"; + rev = "v${version}"; + inherit sha256; + }; + + postPatch = '' + rm -rf gmock + cp -r ${gmock.source} gmock + chmod -R a+w gmock + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + buildInputs = [ autoreconfHook zlib ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = { + description = "Google's data interchange format"; + longDescription = + ''Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + homepage = https://developers.google.com/protocol-buffers/; + }; + + passthru.version = version; +} From 96042412d16fb297722b1f84308f50df13aa8545 Mon Sep 17 00:00:00 2001 From: Antoine Eiche Date: Wed, 9 Nov 2016 22:01:00 +0100 Subject: [PATCH 004/107] protobuf3_1: init at 3.1.0 --- pkgs/development/libraries/protobuf/3.1.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/3.1.nix diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix new file mode 100644 index 000000000000..91ef87512c84 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.1.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.1.0"; + sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..7a678219d7ce 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8821,6 +8821,7 @@ in protobuf3_0 = lowPrio (callPackage ../development/libraries/protobuf/3.0.nix { }); # 3.0.0-beta-2 is only introduced for tensorflow. remove this version when tensorflow is moved to 3.0. protobuf3_0_0b2 = lowPrio (callPackage ../development/libraries/protobuf/3.0.0-beta-2.nix { }); + protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobuf2_6 = callPackage ../development/libraries/protobuf/2.6.nix { }; protobuf2_5 = callPackage ../development/libraries/protobuf/2.5.nix { }; From ee6dfa1e9eafdc21a4ab43b8e18f06c24ef0f670 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 13 Nov 2016 14:04:43 -0500 Subject: [PATCH 005/107] crashplan: 4.7.0r2 -> 4.8.0r1 --- nixos/modules/services/backup/crashplan.nix | 2 +- pkgs/applications/backup/crashplan/default.nix | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index 38cf8eb72fb8..d0af2e416b63 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -49,7 +49,7 @@ with lib; ensureDir ${crashplan.vardir}/backupArchives 700 ensureDir ${crashplan.vardir}/log 777 cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf - for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do + for x in app.asar bin install.vars lang lib libc42archive64.so libc52archive.so libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libleveldb64.so libleveldb.so libmd564.so libmd5.so share skin upgrade; do rm -f ${crashplan.vardir}/$x; ln -sf ${crashplan}/$x ${crashplan.vardir}/$x; done diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index b6c658636bb2..94893a01c74f 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: let - version = "4.7.0"; - rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time + version = "4.8.0"; + rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time in stdenv.mkDerivation rec { name = "crashplan-${version}-r${rev}"; crashPlanArchive = fetchurl { url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "1vi6dqf8kc90axrgdcf6rwnhynxgxkc0qn6pbdp2gvkxdqxrprn8"; + sha256 = "117k9yx10n4lc0hkx0j48f19km0jrdgfq6xmbmhv3v73zbx21axs"; }; srcs = [ crashPlanArchive ]; @@ -43,7 +43,6 @@ in stdenv.mkDerivation rec { install -d -m 755 unpacked $out - install -D -m 644 EULA.txt $out/EULA.txt install -D -m 644 run.conf $out/bin/run.conf install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine From 008399e9de050842f67361fdc911d6b526fca287 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Sun, 13 Nov 2016 14:41:57 -0500 Subject: [PATCH 006/107] add self to crashplan maintainers --- lib/maintainers.nix | 1 + pkgs/applications/backup/crashplan/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 735fc427c3c7..dbe45ee010a8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -198,6 +198,7 @@ jb55 = "William Casarin "; jcumming = "Jack Cummings "; jefdaj = "Jeffrey David Johnson "; + jerith666 = "Matt McHenry "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; jgillich = "Jakob Gillich "; diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 94893a01c74f..1a125de0a872 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; license = licenses.unfree; - maintainers = with maintainers; [ sztupi domenkozar ]; + maintainers = with maintainers; [ sztupi domenkozar jerith666 ]; }; buildInputs = [ makeWrapper cpio ]; From 2548fd6908d38cee7a80d99b0dd68e26935e8df5 Mon Sep 17 00:00:00 2001 From: Corbin Date: Fri, 28 Oct 2016 22:23:53 -0700 Subject: [PATCH 007/107] services/tahoe: SFTP support. --- .../services/network-filesystems/tahoe.nix | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index f1846b963252..f91827c379de 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -138,6 +138,45 @@ in ''; }; helper.enable = mkEnableOption "helper service"; + sftpd.enable = mkEnableOption "SFTP service"; + sftpd.port = mkOption { + default = null; + type = types.nullOr types.int; + description = '' + The port on which the SFTP server will listen. + + This is the correct setting to tweak if you want Tahoe's SFTP + daemon to listen on a different port. + ''; + }; + sftpd.hostPublicKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the SSH host public key. + ''; + }; + sftpd.hostPrivateKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the SSH host private key. + ''; + }; + sftpd.accounts.file = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path to the accounts file. + ''; + }; + sftpd.accounts.url = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + URL of the accounts server. + ''; + }; package = mkOption { default = pkgs.tahoelafs; defaultText = "pkgs.tahoelafs"; @@ -256,6 +295,19 @@ in [helper] enabled = ${if settings.helper.enable then "true" else "false"} + + [sftpd] + enabled = ${if settings.sftpd.enable then "true" else "false"} + ${optionalString (settings.sftpd.port != null) + "port = ${toString settings.sftpd.port}"} + ${optionalString (settings.sftpd.hostPublicKeyFile != null) + "host_pubkey_file = ${settings.sftpd.hostPublicKeyFile}"} + ${optionalString (settings.sftpd.hostPrivateKeyFile != null) + "host_privkey_file = ${settings.sftpd.hostPrivateKeyFile}"} + ${optionalString (settings.sftpd.accounts.file != null) + "accounts.file = ${settings.sftpd.accounts.file}"} + ${optionalString (settings.sftpd.accounts.url != null) + "accounts.url = ${settings.sftpd.accounts.url}"} ''; }); # Actually require Tahoe, so that we will have it installed. From c0f9bc9b4eca7c4d58235d62dc886dc04f5abded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 10 Nov 2016 23:56:50 +0100 Subject: [PATCH 008/107] wireguard: 2016-10-25 -> 0.0.20161110 --- pkgs/os-specific/linux/wireguard/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 14974f6d43fc..54f49bba32b3 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -2,17 +2,15 @@ # module requires Linux >= 4.1 https://www.wireguard.io/install/#kernel-requirements assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.1"; -# module is incompatible with the PaX constification plugin -assert kernel != null -> !(kernel.features.grsecurity or false); let - name = "wireguard-unstable-${version}"; + name = "wireguard-experimental-${version}"; - version = "2016-10-25"; + version = "0.0.20161110"; src = fetchurl { - url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161025.tar.xz"; - sha256 = "09rhap3dzb8rcq1a1af9inf1qz7161yghafbgpbnd9dg016vhgs3"; + url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-${version}.tar.xz"; + sha256 = "13z416k64gnkp9248h846h40ph83ms7l9mm9b9xpki17j5q7hm10"; }; meta = with stdenv.lib; { From e2c4c64668e56446c0769c75a3ea1c656917d9a0 Mon Sep 17 00:00:00 2001 From: Adam Beckmeyer Date: Mon, 14 Nov 2016 16:28:09 -0500 Subject: [PATCH 009/107] Python: pint: init at 0.7.2 --- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e84a6a9a392..96c412551d26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14878,6 +14878,22 @@ in { }; }; + pint = buildPythonPackage rec { + name = "pint-${version}"; + version = "0.7.2"; + + meta = { + description = "Physical quantities module"; + license = licenses.bsd3; + homepage = "https://github.com/hgrecco/pint/"; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pint/Pint-${version}.tar.gz"; + sha256 = "1bbp5s34gcb9il2wyz4spznshahwbjvwi5bhjm7bnxk358spvf9q"; + }; + }; + pygal = buildPythonPackage rec { version = "2.0.10"; name = "pygal-${version}"; From 999ac3056d81dab04e9406771a73753d47985a3a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 01:22:31 +0100 Subject: [PATCH 010/107] cjdns test: fix typo Noticed by @vcunat https://github.com/NixOS/nixpkgs/commit/daf3ba426b2558e73ef2742fab1a73c782ef62a6#commitcomment-19820962 --- nixos/tests/cjdns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/cjdns.nix b/nixos/tests/cjdns.nix index f61c82b916ad..f32ec52dfc26 100644 --- a/nixos/tests/cjdns.nix +++ b/nixos/tests/cjdns.nix @@ -54,7 +54,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.cjdns = { UDPInterface = { bind = "0.0.0.0:1024"; - connectTo."192.168.0.1:1024}" = + connectTo."192.168.0.1:1024" = { password = carolPassword; publicKey = carolPubKey; }; From 02e9c88d778b06909d4ef5a2e7e417aaeecb89a7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Tue, 15 Nov 2016 02:02:25 +0100 Subject: [PATCH 011/107] clamav: don't bundle freshclam config with package Building clamav is expensive due to the bundled llvm. Closes #20304. --- nixos/modules/services/security/clamav.nix | 2 +- pkgs/tools/security/clamav/default.nix | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index e4e5c1253b77..89ac1c01f521 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -16,7 +16,7 @@ let ${cfg.daemon.extraConfig} ''; - pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; }; + pkg = pkgs.clamav; in { options = { diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 0cb34b2e73c9..7473f056ce97 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl -, libmilter, pcre, freshclamConf ? null }: +, libmilter, pcre }: stdenv.mkDerivation rec { name = "clamav-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "0yh2q318bnmf2152g2h1yvzgqbswn0wvbzb8p4kf7v057shxcyqn"; }; - buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ]; + buildInputs = [ + zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre + ]; configureFlags = [ "--with-zlib=${zlib.dev}" @@ -22,11 +24,8 @@ stdenv.mkDerivation rec { "--with-libcurl=${curl.dev}" "--with-pcre=${pcre.dev}" "--enable-milter" - "--disable-clamav" ]; - fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else ""; - meta = with stdenv.lib; { homepage = http://www.clamav.net; description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats"; From 72b1ea861cf819e22b87a7f3a136857451cc3a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 12:46:49 +0100 Subject: [PATCH 012/107] libdivecomputer: init at 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../libraries/libdivecomputer/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libdivecomputer/default.nix diff --git a/pkgs/development/libraries/libdivecomputer/default.nix b/pkgs/development/libraries/libdivecomputer/default.nix new file mode 100644 index 000000000000..23ab36fe09f0 --- /dev/null +++ b/pkgs/development/libraries/libdivecomputer/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libdivecomputer-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "http://www.libdivecomputer.org/releases/${name}.tar.gz"; + sha256 = "11n2qpqg4b2h7mqifp9qm5gm1aqwy7wj1j4j5ha0wdjf55zzy30y"; + }; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.libdivecomputer.org; + description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + maintainers = [ maintainers.mguentner ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e6a3f16f569..e1cf864ce97b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7665,6 +7665,8 @@ in libdiscid = callPackage ../development/libraries/libdiscid { }; + libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; + libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; From 12f7968273156b80a73cb7031b37af213fae125a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 13:00:50 +0100 Subject: [PATCH 013/107] libmarble-ssrf: init at 2016-11-09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- .../libraries/libmarble-ssrf/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/libmarble-ssrf/default.nix diff --git a/pkgs/development/libraries/libmarble-ssrf/default.nix b/pkgs/development/libraries/libmarble-ssrf/default.nix new file mode 100644 index 000000000000..1d6c54134393 --- /dev/null +++ b/pkgs/development/libraries/libmarble-ssrf/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, doxygen, pkgconfig, cmake, qtbase, qtscript, qtquick1 }: + +stdenv.mkDerivation rec { + name = "libmarble-ssrf-${version}"; + version = "2016-11-09"; + + src = fetchgit { + sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; + url = "git://git.subsurface-divelog.org/marble"; + rev = "4325da93b7516abb6f93a1417adc10593dacd794"; + }; + + buildInputs = [ qtbase qtscript qtquick1 ]; + nativeBuildInputs = [ doxygen pkgconfig cmake ]; + + enableParallelBuilding = true; + + preConfigure = '' + cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Release \ + -DQTONLY=TRUE -DQT5BUILD=ON \ + -DBUILD_MARBLE_TESTS=NO \ + -DWITH_DESIGNER_PLUGIN=NO \ + -DBUILD_MARBLE_APPS=NO" + ''; + + meta = with stdenv.lib; { + description = "Qt library for a slippy map with patches from the Subsurface project"; + homepage = "http://subsurface-divelog.org"; + license = licenses.lgpl21; + maintainers = [ maintainers.mguentner ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1cf864ce97b..9c546d7b6b8e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2368,6 +2368,8 @@ in makebootfat = callPackage ../tools/misc/makebootfat { }; + libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { }; + matrix-synapse = callPackage ../servers/matrix-synapse { }; memtester = callPackage ../tools/system/memtester { }; From 2e15a8f2dde53484082d48b14d3557b8009f61ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 13:02:13 +0100 Subject: [PATCH 014/107] libgit2: reinit at 0.23.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- pkgs/development/libraries/git2/0.23.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/git2/0.23.nix diff --git a/pkgs/development/libraries/git2/0.23.nix b/pkgs/development/libraries/git2/0.23.nix new file mode 100644 index 000000000000..3cf429ab1d73 --- /dev/null +++ b/pkgs/development/libraries/git2/0.23.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, http-parser, libiconv }: + +stdenv.mkDerivation (rec { + version = "0.23.2"; + name = "libgit2-${version}"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/libgit2/libgit2/tarball/v${version}"; + sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; + }; + + cmakeFlags = "-DTHREADSAFE=ON"; + + nativeBuildInputs = [ cmake python pkgconfig ]; + buildInputs = [ zlib libssh2 openssl http-parser ]; + + meta = { + description = "the Git linkable library"; + homepage = http://libgit2.github.com/; + license = stdenv.lib.licenses.gpl2; + platforms = with stdenv.lib.platforms; all; + }; +} // stdenv.lib.optionalAttrs (!stdenv.isLinux) { + NIX_LDFLAGS = "-liconv"; + propagatedBuildInputs = [ libiconv ]; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c546d7b6b8e..da3a256b2a9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7031,6 +7031,7 @@ in ); libgit2_0_21 = callPackage ../development/libraries/git2/0.21.nix { }; + libgit2_0_23 = callPackage ../development/libraries/git2/0.23.nix { }; gle = callPackage ../development/libraries/gle { }; From 90377526eba1b9d0747f541e21340578369796b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 10 Nov 2016 13:02:53 +0100 Subject: [PATCH 015/107] subsurface: init at 4.5.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Maximilian Güntner --- pkgs/applications/misc/subsurface/default.nix | 64 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++ 2 files changed, 69 insertions(+) create mode 100644 pkgs/applications/misc/subsurface/default.nix diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix new file mode 100644 index 000000000000..be4a004fb8ba --- /dev/null +++ b/pkgs/applications/misc/subsurface/default.nix @@ -0,0 +1,64 @@ +{ + stdenv, + cmake, + curl, + fetchgit, + grantlee, + libdivecomputer, + libgit2, + libmarble-ssrf, + libssh2, + libxml2, + libxslt, + libzip, + pkgconfig, + qtbase, + qtconnectivity, + qttools, + qtwebkit, + sqlite +}: + +stdenv.mkDerivation rec { + version = "4.5.6"; + name = "subsurface-${version}"; + + # use fetchgit instead of the official tgz is not complete + src = fetchgit { + sha256 = "156rqcszy0c4plk2mv7wdd4h7s7mygpq5sdc64pjfs4qvvsdj10f"; + url = "git://git.subsurface-divelog.org/subsurface"; + rev = "4d8d7c2a0fa1b4b0e6953d92287c75b6f97472d0"; + branchName = "v4.5-branch"; + }; + + buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt + libzip libxml2 grantlee qtwebkit qttools + qtconnectivity libgit2 libssh2 curl ]; + nativeBuildInputs = [ pkgconfig cmake ]; + + enableParallelBuilding = true; + + # hack incoming... + preConfigure = '' + marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so) + cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \ + -DMARBLE_LIBRARIES=$marble_libs \ + -DNO_PRINTING=OFF \ + -DUSE_LIBGIT23_API=1" + ''; + + meta = with stdenv.lib; { + description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux"; + longDescription = '' + Subsurface can track single- and multi-tank dives using air, Nitrox or TriMix. + It allows tracking of dive locations including GPS coordinates (which can also + conveniently be entered using a map interface), logging of equipment used and + names of other divers, and lets users rate dives and provide additional notes. + ''; + homepage = https://subsurface-divelog.org; + license = licenses.gpl2; + maintainers = [ maintainers.mguentner ]; + platforms = platforms.all; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da3a256b2a9f..e797055daead 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3718,6 +3718,11 @@ in sstp = callPackage ../tools/networking/sstp {}; + subsurface = + qt55.callPackage ../applications/misc/subsurface { + libgit2 = pkgs.libgit2_0_23; + }; + sudo = callPackage ../tools/security/sudo { }; suidChroot = callPackage ../tools/system/suid-chroot { }; From 520db3b907243e427982988b7ca3c75b1d65dc81 Mon Sep 17 00:00:00 2001 From: Justin Wood Date: Tue, 15 Nov 2016 00:54:52 -0500 Subject: [PATCH 016/107] beamPackages.hex: 0.11.3 -> 0.14.0 (#19994) --- pkgs/development/beam-modules/hex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix index 2cb06b07e597..69559a26c8fa 100644 --- a/pkgs/development/beam-modules/hex/default.nix +++ b/pkgs/development/beam-modules/hex/default.nix @@ -8,13 +8,13 @@ let pkg = self: stdenv.mkDerivation rec { name = "hex"; - version = "v0.11.3"; + version = "v0.14.0"; src = fetchFromGitHub { owner = "hexpm"; repo = "hex"; - rev = "f5e200ad95f030f0a7ab88a86545dd0dde1ee521"; - sha256 = "0n4cgmnbmglarydls9pmxznbzp49pv85ncbd4f2lp1fm7qr08xfw"; + rev = "${version}"; + sha256 = "042rcwznb6cf9khn4l969axf7vhk53gy3rp23y6c8fhfp1472pai"; }; setupHook = writeText "setupHook.sh" '' From 9cbf8a06526385482e9732f9283fe73674756c02 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Mon, 14 Nov 2016 22:04:32 -0800 Subject: [PATCH 017/107] Fix buildMachines example: use lists, not string (#20361) Using the example before this commit resulted in the following error: ``` error: value is a string while a list was expected, at /nix/var/nix/profiles/per-user/root/channels/nixos/nixpkgs/nixos/modules/services/misc/nix-daemon.nix:349:37 ``` --- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 333782d15bcb..e2bbd4b01aa1 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -172,8 +172,8 @@ in sshKey = "/root/.ssh/id_buildfarm"; system = "x86_64-linux"; maxJobs = 2; - supportedFeatures = "kvm"; - mandatoryFeatures = "perf"; + supportedFeatures = [ "kvm" ]; + mandatoryFeatures = [ "perf" ]; } ]; description = '' From bf570a494abfbf093afe90f19b50c33a86023498 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 15 Nov 2016 11:11:52 +0100 Subject: [PATCH 018/107] digikam5: 5.1.0 -> 5.3.0 --- pkgs/applications/graphics/digikam/{5.1.nix => 5.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename pkgs/applications/graphics/digikam/{5.1.nix => 5.nix} (95%) diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.nix similarity index 95% rename from pkgs/applications/graphics/digikam/5.1.nix rename to pkgs/applications/graphics/digikam/5.nix index 6bd572e99bba..3e5d1b7b52ef 100644 --- a/pkgs/applications/graphics/digikam/5.1.nix +++ b/pkgs/applications/graphics/digikam/5.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation rec { name = "digikam-${version}"; - version = "5.1.0"; + version = "5.3.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; - sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7"; + sha256 = "0p1y5kgkz7lzzqpf7qd3mmg59zfdkkz9jg7knldd8dl94wkzlv5k"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db2102238f1b..4e03e6eaa75d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15519,7 +15519,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam5 = kde5.callPackage ../applications/graphics/digikam/5.1.nix {}; + digikam5 = kde5.callPackage ../applications/graphics/digikam/5.nix {}; drumkv1 = callPackage ../applications/audio/drumkv1 { }; From afab1a948eef1b0f1579a8cd50b77b7f2761ae78 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 13:11:25 +0100 Subject: [PATCH 019/107] grsecurity: 4.8.7-201611102210 -> 201611142350 --- pkgs/os-specific/linux/kernel/patches.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 3d4ba5d2b58d..2f7398a0a4b2 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -87,8 +87,8 @@ rec { grsecurity_testing = grsecPatch { kver = "4.8.7"; - grrev = "201611102210"; - sha256 = "1n7avhvzy4njf9wky38l99i18v1rr05bgspivnp440j8d6nh60nh"; + grrev = "201611142350"; + sha256 = "002zm8j130ras0dabp95bb82c5h8y9z66jl81jip226y3bk3b019"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From 12951219c61d4070a786366ca5aa3f601b4aae64 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 14 Nov 2016 09:35:34 -0600 Subject: [PATCH 020/107] ldns: multiple outputs --- pkgs/development/libraries/ldns/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index c279d698e129..883625e551a7 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1kf8pkwhcssvgzhh6ha1pjjiziwvwmfaali7kaafh6118mcy124b"; }; + outputs = [ "out" "dev" ]; + patches = [ ./perl-5.22-compat.patch ]; postPatch = '' @@ -19,6 +21,10 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl=${openssl.dev}" "--with-drill" ]; + postInstall = '' + moveToOutput "bin/ldns-config" "$dev" + ''; + meta = with stdenv.lib; { description = "Library with the aim of simplifying DNS programming in C"; license = licenses.bsd3; From ec63ae31eb15a938bbf1f891fc16cb4ff1a5eaba Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Nov 2016 11:46:44 -0600 Subject: [PATCH 021/107] kde5.applications: 16.08.2 -> 16.08.3 --- pkgs/desktops/kde-5/applications/fetch.sh | 2 +- pkgs/desktops/kde-5/applications/srcs.nix | 2064 ++++++++++----------- 2 files changed, 1033 insertions(+), 1033 deletions(-) diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index 666acf1a8cb4..845548c4f5bc 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.2/ --cut-dirs=1 -A '*.tar.xz' ) +WGET_ARGS=( http://ftp.ussg.iu.edu/kde/stable/applications/16.08.3/ --cut-dirs=1 -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index a8c984ad6457..f6f13a2f2e5e 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -3,2067 +3,2067 @@ { akonadi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-16.08.2.tar.xz"; - sha256 = "141da3xj9d5gwksh9lz93s4zsvpadf314345ai6lirhhi99683g6"; - name = "akonadi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-16.08.3.tar.xz"; + sha256 = "1k967l551r4kzj2hyfikr7ky8n77rhcniscw7f8a42vmdxnr5jvy"; + name = "akonadi-16.08.3.tar.xz"; }; }; akonadi-calendar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-calendar-16.08.2.tar.xz"; - sha256 = "0jpmh5051mxcndaf1clldz7zzfhfyi8qxz87lj20s0d4gzrf6cpw"; - name = "akonadi-calendar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-calendar-16.08.3.tar.xz"; + sha256 = "1wh69vns5aw2av1hfcrz0gymqv8884xl0ss0yvcg9s478l550yj9"; + name = "akonadi-calendar-16.08.3.tar.xz"; }; }; akonadi-contacts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-contacts-16.08.2.tar.xz"; - sha256 = "0d3cjyq4i778zvy13wm2gfpzkibsr17wgxydqm5ac5wkl30wb07l"; - name = "akonadi-contacts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-contacts-16.08.3.tar.xz"; + sha256 = "12cdqkx7i7wahqf5zb4dxmbvzidvxw77imsjqaw0qw7jd5hnybmd"; + name = "akonadi-contacts-16.08.3.tar.xz"; }; }; akonadi-mime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-mime-16.08.2.tar.xz"; - sha256 = "0q1g6g1dyj82ya8dfnq87asx9qnmqypsmb873y20i8x3pkzjwzld"; - name = "akonadi-mime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-mime-16.08.3.tar.xz"; + sha256 = "1jlsqlfyr1rl1ny2nyccwiqzs72fi2qzim3qg4j6749y3imi8rvx"; + name = "akonadi-mime-16.08.3.tar.xz"; }; }; akonadi-notes = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-notes-16.08.2.tar.xz"; - sha256 = "0ryw21y25iq28rn75gibfxlwgyx0fz1y37lkgnqfcl3mwj16gcb4"; - name = "akonadi-notes-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-notes-16.08.3.tar.xz"; + sha256 = "1fmpsqywpv4p65kdlisy5z57zba34h70djcdh3ch5rmmsxz75c0s"; + name = "akonadi-notes-16.08.3.tar.xz"; }; }; akonadi-search = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/akonadi-search-16.08.2.tar.xz"; - sha256 = "063y170nfdi279pbh9zdyhrga2hf0xsb20bn2p210vhmwhi7l51r"; - name = "akonadi-search-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/akonadi-search-16.08.3.tar.xz"; + sha256 = "1whj5vzg33nlh756n5jcw2fj6yqf7wmq4lpvsj8k7hs9gnw7vqzd"; + name = "akonadi-search-16.08.3.tar.xz"; }; }; analitza = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/analitza-16.08.2.tar.xz"; - sha256 = "1rh58dfpnxyahpqz49p935pa01mxci9bbqddayv1807my2i5kz2h"; - name = "analitza-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/analitza-16.08.3.tar.xz"; + sha256 = "0q9336z6468qsw1rqlifagwppwanrnpr23srqqgifwi4wh25ky7q"; + name = "analitza-16.08.3.tar.xz"; }; }; ark = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ark-16.08.2.tar.xz"; - sha256 = "043nl64g6374diczkrq7prid4fr8ll625df2nhqnaz79fnh1ysv8"; - name = "ark-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ark-16.08.3.tar.xz"; + sha256 = "021cjgw25zryjwmbslbnm5vg5ddgl5knxvqldrwjjhkqw2pzc4y7"; + name = "ark-16.08.3.tar.xz"; }; }; artikulate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/artikulate-16.08.2.tar.xz"; - sha256 = "1pcpwqpd7xk796bc5gyydqqrvqm592jhyh8swvlsdqadczlqnn9h"; - name = "artikulate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/artikulate-16.08.3.tar.xz"; + sha256 = "0g5ya2cyjpnrzsccdqja1z6x5hh49a9r9m6c8408hv8bssigyvd1"; + name = "artikulate-16.08.3.tar.xz"; }; }; audiocd-kio = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/audiocd-kio-16.08.2.tar.xz"; - sha256 = "0m85j4lrdas47l501f20i44q7w7qwxvpdy754zp4nf5wzm7nvjdv"; - name = "audiocd-kio-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/audiocd-kio-16.08.3.tar.xz"; + sha256 = "1d7qxp6v1g9rpjfh457hzi7h67d9550wa3fm4d4xja227zqqx63q"; + name = "audiocd-kio-16.08.3.tar.xz"; }; }; baloo-widgets = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/baloo-widgets-16.08.2.tar.xz"; - sha256 = "1r784qd1j3y1ff6y494m8qyfdjsz626agwdj05h6igngvw1ywff2"; - name = "baloo-widgets-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/baloo-widgets-16.08.3.tar.xz"; + sha256 = "04zm0jfpvnq821kcjylac7g0zlwldkvxadmrvj9qy28vh4k8wi3m"; + name = "baloo-widgets-16.08.3.tar.xz"; }; }; blinken = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/blinken-16.08.2.tar.xz"; - sha256 = "0nqkw6abnzbx80d25ba0b6bix1ngr3wfrxlfjqdk4gmb1m34dkcm"; - name = "blinken-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/blinken-16.08.3.tar.xz"; + sha256 = "0r71s877dhf3ib3hwhfl3k3ldz671dw6ym3jjnavp2pl6h0wc6hv"; + name = "blinken-16.08.3.tar.xz"; }; }; bomber = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/bomber-16.08.2.tar.xz"; - sha256 = "1zcqxkfy57lw03v6fpf44asbdf8q9ivn323li9ks0kwzzc2nk7f9"; - name = "bomber-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/bomber-16.08.3.tar.xz"; + sha256 = "1cqdv36s1y92hk9ghvm3ha67b1j7h7srv6cig6m5rvyaxpy2gw4f"; + name = "bomber-16.08.3.tar.xz"; }; }; bovo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/bovo-16.08.2.tar.xz"; - sha256 = "0clbhcg6bw8nrjw3nynlhcglgxasxw2b15ski25cf9cvrq3cahn7"; - name = "bovo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/bovo-16.08.3.tar.xz"; + sha256 = "0z6ij7p0vckni0aa412ap8agcqrid98qif3c655m69hmw3arf6k9"; + name = "bovo-16.08.3.tar.xz"; }; }; calendarsupport = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/calendarsupport-16.08.2.tar.xz"; - sha256 = "1h9w8mk2gwnfbm9520bfmqbzjjg1211lpvzbq8ba4jg3l99d69j6"; - name = "calendarsupport-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/calendarsupport-16.08.3.tar.xz"; + sha256 = "1r8v1sydragkf9gcvkc9rjlm9h7mah01ayw5pg8pjaxhbfsva8ad"; + name = "calendarsupport-16.08.3.tar.xz"; }; }; cantor = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/cantor-16.08.2.tar.xz"; - sha256 = "1zi989fklw4qs0yj2zs0rpbaq1yfd9dax6ric376s2r85mrdfvjc"; - name = "cantor-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/cantor-16.08.3.tar.xz"; + sha256 = "0i2sd4vp7dvqjh41rr4wv9ij1jriyj9kn69z9i0iig389gwza0n7"; + name = "cantor-16.08.3.tar.xz"; }; }; cervisia = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/cervisia-16.08.2.tar.xz"; - sha256 = "1pnjiww36689vzqg8aixn8q7jf9j295i18gr8ggck80ccxrrf7rd"; - name = "cervisia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/cervisia-16.08.3.tar.xz"; + sha256 = "14p6j8nzdjn2s4v0h5yj8r3yl89sq93z7naq2bifg7nxalazbz27"; + name = "cervisia-16.08.3.tar.xz"; }; }; dolphin = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dolphin-16.08.2.tar.xz"; - sha256 = "1d6r7fi4cmdhxbrks8x0ar9s147zi4d6ap1pbxjmlxfa1v7jmmls"; - name = "dolphin-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dolphin-16.08.3.tar.xz"; + sha256 = "0zqv75d06s7c59yx2w4dkr37mhafhwys4fqp44mpbf1x8yw1ijgx"; + name = "dolphin-16.08.3.tar.xz"; }; }; dolphin-plugins = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dolphin-plugins-16.08.2.tar.xz"; - sha256 = "0cpcfgl77s02zi4hhsg9fnnmfrl0crk8vyacfis8j59zwcjf5n3d"; - name = "dolphin-plugins-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dolphin-plugins-16.08.3.tar.xz"; + sha256 = "05rdq5zgp8px9gii4wnnf3qpwnv4h5i621q72ain0mpvapzb3q4v"; + name = "dolphin-plugins-16.08.3.tar.xz"; }; }; dragon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/dragon-16.08.2.tar.xz"; - sha256 = "0rv300ggjz4mclw5k406hjbg0a7jh5gkp9ycb897qaj4cfzw59x8"; - name = "dragon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/dragon-16.08.3.tar.xz"; + sha256 = "0s94vnr9hz5gzgs555phwl9y9m9jw0ysimv56mh8n56f6ar9za5m"; + name = "dragon-16.08.3.tar.xz"; }; }; eventviews = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/eventviews-16.08.2.tar.xz"; - sha256 = "1mphb53nl2y8z42m47prh9nm6s42z2xcsk3c0ssk5glyq52g3z00"; - name = "eventviews-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/eventviews-16.08.3.tar.xz"; + sha256 = "1qsjmym821b7v81rxb9af30idny4zw3czzkqx3370wa6hbsma9b2"; + name = "eventviews-16.08.3.tar.xz"; }; }; ffmpegthumbs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ffmpegthumbs-16.08.2.tar.xz"; - sha256 = "1q2gkbfy57r23k7wchlnxmcy0phw41rwz5hl7mi9hliz1dlvkhc0"; - name = "ffmpegthumbs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ffmpegthumbs-16.08.3.tar.xz"; + sha256 = "0j9c65kl6gh3j5g5jvjjx3hb3s5hcyzy6hz1fswp2v9sihaf7jrc"; + name = "ffmpegthumbs-16.08.3.tar.xz"; }; }; filelight = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/filelight-16.08.2.tar.xz"; - sha256 = "0jw6vpd6nnn9fbmfcas5g938ir7q3sk5b0x6advspci0asngnins"; - name = "filelight-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/filelight-16.08.3.tar.xz"; + sha256 = "07hc63cabv237nq38x8dnjqnfpicw6czliar0yc66k37vhdxvkjh"; + name = "filelight-16.08.3.tar.xz"; }; }; gpgmepp = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/gpgmepp-16.08.2.tar.xz"; - sha256 = "0828qlhdi1i26n2xgyb01c0q77m6jlppbxv6mprryxq0ma88940a"; - name = "gpgmepp-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/gpgmepp-16.08.3.tar.xz"; + sha256 = "0sda2ib5ymyzsji2v7aqdgfy6mhhfs6s3wyngb2k3q8hshv4xi5z"; + name = "gpgmepp-16.08.3.tar.xz"; }; }; granatier = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/granatier-16.08.2.tar.xz"; - sha256 = "0qx1rlgm9dznk387yv6ylvi2i97a652bi1nvr86syiwgydawb5ag"; - name = "granatier-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/granatier-16.08.3.tar.xz"; + sha256 = "07lhy7zbykhcnfyiymw6xhdpg8ng6xn0k3fca6afi16a0zk1hpnl"; + name = "granatier-16.08.3.tar.xz"; }; }; grantleetheme = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/grantleetheme-16.08.2.tar.xz"; - sha256 = "0mviqfbzd8jb8ni4maydcdni034p52wm2ndms0r5f4az5mq1vs8i"; - name = "grantleetheme-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/grantleetheme-16.08.3.tar.xz"; + sha256 = "1s2rz8ahm0dxij8v9czb1qcasp1igr20ipb4hc34y5ds9vmwrc7i"; + name = "grantleetheme-16.08.3.tar.xz"; }; }; gwenview = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/gwenview-16.08.2.tar.xz"; - sha256 = "0y2pk0a0wk2srfcyk401ymy2qmp413448r7larmgnw1yy0fbp8l2"; - name = "gwenview-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/gwenview-16.08.3.tar.xz"; + sha256 = "122nd5chwf6mcj3d7wz0jwz9wrzw1dk5c29nb7k8kbapsrhs27x3"; + name = "gwenview-16.08.3.tar.xz"; }; }; incidenceeditor = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/incidenceeditor-16.08.2.tar.xz"; - sha256 = "1z25z2pc3m6lnw3hpcjrrpj0f8jfbjav4i9kz6f97cs1rrklabym"; - name = "incidenceeditor-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/incidenceeditor-16.08.3.tar.xz"; + sha256 = "03kfjkxmjjwb974gplqhwvjiw6cgvxziqzrn4jmk3di3nl954mxj"; + name = "incidenceeditor-16.08.3.tar.xz"; }; }; jovie = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/jovie-16.08.2.tar.xz"; - sha256 = "1iia5ja90ypid2mm59njr2jg4hlsqz727fipa1v88c5nx31fqn9s"; - name = "jovie-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/jovie-16.08.3.tar.xz"; + sha256 = "1lb3qnhdc2prrbi07gwvgx0bca2w4w5zwllp547h4lgjjc69s1mv"; + name = "jovie-16.08.3.tar.xz"; }; }; juk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/juk-16.08.2.tar.xz"; - sha256 = "0l0scc3706ap2jfyvhv0shp3l5jw5r5jma1y6ikv0r85h9sxv6lw"; - name = "juk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/juk-16.08.3.tar.xz"; + sha256 = "1c83nm0rr6d67666pd1fynxgsxkhlfz1y3dkfm8mvxd7hx7164x3"; + name = "juk-16.08.3.tar.xz"; }; }; kaccessible = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccessible-16.08.2.tar.xz"; - sha256 = "1j7zm4qk0sfax3h85mljrh40ys0snmilj5fqbqv5cad8kna3v3gg"; - name = "kaccessible-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccessible-16.08.3.tar.xz"; + sha256 = "0p2w862dkzngmryfj46xnam50gcv516igdgs8skcj9jw19gr828q"; + name = "kaccessible-16.08.3.tar.xz"; }; }; kaccounts-integration = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccounts-integration-16.08.2.tar.xz"; - sha256 = "03k7h6lg39d6yvmz6b1i9a4cfakfncr91iw5bvy47xf4myp16dkr"; - name = "kaccounts-integration-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccounts-integration-16.08.3.tar.xz"; + sha256 = "03cf9nb2bxzx5kq0a94y1b1jj7ypidnpkcfbixdmkwfwwybrfm0w"; + name = "kaccounts-integration-16.08.3.tar.xz"; }; }; kaccounts-providers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kaccounts-providers-16.08.2.tar.xz"; - sha256 = "1lz3wx78h0kpc218ngrgqnws89ar1cpra0h7dywswvh3ndnd1iiz"; - name = "kaccounts-providers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kaccounts-providers-16.08.3.tar.xz"; + sha256 = "06ccw3ncliyhjwv2mv8yxmhxl161q51k740yilbgf3lz1qywn3bz"; + name = "kaccounts-providers-16.08.3.tar.xz"; }; }; kajongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kajongg-16.08.2.tar.xz"; - sha256 = "08wz24z1rdqz3vkg0vwfm2w6mjl8psbs1c13x4h3ia2l456b2y73"; - name = "kajongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kajongg-16.08.3.tar.xz"; + sha256 = "0hkc50rd8yag9dlc27fp633fn1zf0g81d605d29n96kxj03shdah"; + name = "kajongg-16.08.3.tar.xz"; }; }; kalarmcal = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalarmcal-16.08.2.tar.xz"; - sha256 = "0h9xx2k78i0jyiqn4rcr79lcgqp7zsy980mbvv5zyddisjs5hd9x"; - name = "kalarmcal-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalarmcal-16.08.3.tar.xz"; + sha256 = "06arrlsws3a3arsixd33dna2ghq4wywka3dmvgdl8g0cjrcm5c18"; + name = "kalarmcal-16.08.3.tar.xz"; }; }; kalgebra = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalgebra-16.08.2.tar.xz"; - sha256 = "02y4nrkf7dk8crmqdz7wg6gflm0zg3392m55zfsj6ad3vy78p1gg"; - name = "kalgebra-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalgebra-16.08.3.tar.xz"; + sha256 = "0g5xqwbxmrhhxmhsi1d2sllnr9sg64pa3wrlhpwcag9l4rggl902"; + name = "kalgebra-16.08.3.tar.xz"; }; }; kalzium = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kalzium-16.08.2.tar.xz"; - sha256 = "0jl77cr107gykfkdkxgnknlg1rhb9w6llwhva6863v57n6gq1hgh"; - name = "kalzium-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kalzium-16.08.3.tar.xz"; + sha256 = "1ywhn0rmqyl9cvzg4jybhl4bvllgbaj2j0cm2pd93ssnp2ispvnp"; + name = "kalzium-16.08.3.tar.xz"; }; }; kamera = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kamera-16.08.2.tar.xz"; - sha256 = "1pghfxs3l20iv92dl39qh9rvdgqcrzmlrwjbmdjs8rdyb4cm0ivc"; - name = "kamera-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kamera-16.08.3.tar.xz"; + sha256 = "0lx0yqj0xd5878pb3nqfj0ibs3m78s1c3hx2hayny8i00nq2vm33"; + name = "kamera-16.08.3.tar.xz"; }; }; kanagram = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kanagram-16.08.2.tar.xz"; - sha256 = "0q4v7g0a746qj62vjy09z5d50b6p6x3dfzciracz3jngsbngkkh6"; - name = "kanagram-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kanagram-16.08.3.tar.xz"; + sha256 = "0bci8h83jww94yqv1i6xxznhi2r755fs29qxb85wmgcnff0bfmlj"; + name = "kanagram-16.08.3.tar.xz"; }; }; kapman = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kapman-16.08.2.tar.xz"; - sha256 = "0rfbn8p2fbgb3w9w7kn6s7q8yk6024sqc5l1f2k1b79g4f3mng82"; - name = "kapman-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kapman-16.08.3.tar.xz"; + sha256 = "0fb6czdgpm19hgf3dpvj1hj7hh1zq226i00hi4qdakfwxpngxrav"; + name = "kapman-16.08.3.tar.xz"; }; }; kapptemplate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kapptemplate-16.08.2.tar.xz"; - sha256 = "1anjn061cbssbdvv9mvbafjwpxck9lxvxrmbjj1hq4z47z2hdh4h"; - name = "kapptemplate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kapptemplate-16.08.3.tar.xz"; + sha256 = "1f3zy1ffhhd3gn9pfmjf2igcka1xlik4vwmpxgb56gq5kw7y8glj"; + name = "kapptemplate-16.08.3.tar.xz"; }; }; kate = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kate-16.08.2.tar.xz"; - sha256 = "0ch23k1n3csk2pc8xmsbp262ya3vng3n5lc3hcr2g03jkrjab214"; - name = "kate-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kate-16.08.3.tar.xz"; + sha256 = "0xsfak6bb7nzik6dk840xv37ys4pz58908zx76z7i4vl6yqyyjxy"; + name = "kate-16.08.3.tar.xz"; }; }; katomic = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/katomic-16.08.2.tar.xz"; - sha256 = "07njyf7lnysvy2h6jql0z28yl1h6j3njrqnlxz4mf83ds09d73w6"; - name = "katomic-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/katomic-16.08.3.tar.xz"; + sha256 = "17q5gwd40vxamwbdrayfhayh2qbrm4i2y9hawx63dqdvc20ijj0z"; + name = "katomic-16.08.3.tar.xz"; }; }; kblackbox = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblackbox-16.08.2.tar.xz"; - sha256 = "13spiwy2sjcfiz7hjg2jrx5aflnmccg3d5ki37bk72vcwg21i30y"; - name = "kblackbox-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblackbox-16.08.3.tar.xz"; + sha256 = "0vpyclqzxafjnvlkkvg9czimqr9l610vnhlw11ia032haffq4qrf"; + name = "kblackbox-16.08.3.tar.xz"; }; }; kblocks = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblocks-16.08.2.tar.xz"; - sha256 = "0ck0b8jxxcpz84sailh4i9c80dqqrw95fy8jgknwwb85w1a82r5v"; - name = "kblocks-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblocks-16.08.3.tar.xz"; + sha256 = "1bvhs8bmz7wsc4nz4bxns7i50b2r09kbwrqfn685c39l2zv60gp0"; + name = "kblocks-16.08.3.tar.xz"; }; }; kblog = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kblog-16.08.2.tar.xz"; - sha256 = "1n9camf91p4igbn54j3n8jgqv9154y54fvyn0dlajmwf3ir8lyk9"; - name = "kblog-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kblog-16.08.3.tar.xz"; + sha256 = "19mh29xirx2rb6db5wxjd6am8wjx5mz0s0qszysrm7s9njsp2sqi"; + name = "kblog-16.08.3.tar.xz"; }; }; kbounce = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbounce-16.08.2.tar.xz"; - sha256 = "0mka3s4vx1gbzavhdbhy24jfginkl8v6ab9za47cfyiwnirscry7"; - name = "kbounce-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbounce-16.08.3.tar.xz"; + sha256 = "0f2m8x2mi89y15hvlk9xzd2prgv4fwhal02avjz0b6swggrs8shg"; + name = "kbounce-16.08.3.tar.xz"; }; }; kbreakout = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbreakout-16.08.2.tar.xz"; - sha256 = "0kyxd112yfdp14d73s3dbg393r11gmb7bc0ibb4a5ab7ki3vvp5h"; - name = "kbreakout-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbreakout-16.08.3.tar.xz"; + sha256 = "1rbyracpvvi4l9hn09k1w67cjkcnnnaqwr3maqj77mzh8wbsj1d3"; + name = "kbreakout-16.08.3.tar.xz"; }; }; kbruch = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kbruch-16.08.2.tar.xz"; - sha256 = "0m4zk03gxim4bxxzy391jkspjslf4i3gk23h7jpzwvp2yppibzxk"; - name = "kbruch-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kbruch-16.08.3.tar.xz"; + sha256 = "14yvildw0aji3lrb2xfafncqkwls3jjfvcbj1hi15gp3xxxr6s4z"; + name = "kbruch-16.08.3.tar.xz"; }; }; kcachegrind = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcachegrind-16.08.2.tar.xz"; - sha256 = "0hflqnx4cbqjx61cmxh4y2xkxzqxfw52m7snwhzyd9nlc1f842f4"; - name = "kcachegrind-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcachegrind-16.08.3.tar.xz"; + sha256 = "1rjipi3x2yl9yplyksw66hrnrnscld0fsb8zsmf692x7gprb9wjd"; + name = "kcachegrind-16.08.3.tar.xz"; }; }; kcalc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalc-16.08.2.tar.xz"; - sha256 = "19zxdikqw922q4nc5nfm63pcaq3dg2d6bvcgxw7nd8r1jbn94acm"; - name = "kcalc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalc-16.08.3.tar.xz"; + sha256 = "05ky1kvfk6n2qhqdwg9mlm0q5096776p8gvkh2nhzlajr4klzqdz"; + name = "kcalc-16.08.3.tar.xz"; }; }; kcalcore = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalcore-16.08.2.tar.xz"; - sha256 = "1r0r0mk7yzi8h6mn81aaldcfa4vgxsz17sj5dm5m2p0mr42jxip3"; - name = "kcalcore-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalcore-16.08.3.tar.xz"; + sha256 = "024n78zj10wlr2a50gh3fshlsb1maqbix5f4i66f26j3z2d2z7gc"; + name = "kcalcore-16.08.3.tar.xz"; }; }; kcalutils = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcalutils-16.08.2.tar.xz"; - sha256 = "0achb65qs07b17qhdvfhl7w2qjfls00bycmg8jl789lz0jpdsgg7"; - name = "kcalutils-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcalutils-16.08.3.tar.xz"; + sha256 = "1wyq6hx1hilpk480h4c9j1hgj41s21nwcmm9b178143173p2pp5z"; + name = "kcalutils-16.08.3.tar.xz"; }; }; kcharselect = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcharselect-16.08.2.tar.xz"; - sha256 = "1r50jpyl8a79qgz3gb1apzwrgkx5h7s9m645smi1y5af7qh6dkvy"; - name = "kcharselect-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcharselect-16.08.3.tar.xz"; + sha256 = "0wjwpqjck9k27xq1avz3l9ndi28kmcb05zvvf17jhsq9zmqr2lj8"; + name = "kcharselect-16.08.3.tar.xz"; }; }; kcolorchooser = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcolorchooser-16.08.2.tar.xz"; - sha256 = "1sms0wms94lrykpsj45y8g34dnkkibszahv5303zbzg1ndak4a5i"; - name = "kcolorchooser-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcolorchooser-16.08.3.tar.xz"; + sha256 = "0dk0f2xq4s85n0v3hfhiy0b3pkjvq4wz7pwc6h91kg50mm0mgjy0"; + name = "kcolorchooser-16.08.3.tar.xz"; }; }; kcontacts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcontacts-16.08.2.tar.xz"; - sha256 = "0y8i5302jndpwms0wksf71yqxvz67x8wbwfkjjmlr3n6g477cvf3"; - name = "kcontacts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcontacts-16.08.3.tar.xz"; + sha256 = "01hip3p0f6br42lx89zcxmvrsqfclp0v8j7nzvrrzbdnn9x58b6w"; + name = "kcontacts-16.08.3.tar.xz"; }; }; kcron = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kcron-16.08.2.tar.xz"; - sha256 = "05v5lwcdys0r715x21ddzgl1f3m1vqw8jmyb7igcb4m14iixvfwk"; - name = "kcron-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kcron-16.08.3.tar.xz"; + sha256 = "16dbfil36b0kfdga118gbd1j6x7xd1x3hcc0ikhgysz8wzliaqs2"; + name = "kcron-16.08.3.tar.xz"; }; }; kde-baseapps = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-baseapps-16.08.2.tar.xz"; - sha256 = "1p7h1jygqiwdgwi1g5pr7rq0219i6qq6mrg0c0shcfvvi926dg10"; - name = "kde-baseapps-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-baseapps-16.08.3.tar.xz"; + sha256 = "18a2r2g5cz4s923p3369aam4qr00gsngk6nn4lk3k5a4qqavpsa7"; + name = "kde-baseapps-16.08.3.tar.xz"; }; }; kdebugsettings = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdebugsettings-16.08.2.tar.xz"; - sha256 = "0aixcx4fcnrhz7g9dwl65khn2d5a667jchsxjnlwwrxhff2djy3z"; - name = "kdebugsettings-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdebugsettings-16.08.3.tar.xz"; + sha256 = "0jc4kciaq69wiankz5krfsj4lf0r88msnqcr10k1byjm50b4qnpb"; + name = "kdebugsettings-16.08.3.tar.xz"; }; }; kde-dev-scripts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-dev-scripts-16.08.2.tar.xz"; - sha256 = "1iis5zlfz0ylycpz1i9s99grhp6pzskwv9hmsr620mj2fhcy3nwv"; - name = "kde-dev-scripts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-dev-scripts-16.08.3.tar.xz"; + sha256 = "1g3c1wlv4rr9hxx1f6xiryswqprq1wq4lrlwx3gw3dmnpxwbnzld"; + name = "kde-dev-scripts-16.08.3.tar.xz"; }; }; kde-dev-utils = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-dev-utils-16.08.2.tar.xz"; - sha256 = "1sm540r4nfr8azw9bvsmjbqy709039sk0z7rv3d5mh3d6f363my1"; - name = "kde-dev-utils-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-dev-utils-16.08.3.tar.xz"; + sha256 = "1zzph1la4hgjqaryhm4dggsyv4gxwd0zgg5sw23v9qvp0z0hhzqf"; + name = "kde-dev-utils-16.08.3.tar.xz"; }; }; kdeedu-data = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdeedu-data-16.08.2.tar.xz"; - sha256 = "1m8831nr9f97fz9vxca4bcwwvv5nicd4y74sgp6xm3v41xqwda6b"; - name = "kdeedu-data-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdeedu-data-16.08.3.tar.xz"; + sha256 = "1c7svm52j05xxha4kb5zi81z5rgbj08cahpqwr8g7dszp5m8xals"; + name = "kdeedu-data-16.08.3.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-mobipocket-16.08.2.tar.xz"; - sha256 = "0y19q7r4pbfkqf0mb80h9rqzc13q9csllb9b8ca536bcjh41r6yy"; - name = "kdegraphics-mobipocket-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-mobipocket-16.08.3.tar.xz"; + sha256 = "0rbinw4r0bcxmkai2hb2p8zys654jybwgxigj4337s991l5zlrvd"; + name = "kdegraphics-mobipocket-16.08.3.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdegraphics-thumbnailers-16.08.2.tar.xz"; - sha256 = "155nfj6apbvrs2p69yj0ic0ybp59air0a3wdwz5sw84y47dslnaz"; - name = "kdegraphics-thumbnailers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdegraphics-thumbnailers-16.08.3.tar.xz"; + sha256 = "1ygyhv20pyzfagkf25f6wshcvhyhamxxnrw075m11dg0hg3qlh9z"; + name = "kdegraphics-thumbnailers-16.08.3.tar.xz"; }; }; kde-l10n-ar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ar-16.08.2.tar.xz"; - sha256 = "0aaxwb4sr2bq5cmcr0j7n7dbvih52d5gwbcx17ksip0fp7y0cgnr"; - name = "kde-l10n-ar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ar-16.08.3.tar.xz"; + sha256 = "1ka2vq86g112gvfd4j2jl8dm8hvxjrn5cd2ddcagp3fg2rxm2si7"; + name = "kde-l10n-ar-16.08.3.tar.xz"; }; }; kde-l10n-ast = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ast-16.08.2.tar.xz"; - sha256 = "1s55wrb2ll4fh0f648yybg6mxgsvikanwplw88kk254gxailbvi4"; - name = "kde-l10n-ast-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ast-16.08.3.tar.xz"; + sha256 = "02h7laxf4fsanb4scqgfrw815sj3dhvz4n17cdj8nvg4x7pydkys"; + name = "kde-l10n-ast-16.08.3.tar.xz"; }; }; kde-l10n-bg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bg-16.08.2.tar.xz"; - sha256 = "15slc3an490xcbkwhfkysrzx3xg0h1mrwzp4bxsrsvqcjw4nlrdy"; - name = "kde-l10n-bg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bg-16.08.3.tar.xz"; + sha256 = "0crhf9i43l8p0ds9v3k8ghgxrjc4c8gxwrs7afm6lmqh3lb3miz2"; + name = "kde-l10n-bg-16.08.3.tar.xz"; }; }; kde-l10n-bs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-bs-16.08.2.tar.xz"; - sha256 = "1117i784lwi9ci1ryd46x01pjraw30lma0z4kcg987xpj6ww22ha"; - name = "kde-l10n-bs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-bs-16.08.3.tar.xz"; + sha256 = "1ny1pcdl0xbm40c2jlzgvlkcmy1p2l9p14n827zipbj67by8dlh0"; + name = "kde-l10n-bs-16.08.3.tar.xz"; }; }; kde-l10n-ca = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca-16.08.2.tar.xz"; - sha256 = "07f6h2prkm7iq3bwvn5p9y32xzis3p21sgxpg1x6663w3603w2pa"; - name = "kde-l10n-ca-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca-16.08.3.tar.xz"; + sha256 = "044l2z3n5vn4zbj7nby22f7pg5qcv16yzbgikck6jfdahn56c0d0"; + name = "kde-l10n-ca-16.08.3.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.08.2"; + version = "ca_valencia-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ca@valencia-16.08.2.tar.xz"; - sha256 = "05fw1dj1rfsi1j8mzvjvqwvdv7zkjcj4y0fb9wm9wzcqlsl742wv"; - name = "kde-l10n-ca_valencia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ca@valencia-16.08.3.tar.xz"; + sha256 = "1agmp003bdkhc8jx5124cs8yw73ga6b12gppaqwxl8c9cgd09yai"; + name = "kde-l10n-ca_valencia-16.08.3.tar.xz"; }; }; kde-l10n-cs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-cs-16.08.2.tar.xz"; - sha256 = "1vfn41kayimddrcg2h6zrx3sc31vq2zlv6bkpg29h6yddir6xjgk"; - name = "kde-l10n-cs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-cs-16.08.3.tar.xz"; + sha256 = "0li4rnpns7wvxgrg9lxzimx7lxk2cl2w0zqk9g0c8zwqrrl64d23"; + name = "kde-l10n-cs-16.08.3.tar.xz"; }; }; kde-l10n-da = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-da-16.08.2.tar.xz"; - sha256 = "0k8cs5m9aypgjkrvwrff4qvaanppaizryc6wncqr9jj13hr2vz1q"; - name = "kde-l10n-da-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-da-16.08.3.tar.xz"; + sha256 = "14cpwl8p2n0bfj2hbbm9fv1i8r20xfrp16iy9kdym5x4k80c5lzc"; + name = "kde-l10n-da-16.08.3.tar.xz"; }; }; kde-l10n-de = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-de-16.08.2.tar.xz"; - sha256 = "01kfh8zlf7r3dlmi96nvl4gksxryd10aqrnddhwjxni29l2sqjil"; - name = "kde-l10n-de-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-de-16.08.3.tar.xz"; + sha256 = "09sq6sbli9gjfkwqmcqjscbakxbnn2czb4d3pyni3v0i7x4xgmgl"; + name = "kde-l10n-de-16.08.3.tar.xz"; }; }; kde-l10n-el = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-el-16.08.2.tar.xz"; - sha256 = "1b6q3xriy9bv5537v2salz4vi4yx4hlx73aga4ic4pas8n0fn155"; - name = "kde-l10n-el-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-el-16.08.3.tar.xz"; + sha256 = "11vv237skajqc50dpcz0abn7xcly8a161yp56fn6zn1zdlcw4p02"; + name = "kde-l10n-el-16.08.3.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.08.2"; + version = "en_GB-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-en_GB-16.08.2.tar.xz"; - sha256 = "12cf5cx7kmc0wg752xpaz4jr4m3vxaahhxd0cp41p3lrb3079g2c"; - name = "kde-l10n-en_GB-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-en_GB-16.08.3.tar.xz"; + sha256 = "10anibggfqdp90d9jsv2n8aqk4wrgdq1pjxz60784f9bm1lq9xbx"; + name = "kde-l10n-en_GB-16.08.3.tar.xz"; }; }; kde-l10n-eo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eo-16.08.2.tar.xz"; - sha256 = "07rwf3jcrs7r16hpyf4mz9fk41qi1nfm6x6qlf6xlpi7ynxgyyj0"; - name = "kde-l10n-eo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eo-16.08.3.tar.xz"; + sha256 = "15dhramx79rh6v7891fa878dikh74cx4knisrmg50ih5fgyr8rrm"; + name = "kde-l10n-eo-16.08.3.tar.xz"; }; }; kde-l10n-es = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-es-16.08.2.tar.xz"; - sha256 = "1m366lxafwxa390nyvxwslbk653m1g6nwv9hr4mmpcnf2xxqsq2b"; - name = "kde-l10n-es-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-es-16.08.3.tar.xz"; + sha256 = "0zshw10drqgsdcdlzci7ghpcmww69dr5nc8i9fakg9jj4pfblkv5"; + name = "kde-l10n-es-16.08.3.tar.xz"; }; }; kde-l10n-et = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-et-16.08.2.tar.xz"; - sha256 = "0n08x8102hlzl3xp3d306lxf47b7870wxvr95krnchbrnmb847jv"; - name = "kde-l10n-et-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-et-16.08.3.tar.xz"; + sha256 = "04g4wvpmxrcma6dhw6py8xbhpxs4rsls69y98ljigd7y518ss6qa"; + name = "kde-l10n-et-16.08.3.tar.xz"; }; }; kde-l10n-eu = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-eu-16.08.2.tar.xz"; - sha256 = "0kacy7cbjd4pgzr54x9y28lk28rdbilqamg5gv2lxz3l2rqbnkpf"; - name = "kde-l10n-eu-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-eu-16.08.3.tar.xz"; + sha256 = "1gvgmlvc2qphy16y5m9xl0v6530909jzlvxfglamdwcchcc5rhj6"; + name = "kde-l10n-eu-16.08.3.tar.xz"; }; }; kde-l10n-fa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fa-16.08.2.tar.xz"; - sha256 = "1nznmql7i2dkziyam6czyd8j0spjg276l9nwqnznrzpjnpks1dl2"; - name = "kde-l10n-fa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fa-16.08.3.tar.xz"; + sha256 = "0ph0ssqjxi6g93kzg8p888s8258zdzpyaq712zcfhjcr7zx8ld32"; + name = "kde-l10n-fa-16.08.3.tar.xz"; }; }; kde-l10n-fi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fi-16.08.2.tar.xz"; - sha256 = "0rxf7hcjrhmv7zrrrc9bv65dxwiw0vywwn7j92jvsw5psbb9yf1x"; - name = "kde-l10n-fi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fi-16.08.3.tar.xz"; + sha256 = "0b7psgnc5mv38cx4iynacpq5q8nbvfm4fn6q9lwfj6x5h57xzd59"; + name = "kde-l10n-fi-16.08.3.tar.xz"; }; }; kde-l10n-fr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-fr-16.08.2.tar.xz"; - sha256 = "07b9a4vlnampg7i7nb4ykh1cp77pdf5k0h6aa0mjg1rjycpwflv3"; - name = "kde-l10n-fr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-fr-16.08.3.tar.xz"; + sha256 = "0q65wjjq4j1hg4bakbms2qamqqhqlchcbmy9fqc1aghbi3b871h8"; + name = "kde-l10n-fr-16.08.3.tar.xz"; }; }; kde-l10n-ga = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ga-16.08.2.tar.xz"; - sha256 = "08dgs9rz52mk4bl41h5k4p0cpqjw381aw3h6xw8080lj9zh0nvbn"; - name = "kde-l10n-ga-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ga-16.08.3.tar.xz"; + sha256 = "0drq7jxgdr01z75ybbalaxmr0r860f82i5ny1limnsqvmfh92p6b"; + name = "kde-l10n-ga-16.08.3.tar.xz"; }; }; kde-l10n-gl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-gl-16.08.2.tar.xz"; - sha256 = "0986i04gfa6yw3ljmlx857src7lda8cwqdkk68cbxfi371ly0spl"; - name = "kde-l10n-gl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-gl-16.08.3.tar.xz"; + sha256 = "0y6vj77nkinii1bfw975lyhbjzvmd7r23pn29cz3l0p3bfd3yzkd"; + name = "kde-l10n-gl-16.08.3.tar.xz"; }; }; kde-l10n-he = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-he-16.08.2.tar.xz"; - sha256 = "0xbbf3jpsmyq8k3d2qq3y75jq9wmf6iy46s52qbmr0pbdg288h3c"; - name = "kde-l10n-he-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-he-16.08.3.tar.xz"; + sha256 = "1q6q5rqvww1f29qfr3prd7fkxzvx7inf5wnzmla9kdnax7p9z3rs"; + name = "kde-l10n-he-16.08.3.tar.xz"; }; }; kde-l10n-hi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hi-16.08.2.tar.xz"; - sha256 = "1cfmn3qafmps51mld735synlsf8h1nfb84ji9qv64qpw2gjvpp9n"; - name = "kde-l10n-hi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hi-16.08.3.tar.xz"; + sha256 = "1qnncfg7vfw4ikcm23j1l6cmycg2m168d76h1fnznx4bdyfybblq"; + name = "kde-l10n-hi-16.08.3.tar.xz"; }; }; kde-l10n-hr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hr-16.08.2.tar.xz"; - sha256 = "11kfxqjavmh9bcaivm5zd82r0b3d4rz8zmc2awc1433i6wgdxrkq"; - name = "kde-l10n-hr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hr-16.08.3.tar.xz"; + sha256 = "1kzl6fycifrmb2lil9vifas0jcczsw0aqpr2r6fjlvbw7p2zc42n"; + name = "kde-l10n-hr-16.08.3.tar.xz"; }; }; kde-l10n-hu = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-hu-16.08.2.tar.xz"; - sha256 = "0m714qii2z1bc8kv112bf9wpq078yaqgzd1m4h2apyj1rzl8sni8"; - name = "kde-l10n-hu-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-hu-16.08.3.tar.xz"; + sha256 = "0kj5ivz7xw0a79rcprjp4bra90s12421ppbipvgnllc2rcixgkki"; + name = "kde-l10n-hu-16.08.3.tar.xz"; }; }; kde-l10n-ia = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ia-16.08.2.tar.xz"; - sha256 = "1r10w7dpxmgby3igh57yli6hp1paxwh1m4vkzi5f91fgh2s8qjjg"; - name = "kde-l10n-ia-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ia-16.08.3.tar.xz"; + sha256 = "0cmv9jwbabaynx0wa1nhn9pgib60kg7b71ilcqhxnm5lqvws88pi"; + name = "kde-l10n-ia-16.08.3.tar.xz"; }; }; kde-l10n-id = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-id-16.08.2.tar.xz"; - sha256 = "1r26h3rlgh91f00qzmkzmd3sflsmvyxdcy92ljj1g64wh9cigh66"; - name = "kde-l10n-id-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-id-16.08.3.tar.xz"; + sha256 = "1zz3237l26fz7ca33l9dvq1b8kkdi4gdzqxqslkb10q36z2gsni1"; + name = "kde-l10n-id-16.08.3.tar.xz"; }; }; kde-l10n-is = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-is-16.08.2.tar.xz"; - sha256 = "0ldxw1sl7sr7v0783cby6qp5ig2x5dq2s8w7k3fh1qa88cp1nsld"; - name = "kde-l10n-is-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-is-16.08.3.tar.xz"; + sha256 = "1mcwg8v08dv524ahhkv3wmnmac9pf534i45za9y0wl1kkcgp8949"; + name = "kde-l10n-is-16.08.3.tar.xz"; }; }; kde-l10n-it = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-it-16.08.2.tar.xz"; - sha256 = "0knvilb2p9s1cr354bzwhxzmfi49g17v3clqdvlcyglghkz94aam"; - name = "kde-l10n-it-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-it-16.08.3.tar.xz"; + sha256 = "15k52l0mq7qclb4adwvcz4bngisbj476vlphqnjhnav9nj5cm84f"; + name = "kde-l10n-it-16.08.3.tar.xz"; }; }; kde-l10n-ja = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ja-16.08.2.tar.xz"; - sha256 = "0x3sfprw1pvjkivva05cg9nbzml2g4vzidvjq37vp7nkyfdxldcp"; - name = "kde-l10n-ja-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ja-16.08.3.tar.xz"; + sha256 = "0p6nd7hlv6yvxi5y808wzjbidk1gpa2fj50i66lxzq3xl7rajli3"; + name = "kde-l10n-ja-16.08.3.tar.xz"; }; }; kde-l10n-kk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-kk-16.08.2.tar.xz"; - sha256 = "1jmqahyhxz798yqlc25lyj3x6xa426czkydbikpngb3775wy918z"; - name = "kde-l10n-kk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-kk-16.08.3.tar.xz"; + sha256 = "0ffnlmq2qnmcqk9h4yvl0z00x2f5yyicg1qf1jlxk9fvhbg5xpmv"; + name = "kde-l10n-kk-16.08.3.tar.xz"; }; }; kde-l10n-km = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-km-16.08.2.tar.xz"; - sha256 = "00p7grks0cjca5r2xvmf4kxvpjqasbjcss938x9ss6wc0knq8laa"; - name = "kde-l10n-km-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-km-16.08.3.tar.xz"; + sha256 = "1ln9dc278sv9r99psy27m1qhbyaw6dzg3kwr11pbp517253ggj7j"; + name = "kde-l10n-km-16.08.3.tar.xz"; }; }; kde-l10n-ko = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ko-16.08.2.tar.xz"; - sha256 = "0w14n8vzvmwiliqnakg4s76cka1qp0j0azc632aaiy6d17g0yw2k"; - name = "kde-l10n-ko-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ko-16.08.3.tar.xz"; + sha256 = "07lbblm4aqj7jp25clz7sil9ficrbvwpd9pvpfrz530q8y74hsjf"; + name = "kde-l10n-ko-16.08.3.tar.xz"; }; }; kde-l10n-lt = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lt-16.08.2.tar.xz"; - sha256 = "1yj119r7p9bjk405ml5383y5jqrhaj9v4ksjiyhjs8l5zx0pjb3b"; - name = "kde-l10n-lt-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lt-16.08.3.tar.xz"; + sha256 = "1cssd4z8dxlld61kakb6vnb5hksswl1dkr1bsxv5q622hjrp037c"; + name = "kde-l10n-lt-16.08.3.tar.xz"; }; }; kde-l10n-lv = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-lv-16.08.2.tar.xz"; - sha256 = "0g173n4nqiw7mk6phys4dlis6dfd9iw0kpv4hhvz4b54i67wamvw"; - name = "kde-l10n-lv-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-lv-16.08.3.tar.xz"; + sha256 = "0wnrcfgm5l3ifnywz67k186g5vh0648dhmymfcz6fmqf3ipfl4h4"; + name = "kde-l10n-lv-16.08.3.tar.xz"; }; }; kde-l10n-mr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-mr-16.08.2.tar.xz"; - sha256 = "1696gqib17f250p5y0vfjxcx8w4wx1lhi8nqy9bbjj6acmahishj"; - name = "kde-l10n-mr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-mr-16.08.3.tar.xz"; + sha256 = "0kkwpn12z1f8rs91yqh8x155nbrkwgj1z5fx4kcs1nc7xyvfpbff"; + name = "kde-l10n-mr-16.08.3.tar.xz"; }; }; kde-l10n-nb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nb-16.08.2.tar.xz"; - sha256 = "0z2v14m329r8687qpvf0qxnbvpp48mvl1yri16203bya8q44764j"; - name = "kde-l10n-nb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nb-16.08.3.tar.xz"; + sha256 = "0070dgr1apn345a8bwgbxiz2a0andmfx54vd5pv3hgj6n9jrmq07"; + name = "kde-l10n-nb-16.08.3.tar.xz"; }; }; kde-l10n-nds = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nds-16.08.2.tar.xz"; - sha256 = "0d7nzwll2hqlb3ca3zdwr9x4rnhvv3fgxammzac07gib1aq27lap"; - name = "kde-l10n-nds-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nds-16.08.3.tar.xz"; + sha256 = "103wfwl18fmz8h184c3qcwfyh784pfzsd2dgd000xs28pcc5kc22"; + name = "kde-l10n-nds-16.08.3.tar.xz"; }; }; kde-l10n-nl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nl-16.08.2.tar.xz"; - sha256 = "0hq7gqg6nqb06kg8pgjf36w6lx6kv0z4v0lz4wac47v10jipcix4"; - name = "kde-l10n-nl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nl-16.08.3.tar.xz"; + sha256 = "1zjnzcpivcs26qp5h153jd1qr98dnr1f8347cb9iz79q41zjn21z"; + name = "kde-l10n-nl-16.08.3.tar.xz"; }; }; kde-l10n-nn = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-nn-16.08.2.tar.xz"; - sha256 = "02935kj4gw93lyjik6vqk40rnpblib0pq1dl0im2mavfym2nacjj"; - name = "kde-l10n-nn-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-nn-16.08.3.tar.xz"; + sha256 = "1lm701iml2sfzp2dz5nlh6kflp3lfbcsdlipk9wwsqnjs3zr436y"; + name = "kde-l10n-nn-16.08.3.tar.xz"; }; }; kde-l10n-pa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pa-16.08.2.tar.xz"; - sha256 = "08qq6lkr9jrsl12slqfhp83vkamr5nv9x7hr91g8xgg1s9i3aj3z"; - name = "kde-l10n-pa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pa-16.08.3.tar.xz"; + sha256 = "0j6dyfg8vw1dj226ngxd4yb2qfnj4g7c36cfmmmlfr9d8ds8xw0p"; + name = "kde-l10n-pa-16.08.3.tar.xz"; }; }; kde-l10n-pl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pl-16.08.2.tar.xz"; - sha256 = "0ylsc89nsmbjm4c5gbnh5qczmr7bal7037bm5nsmrh7aqkwg1s1x"; - name = "kde-l10n-pl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pl-16.08.3.tar.xz"; + sha256 = "0nr7vxw4d0z8g51zls46r3kbm0dfbry09cpmahdpk6zlgcvlg5zz"; + name = "kde-l10n-pl-16.08.3.tar.xz"; }; }; kde-l10n-pt = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt-16.08.2.tar.xz"; - sha256 = "0cbaf2vnr56qa0qfhr4cgdmbq3hbck9wfcx5a7bvvaglck95f4gq"; - name = "kde-l10n-pt-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt-16.08.3.tar.xz"; + sha256 = "0il1gwr9jl8z2lp9j7zb18x7kbzcv6p37kbww5l6xr3gc744fiaf"; + name = "kde-l10n-pt-16.08.3.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.08.2"; + version = "pt_BR-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-pt_BR-16.08.2.tar.xz"; - sha256 = "048ssv4bhx8bn2q8nsh5n0m1nl64qadndwrh3hx3avd7jjnj7l4s"; - name = "kde-l10n-pt_BR-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-pt_BR-16.08.3.tar.xz"; + sha256 = "0b5m5p19n6a9mclvhh5p2s6k0vjwspnal223ddc0xk34060f4ch7"; + name = "kde-l10n-pt_BR-16.08.3.tar.xz"; }; }; kde-l10n-ro = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ro-16.08.2.tar.xz"; - sha256 = "05pi6v5hp3yki0hiy19gggz1mpk7ykjz6f94k6cv63vinvai6gpw"; - name = "kde-l10n-ro-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ro-16.08.3.tar.xz"; + sha256 = "08nanwr2s37215kkik8issn9va65dxlam55lfabybvybw6b0s7x5"; + name = "kde-l10n-ro-16.08.3.tar.xz"; }; }; kde-l10n-ru = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ru-16.08.2.tar.xz"; - sha256 = "18kk3iyn1dyir43dxlrs0jcdin001h0qfzm9cszxlz52yx5vn4ba"; - name = "kde-l10n-ru-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ru-16.08.3.tar.xz"; + sha256 = "1xbssbm3za3y0fh02j62s94vkz1nfdl37g458h1qagyawm04vwdq"; + name = "kde-l10n-ru-16.08.3.tar.xz"; }; }; kde-l10n-sk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sk-16.08.2.tar.xz"; - sha256 = "0gxia3j689a315jww9cfw802vhz226zd3ci6i45ffrj5sdpm0bcs"; - name = "kde-l10n-sk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sk-16.08.3.tar.xz"; + sha256 = "0ixqh1xj3nqwq7nsxhk4c7d5w8n77plld4ap4brd4r188pfswvdr"; + name = "kde-l10n-sk-16.08.3.tar.xz"; }; }; kde-l10n-sl = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sl-16.08.2.tar.xz"; - sha256 = "1d6gxc2jcnjzjrp6aw63l86wsqkdg4qw3zz5pc0j1qc5ihaak6pm"; - name = "kde-l10n-sl-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sl-16.08.3.tar.xz"; + sha256 = "0d4n5sp82jfap0cq167ybqsvyp06vla8y3clma25cyyksk9r355w"; + name = "kde-l10n-sl-16.08.3.tar.xz"; }; }; kde-l10n-sr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sr-16.08.2.tar.xz"; - sha256 = "0mixdfpvryg1ch917nxc469m7fzgy5dkbxadc55kzgy9k18vry30"; - name = "kde-l10n-sr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sr-16.08.3.tar.xz"; + sha256 = "1bb2dbkb80q2y7s9nka8x4q8cc6lqx7ddry83rp97sia1fckgn6g"; + name = "kde-l10n-sr-16.08.3.tar.xz"; }; }; kde-l10n-sv = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-sv-16.08.2.tar.xz"; - sha256 = "10day8y3fqdf9rg24wmxa38snpkry08swcgzh2qxy2wlg7w1n2ld"; - name = "kde-l10n-sv-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-sv-16.08.3.tar.xz"; + sha256 = "1n7dj3alqf59b4n9ckhk35pw5qvlkbw70bw48b2mzsh6rm9l6njs"; + name = "kde-l10n-sv-16.08.3.tar.xz"; }; }; kde-l10n-tr = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-tr-16.08.2.tar.xz"; - sha256 = "19a5cribm12pi0y84vfwmigkyvn8d4ylvx07g9df4iapjf2kgs54"; - name = "kde-l10n-tr-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-tr-16.08.3.tar.xz"; + sha256 = "0k1lwngg5v4wzc8imx33q68cdva4f61jqfibjrza4sf6la69vr6p"; + name = "kde-l10n-tr-16.08.3.tar.xz"; }; }; kde-l10n-ug = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-ug-16.08.2.tar.xz"; - sha256 = "0p2ijv13wk02sm065nk328pdl2qn22sashwdzw5viy6hr67z8igv"; - name = "kde-l10n-ug-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-ug-16.08.3.tar.xz"; + sha256 = "1xi90k2ghgz9fh3lb1l7pbnmz17bi5mvyvg7dwwm3ni7q4k696lf"; + name = "kde-l10n-ug-16.08.3.tar.xz"; }; }; kde-l10n-uk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-uk-16.08.2.tar.xz"; - sha256 = "0m03z8yac3mbsp78zskyiw316im7fr2197lmjl6prfz8hdvblyqm"; - name = "kde-l10n-uk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-uk-16.08.3.tar.xz"; + sha256 = "114snhzp2v6fp7glvwbjd97byzfisp94zr2ia5np5xcpfkpww9g7"; + name = "kde-l10n-uk-16.08.3.tar.xz"; }; }; kde-l10n-wa = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-wa-16.08.2.tar.xz"; - sha256 = "08zv0pl9gm7xpykzvb7cf4gx0r78jrfx33281iam3496bgl9iz63"; - name = "kde-l10n-wa-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-wa-16.08.3.tar.xz"; + sha256 = "1qimv935j50sb7n7x4ga10x4zkasn9yddh1drs0k5i7r02sq8nzv"; + name = "kde-l10n-wa-16.08.3.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.08.2"; + version = "zh_CN-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_CN-16.08.2.tar.xz"; - sha256 = "1fzkykipaqlabzmddzk694h26cw15r8vwn3f6033pbgpd47rxmh7"; - name = "kde-l10n-zh_CN-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_CN-16.08.3.tar.xz"; + sha256 = "024y7lvjkx8djwd9qmjkj3q9ri3fbnlsxcyjr5jy5yi10ccwf9v6"; + name = "kde-l10n-zh_CN-16.08.3.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.08.2"; + version = "zh_TW-16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-l10n/kde-l10n-zh_TW-16.08.2.tar.xz"; - sha256 = "0i02bbpkn802wzavyj3ilmp889v6frkbb1zp8q9wsrvdwv71zmrj"; - name = "kde-l10n-zh_TW-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-l10n/kde-l10n-zh_TW-16.08.3.tar.xz"; + sha256 = "1m5npa3jrsc0kn3mqkp3pagix95ialpk4fikbiq44laxn7xph5yi"; + name = "kde-l10n-zh_TW-16.08.3.tar.xz"; }; }; kdelibs = { - version = "4.14.25"; + version = "4.14.26"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdelibs-4.14.25.tar.xz"; - sha256 = "00idq3iqd72gjyqj79ci8992jlww877m3znjvvlnh8s97y4kwpds"; - name = "kdelibs-4.14.25.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdelibs-4.14.26.tar.xz"; + sha256 = "043asa5i30s3j1knpshhxw1a5a1alh1b5b719gdzpm1hxgn3f79r"; + name = "kdelibs-4.14.26.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdenetwork-filesharing-16.08.2.tar.xz"; - sha256 = "0k9c1mjdr754qgzhfmx0qrh7lf1hlp698wq6mynw31b45ngx26n9"; - name = "kdenetwork-filesharing-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdenetwork-filesharing-16.08.3.tar.xz"; + sha256 = "0zfswqxh0ng5w44hzfpsjhmnv7nf1jc3qfmfvmmlb0h1ynfdbqmy"; + name = "kdenetwork-filesharing-16.08.3.tar.xz"; }; }; kdenlive = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdenlive-16.08.2.tar.xz"; - sha256 = "1lw0dayp2hryqpfw2090fzj7yqxi1y8bmpzadljqkl1glb6sd16l"; - name = "kdenlive-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdenlive-16.08.3.tar.xz"; + sha256 = "0s5bdb5xxjaqb7zmvm119mc7zacagglv21dd4v6sahg0mf1qvfin"; + name = "kdenlive-16.08.3.tar.xz"; }; }; kdepim = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-16.08.2.tar.xz"; - sha256 = "15w9yyyld84hp0mzlw0iv9bl3f4dk560l6mynrq5ccya90lfrnc2"; - name = "kdepim-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-16.08.3.tar.xz"; + sha256 = "1l0rvi33i9hzr9c3nqzbr3cnz046ccf7s3v54mdmxfdk5x0ynkms"; + name = "kdepim-16.08.3.tar.xz"; }; }; kdepim-addons = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-addons-16.08.2.tar.xz"; - sha256 = "06plflqj1p3jhn8c2jm2vm55yhiwa7wsvndh86q39ajw5qw60mhx"; - name = "kdepim-addons-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-addons-16.08.3.tar.xz"; + sha256 = "0ddhya9f6hbdakdna4hnbwiwvc1ar95jgxhr36hf6s37bxh7755l"; + name = "kdepim-addons-16.08.3.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-apps-libs-16.08.2.tar.xz"; - sha256 = "1vygdkh43b0aajxywy6sa01khx8zvsv1n3aainqcbn8jndxlkb82"; - name = "kdepim-apps-libs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-apps-libs-16.08.3.tar.xz"; + sha256 = "1ygdmv30pzrgv3f222nv52mvc83ags9dvwl2ma4l8frb13xb1r15"; + name = "kdepim-apps-libs-16.08.3.tar.xz"; }; }; kdepim-runtime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdepim-runtime-16.08.2.tar.xz"; - sha256 = "0dg3ww5l6mq7xi4z1j7b4w2d7i425wbz1gwml0a9ajy3v0k14vqb"; - name = "kdepim-runtime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdepim-runtime-16.08.3.tar.xz"; + sha256 = "1q7d2c1rjli5dl162zibzhmg2q4hxxlqjp7r78amq90vhv975kc6"; + name = "kdepim-runtime-16.08.3.tar.xz"; }; }; kde-runtime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kde-runtime-16.08.2.tar.xz"; - sha256 = "1q0m4nywap0qmg9fj9z2d8b7j9bvykniqq9jga3jmys5g2cjn205"; - name = "kde-runtime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kde-runtime-16.08.3.tar.xz"; + sha256 = "1g5ni75byraf9268p0n74i81zb46agp9ac243m8jfzh8vdm2q5kk"; + name = "kde-runtime-16.08.3.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdesdk-kioslaves-16.08.2.tar.xz"; - sha256 = "11png8q0ci86if2g49nrmx63l8pxcmp789k9kkamnzsx79y6arq2"; - name = "kdesdk-kioslaves-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdesdk-kioslaves-16.08.3.tar.xz"; + sha256 = "12q015nm9qfcscsvqrkibj1cfh651890k982sbqqdn0dm5932lnj"; + name = "kdesdk-kioslaves-16.08.3.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdesdk-thumbnailers-16.08.2.tar.xz"; - sha256 = "1dmmm6l5yy64l6hqqjx4d5cycgx1wzjv81ll9jizgg8c5cknhi8l"; - name = "kdesdk-thumbnailers-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdesdk-thumbnailers-16.08.3.tar.xz"; + sha256 = "1dy4566pdx890n60sn5v7hms2prjh674pm6gbxg1il4i4qcpfv4z"; + name = "kdesdk-thumbnailers-16.08.3.tar.xz"; }; }; kdewebdev = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdewebdev-16.08.2.tar.xz"; - sha256 = "0dm013da1i2z0n6svmm0yqzgn3j608ldc2w80dvgkvykh85z5ccy"; - name = "kdewebdev-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdewebdev-16.08.3.tar.xz"; + sha256 = "0r9qsm3idfhm7aglik7whzcwjjn572gwmlcgxy2cvpn15nqa344l"; + name = "kdewebdev-16.08.3.tar.xz"; }; }; kdf = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdf-16.08.2.tar.xz"; - sha256 = "0lvzyxn434rqknqmzwi6ih60gvkd24i2ms0ziypkh5ihs9scbmg7"; - name = "kdf-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdf-16.08.3.tar.xz"; + sha256 = "1fkjmdwp5pnlvz2mac4zq93wnb6jj4ymj4448qbhxypncrh6sym3"; + name = "kdf-16.08.3.tar.xz"; }; }; kdgantt2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdgantt2-16.08.2.tar.xz"; - sha256 = "1hhfrcjv6yx69ahnhc641h6sh9fp9m69jkb85aav2pydnps1p4bp"; - name = "kdgantt2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdgantt2-16.08.3.tar.xz"; + sha256 = "01p3cqqhghvx42mrmxkrsm7cp23972gi86sagjw070scw71fpv0c"; + name = "kdgantt2-16.08.3.tar.xz"; }; }; kdiamond = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kdiamond-16.08.2.tar.xz"; - sha256 = "0kaqxxm30kxvkbzgzj69zzsql903qbkczlkmxfb9x2zp2484f7jq"; - name = "kdiamond-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kdiamond-16.08.3.tar.xz"; + sha256 = "035m2911zbkvhydihaqbgwl7vs8z03hcsq8ph7wvnsdvd1f895ib"; + name = "kdiamond-16.08.3.tar.xz"; }; }; kfloppy = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kfloppy-16.08.2.tar.xz"; - sha256 = "0jkbamqbdggf72k1xszaan890nhqz4qwhd8d0mbgm2nhzbs9q1cb"; - name = "kfloppy-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kfloppy-16.08.3.tar.xz"; + sha256 = "14y9a8nq2cdaj5r6xdqwfm6fa8w3wbx80hrps2bkxyx696hc1lkl"; + name = "kfloppy-16.08.3.tar.xz"; }; }; kfourinline = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kfourinline-16.08.2.tar.xz"; - sha256 = "0cb2kap8bp35ijnhghp9df4kai7vizayzcax0p3wamv0zy4zfx4b"; - name = "kfourinline-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kfourinline-16.08.3.tar.xz"; + sha256 = "04wpswi9c7c79g4sz6cr7jrdmdfwwqr2p8kd0zs2snygcr4h3fcq"; + name = "kfourinline-16.08.3.tar.xz"; }; }; kgeography = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgeography-16.08.2.tar.xz"; - sha256 = "0s88gzyy0ldz10vlklnvwi7aip0vn5gnawikqn80xfw3vwb5zyki"; - name = "kgeography-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgeography-16.08.3.tar.xz"; + sha256 = "09hsihvvdzbr1dz8zlwy7nyjk87pl7f714k3k3b0b0wpx9swxkq0"; + name = "kgeography-16.08.3.tar.xz"; }; }; kget = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kget-16.08.2.tar.xz"; - sha256 = "1pna3rw76n1lg9l805ccisxirrmxw23n2az5nd95wsck77lgxnr6"; - name = "kget-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kget-16.08.3.tar.xz"; + sha256 = "1709if0yqp0axy88v56zrchirkcjgl8q38qf0zbfng0bbbszik61"; + name = "kget-16.08.3.tar.xz"; }; }; kgoldrunner = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgoldrunner-16.08.2.tar.xz"; - sha256 = "0r14mspzyigj4md7zzjq06sswb1y4m4232kfkwg4p7yp8xpsr56c"; - name = "kgoldrunner-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgoldrunner-16.08.3.tar.xz"; + sha256 = "03g3j1zrq3513jijnl3ih61xkpxl4mqy6mjmilq5cs745bmzkad4"; + name = "kgoldrunner-16.08.3.tar.xz"; }; }; kgpg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kgpg-16.08.2.tar.xz"; - sha256 = "0bx4d4i4n8v58yyqcb7pz70cpikymmjz9nd69mly9g8hj8jwqnll"; - name = "kgpg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kgpg-16.08.3.tar.xz"; + sha256 = "17kr13lvicv4lrl4ls4l66xh35xz60nrszwagb0qk34wcgzc090p"; + name = "kgpg-16.08.3.tar.xz"; }; }; khangman = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/khangman-16.08.2.tar.xz"; - sha256 = "172ciifrcydyhmawzxx3k1aq564ywjlj5wqfbjgxaf7pj3pbxndk"; - name = "khangman-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/khangman-16.08.3.tar.xz"; + sha256 = "1ipkp003pp6z783qb7fzhky3kn4ccmlqijxysk7ccbsr9myfvdyk"; + name = "khangman-16.08.3.tar.xz"; }; }; khelpcenter = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/khelpcenter-16.08.2.tar.xz"; - sha256 = "1iiz4w4zzf28g336hypmhf50lndwl6rj3y46wbj1mzpc99wrrxhr"; - name = "khelpcenter-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/khelpcenter-16.08.3.tar.xz"; + sha256 = "13vzqjaqqzi46c9gmijhbq1i3fmk3pbkkg26mn3745m2xc6j2cvi"; + name = "khelpcenter-16.08.3.tar.xz"; }; }; kholidays = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kholidays-16.08.2.tar.xz"; - sha256 = "12fawyvy5nyiyr4zfbkwi5p0m5kgbcs4ly4f7bdq7qy7qbw6k8b6"; - name = "kholidays-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kholidays-16.08.3.tar.xz"; + sha256 = "0hxb2c526vw8rvfp14snvwihsqvr1l30vnzhxznl3dhm44lmvdn9"; + name = "kholidays-16.08.3.tar.xz"; }; }; kidentitymanagement = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kidentitymanagement-16.08.2.tar.xz"; - sha256 = "00q21hfyfyhkh7ip14q0a8rgngigm17hs5gp8r6gymvcysp3glny"; - name = "kidentitymanagement-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kidentitymanagement-16.08.3.tar.xz"; + sha256 = "0vv1y0mwxlb4g5a01jgi1nizw530w0fhy0kab6syxzgmnibj6vsf"; + name = "kidentitymanagement-16.08.3.tar.xz"; }; }; kig = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kig-16.08.2.tar.xz"; - sha256 = "14p9cl7mbb04lz5l2ajbfxlqli065v09bc22nyjcsin45rxvdvmn"; - name = "kig-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kig-16.08.3.tar.xz"; + sha256 = "1ln2i322ara79f90rwrcv5xfa0cnkksyhj25h2xn9x7d5ig4by96"; + name = "kig-16.08.3.tar.xz"; }; }; kigo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kigo-16.08.2.tar.xz"; - sha256 = "13lkzhb00bmynkwrshvwl8r270zsxp6bj5ca75xy3g4vmp04gy0i"; - name = "kigo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kigo-16.08.3.tar.xz"; + sha256 = "0vz7329i8pfax9nxb7xc0yws4f3mn4ms93358wvhyblbma4zaf4l"; + name = "kigo-16.08.3.tar.xz"; }; }; killbots = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/killbots-16.08.2.tar.xz"; - sha256 = "1vrzj91ff78g6w34vb68ljp2dpckc80545n9bhk8x1pr1s3jl3ks"; - name = "killbots-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/killbots-16.08.3.tar.xz"; + sha256 = "08f9gvvy3sx7ibikgxzjawfzzznfig8dfmgmfczj56fys7rvh2y5"; + name = "killbots-16.08.3.tar.xz"; }; }; kimap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kimap-16.08.2.tar.xz"; - sha256 = "1j0bsbzp669mxizr3vaxfg3wjavg7zx3xfrjrmwabl0h04hmkn0g"; - name = "kimap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kimap-16.08.3.tar.xz"; + sha256 = "03nl3q8cv92jpdgdg8pfhwzwlkqpcpz13p6p4q47vvmgglp63qnw"; + name = "kimap-16.08.3.tar.xz"; }; }; kio-extras = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kio-extras-16.08.2.tar.xz"; - sha256 = "1j5bmnq77yg5wpha0xl2cm4n2m0frw5dvr24i4ypvvqnpb1gim7q"; - name = "kio-extras-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kio-extras-16.08.3.tar.xz"; + sha256 = "1rd5ks73vqf6x4rs0qjsy0ipl6lgxgwqbwmcxar5m50b5jksl4xk"; + name = "kio-extras-16.08.3.tar.xz"; }; }; kiriki = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kiriki-16.08.2.tar.xz"; - sha256 = "03vanq33hd7hlspckfydbbiavzv7g7maswca4zzd9sinybx45r7a"; - name = "kiriki-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kiriki-16.08.3.tar.xz"; + sha256 = "0n37mmkq1jmdh3jlrjzmb88cnbnwzcjbp2dy6mz4f5iliv9ws54v"; + name = "kiriki-16.08.3.tar.xz"; }; }; kiten = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kiten-16.08.2.tar.xz"; - sha256 = "0kj1abs4f1ff0spkzwn5xxabcfb0xny7dlsa7lb0fbyvyczq3jgd"; - name = "kiten-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kiten-16.08.3.tar.xz"; + sha256 = "0qds7c62jsgf5lyx2sjhw5xxxq7qh35ccpvpc7l004g4blwb7mna"; + name = "kiten-16.08.3.tar.xz"; }; }; kjumpingcube = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kjumpingcube-16.08.2.tar.xz"; - sha256 = "1rnmwz729jain4pv0wpb8x95k6cx0bvb2wk46sjm2p80202clb0r"; - name = "kjumpingcube-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kjumpingcube-16.08.3.tar.xz"; + sha256 = "1lv6irlvfpbpbhk3vazv07frwz3y7084y3hirdjb2xih8gbsljrm"; + name = "kjumpingcube-16.08.3.tar.xz"; }; }; kldap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kldap-16.08.2.tar.xz"; - sha256 = "18myysm48c8b6lpgl76x70na0k6qw47zrmmax2yfhbi4fsi13sg4"; - name = "kldap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kldap-16.08.3.tar.xz"; + sha256 = "1h4czdxw0p4lakx0j0pf2v13ny5lnc56jhhjjb9ddm44b50fg4vg"; + name = "kldap-16.08.3.tar.xz"; }; }; kleopatra = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kleopatra-16.08.2.tar.xz"; - sha256 = "0pi2j6yrdw5nhm7kb3k5gg1qgs2dyijqv6r07xx3r260v98jz9jb"; - name = "kleopatra-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kleopatra-16.08.3.tar.xz"; + sha256 = "0ncr4sc6qs50n1w85gf350iq9l28665is53jzbm288151zanp4dd"; + name = "kleopatra-16.08.3.tar.xz"; }; }; klettres = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klettres-16.08.2.tar.xz"; - sha256 = "07jqr3n67g0rgcdnxh4bmak6335w86irdla791bpkdl1swxwmvqi"; - name = "klettres-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klettres-16.08.3.tar.xz"; + sha256 = "14m1k0y1lbkqrpwnjx8020d23fmpgq0jg97hr4q8fzs4h71lpyr7"; + name = "klettres-16.08.3.tar.xz"; }; }; klickety = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klickety-16.08.2.tar.xz"; - sha256 = "08nk4ihr8np36kzs4g94psh9xd5d8rpbhjd047pmw5226yv0lcr5"; - name = "klickety-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klickety-16.08.3.tar.xz"; + sha256 = "0izkwi0h2mc204wsmyg5hspnnc3xa8ypdzbw1rwgsd8nxv3sphbv"; + name = "klickety-16.08.3.tar.xz"; }; }; klines = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/klines-16.08.2.tar.xz"; - sha256 = "18w4mc781ysjhr9krvvwac2c0hz7hqzks957i35d0jvs5675l1ds"; - name = "klines-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/klines-16.08.3.tar.xz"; + sha256 = "0p1pbljqp01g9ssih5aplsi97aszc68smkpilbazxfvwc4q3x1ag"; + name = "klines-16.08.3.tar.xz"; }; }; kmag = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmag-16.08.2.tar.xz"; - sha256 = "0x5x2gs5cs3vhr0ss14iy4pd5rxx1ry67ic52nnj7baa3b4kqssq"; - name = "kmag-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmag-16.08.3.tar.xz"; + sha256 = "0ph7zf1awj47wzvp5dq80rvx0himrk6s8qhmnjvgpm0nqyfv7xh0"; + name = "kmag-16.08.3.tar.xz"; }; }; kmahjongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmahjongg-16.08.2.tar.xz"; - sha256 = "03yj71cz4ca847niw26vrssd56pjjgc04fmzv7vxlx25jb73cn13"; - name = "kmahjongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmahjongg-16.08.3.tar.xz"; + sha256 = "0fxkbq1p174lppklvi5lzmgi3g7411nhi33fsmdmwyxbngrm4yih"; + name = "kmahjongg-16.08.3.tar.xz"; }; }; kmailtransport = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmailtransport-16.08.2.tar.xz"; - sha256 = "0dggvmhp0w085pq0fwf83zzv3rhckmcnzzjznsn7fzw2lxj6ns90"; - name = "kmailtransport-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmailtransport-16.08.3.tar.xz"; + sha256 = "08xi04xr7mjg8m2bnp42ymvn9ynv4q8y3dnql1v4225pjzmp6bkg"; + name = "kmailtransport-16.08.3.tar.xz"; }; }; kmbox = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmbox-16.08.2.tar.xz"; - sha256 = "1jny5qcadw1ssfcfwbhfwwn0v5n6rd1v0rj92n7vj814ni41yk62"; - name = "kmbox-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmbox-16.08.3.tar.xz"; + sha256 = "0iaqq4mrfj4qqaj76i7crjriyjsk3h6rf3cisygvkkfyyb69nz17"; + name = "kmbox-16.08.3.tar.xz"; }; }; kmime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmime-16.08.2.tar.xz"; - sha256 = "06rg1w5k53dvrhr2pcclhdlpf9784c4s7d3zyklwlc7r93bk0mch"; - name = "kmime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmime-16.08.3.tar.xz"; + sha256 = "0j9nfsmfl1sw9hz3al9smxri1hr58ygmyxawlr91iyglzswxaakb"; + name = "kmime-16.08.3.tar.xz"; }; }; kmines = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmines-16.08.2.tar.xz"; - sha256 = "02dbsrspg5x2avgdc0hrl522qzkki3hzr9k8zrbcjdh3j2rli965"; - name = "kmines-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmines-16.08.3.tar.xz"; + sha256 = "0rnjdds4skxj9pxajfnybki4ikq99k5myaw80qk5dc08gnrmw4fz"; + name = "kmines-16.08.3.tar.xz"; }; }; kmix = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmix-16.08.2.tar.xz"; - sha256 = "0fgvzcvxvic72mckxj8hwwh0fs851c61p560rvp13lzwwjl1l290"; - name = "kmix-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmix-16.08.3.tar.xz"; + sha256 = "1p3gcll4ywwxwphygrwqrp1565va52q8nnccyxisd3h833lqfk3k"; + name = "kmix-16.08.3.tar.xz"; }; }; kmousetool = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmousetool-16.08.2.tar.xz"; - sha256 = "13fa5r3gzngbcma8xmgr5im5kwxqcpnb260z0jmx7la67rrd4igh"; - name = "kmousetool-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmousetool-16.08.3.tar.xz"; + sha256 = "1iihk8jcysz49q3a5nnn0s468yca1x7chwqpvqqr694fn3wizkfg"; + name = "kmousetool-16.08.3.tar.xz"; }; }; kmouth = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmouth-16.08.2.tar.xz"; - sha256 = "11xhzxh7rg0lzwq1wkr9a0dlsy70fy2d7nrmhi787xlgmcq1d1h8"; - name = "kmouth-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmouth-16.08.3.tar.xz"; + sha256 = "1km072jnp5cc3ib4ja0lxd29pspi9wyhbp8bgcph5m33kw2n3cbq"; + name = "kmouth-16.08.3.tar.xz"; }; }; kmplot = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kmplot-16.08.2.tar.xz"; - sha256 = "1mflaypy1ncg22pchfm632ik3kj65c3g1h48zirb6a0njzma81bf"; - name = "kmplot-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kmplot-16.08.3.tar.xz"; + sha256 = "0lv2jfg6klm3z9mpp298g1d7vxff5hdaj332pzblvp2m51sbhrdv"; + name = "kmplot-16.08.3.tar.xz"; }; }; knavalbattle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/knavalbattle-16.08.2.tar.xz"; - sha256 = "1w85z4m5yfj51z4yn60w83yfm2fnx96b313j4ysqgwzn6qsvw269"; - name = "knavalbattle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/knavalbattle-16.08.3.tar.xz"; + sha256 = "1kjndhwc4l4rspygaxdr8dj9s9rj8ayq1k0z7r8v5qz2355farc8"; + name = "knavalbattle-16.08.3.tar.xz"; }; }; knetwalk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/knetwalk-16.08.2.tar.xz"; - sha256 = "1nd2ddcf1m7nbxsmqiv8b9kxsifxyczy0qkdm02fl27hjz45jsa3"; - name = "knetwalk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/knetwalk-16.08.3.tar.xz"; + sha256 = "18l80ffcavy9q7sj396qj4xw1yghljl24762ygd9q0kmmanw4h8y"; + name = "knetwalk-16.08.3.tar.xz"; }; }; kolf = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kolf-16.08.2.tar.xz"; - sha256 = "1afbdms3fzbl62g76c40d2k96djf5srl4xkpa20rm0by1ksfjcbg"; - name = "kolf-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kolf-16.08.3.tar.xz"; + sha256 = "15gggr983pcz44q44m1yvkbyp5kwbmpyx3ijb2yxx1bvn4d5bp85"; + name = "kolf-16.08.3.tar.xz"; }; }; kollision = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kollision-16.08.2.tar.xz"; - sha256 = "18bi7diwzql96w41s7kmrvynrwg1h8ihifw2cb8ganjlp215r216"; - name = "kollision-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kollision-16.08.3.tar.xz"; + sha256 = "18kvvl87ykkrhjikq53rgj53ap73x2wld6b4aryd4jrwmj5wby39"; + name = "kollision-16.08.3.tar.xz"; }; }; kolourpaint = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kolourpaint-16.08.2.tar.xz"; - sha256 = "12rs8qgc30vma45ri7k3awigiqsk703lbl6k8dxbiir6nqdvz4n9"; - name = "kolourpaint-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kolourpaint-16.08.3.tar.xz"; + sha256 = "0igv18nrhwhylvm7nr4mfvyp2bpcgn6c3r8r61rrsl908qmv4byv"; + name = "kolourpaint-16.08.3.tar.xz"; }; }; kompare = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kompare-16.08.2.tar.xz"; - sha256 = "130019r4623wkmw44s62wnn01l96bc0b0d3l0m6nzgilxq8xj7xw"; - name = "kompare-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kompare-16.08.3.tar.xz"; + sha256 = "1ji33dhbak38w0b9dlrv1v4kh5lyp5pm2v77v0lka71l75cvc7g7"; + name = "kompare-16.08.3.tar.xz"; }; }; konquest = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/konquest-16.08.2.tar.xz"; - sha256 = "1m5pifwhzviz5hry0a26nvfh4j962mc7dnvl5n7yjwgnmk8m609m"; - name = "konquest-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/konquest-16.08.3.tar.xz"; + sha256 = "1b8fx5k6fncw82d6i8kc07qk2k4y4fwdvwlqn2pxdixp3fk1fj12"; + name = "konquest-16.08.3.tar.xz"; }; }; konsole = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/konsole-16.08.2.tar.xz"; - sha256 = "0kjf2yj5kz70pswrpkggz1zhwvm819r1qhg16i6xg43cpsfsim85"; - name = "konsole-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/konsole-16.08.3.tar.xz"; + sha256 = "09s8y3w2mrifpl9pfjrzf0q5fgfcdph0s8x85y7262mikwvqfx36"; + name = "konsole-16.08.3.tar.xz"; }; }; kontactinterface = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kontactinterface-16.08.2.tar.xz"; - sha256 = "1c8q9jywr8c3yag2vxlmkl5ri7wm7miyhgqkxavs9lyxbqqkcgnw"; - name = "kontactinterface-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kontactinterface-16.08.3.tar.xz"; + sha256 = "1kw04ixc6blmygi3wyyk8a3qnyd0a9d85r2jql3mzhz5gczik7b8"; + name = "kontactinterface-16.08.3.tar.xz"; }; }; kopete = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kopete-16.08.2.tar.xz"; - sha256 = "0jxrgb36snfgqbl4q1myala63pyrvaw1jvc9pf5bbkx8xpr5pk2c"; - name = "kopete-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kopete-16.08.3.tar.xz"; + sha256 = "0ia43yqmb802nqjlklgpyqy5pnkp9mlr7hhic0lmgvr0jyid43pz"; + name = "kopete-16.08.3.tar.xz"; }; }; kpat = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kpat-16.08.2.tar.xz"; - sha256 = "12mm57bpx92kbrk9f1xzvlg7knfhivgrqwa90lj6mgdsa39g27v2"; - name = "kpat-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kpat-16.08.3.tar.xz"; + sha256 = "1jb7a5ii8qvaqvivbd0hn2vxn9l9s83ahrx8idnlhqj1yriyhyqa"; + name = "kpat-16.08.3.tar.xz"; }; }; kpimtextedit = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kpimtextedit-16.08.2.tar.xz"; - sha256 = "1ybwx73zzyknlrg7yw8yb8dkr0wwk9632s3w7g64nskm5ps51vvv"; - name = "kpimtextedit-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kpimtextedit-16.08.3.tar.xz"; + sha256 = "0bkf43i7wdyign63gwz2215dr66zfpy43f8pszif5jqzlnc84kba"; + name = "kpimtextedit-16.08.3.tar.xz"; }; }; kppp = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kppp-16.08.2.tar.xz"; - sha256 = "0xp6qcdnl3dcivkx0mavzjw2shah1wl8vd5b15chnf1qn1pa00qv"; - name = "kppp-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kppp-16.08.3.tar.xz"; + sha256 = "04pszpig2dyvrprfkalxhfad3d9v5sl8sjb3r403wmvd701xbknh"; + name = "kppp-16.08.3.tar.xz"; }; }; kqtquickcharts = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kqtquickcharts-16.08.2.tar.xz"; - sha256 = "16qzqv3g7kckc5biphzzv7gmly2519mihd89118yksymp70cznh6"; - name = "kqtquickcharts-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kqtquickcharts-16.08.3.tar.xz"; + sha256 = "1kdd0n6a8v4paya9xw8si8c60k448mrgwz163qa3w54ylxmh2xqb"; + name = "kqtquickcharts-16.08.3.tar.xz"; }; }; krdc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/krdc-16.08.2.tar.xz"; - sha256 = "1jxkv7fsml1iq87y9jm04dhp7qxqyv5dnvp1yg5225xnvq2lhrzn"; - name = "krdc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/krdc-16.08.3.tar.xz"; + sha256 = "00kvijidg387wp1wv8brhdbhc3daa06n2k2vn0cfyh18s815mwbs"; + name = "krdc-16.08.3.tar.xz"; }; }; kremotecontrol = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kremotecontrol-16.08.2.tar.xz"; - sha256 = "1p5cvls132p585v5yxaw6b9fadmr1qzijh86z232amfb8iax23zg"; - name = "kremotecontrol-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kremotecontrol-16.08.3.tar.xz"; + sha256 = "0h2cjc10s876clsap93blmgbv75vxkjlpkns7n14420mz45j7aga"; + name = "kremotecontrol-16.08.3.tar.xz"; }; }; kreversi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kreversi-16.08.2.tar.xz"; - sha256 = "10nn66422vr5sav7yf5z1vq84v7kl94f4zv2w4ywrgbaknwkhyf7"; - name = "kreversi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kreversi-16.08.3.tar.xz"; + sha256 = "0dpk6jnn6sqqn8xagy3dsvf6c4irir0l8pfp3xjr3s6hx3jbgqn9"; + name = "kreversi-16.08.3.tar.xz"; }; }; krfb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/krfb-16.08.2.tar.xz"; - sha256 = "0kz7x4mwby8v7d3wr9fpd362db9fmh0agym5rq4q8d68wvzgbyi9"; - name = "krfb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/krfb-16.08.3.tar.xz"; + sha256 = "0kgm1wpxnjr79w2mqq6q5mg2ajzlim9c83030jdzqd5dr1y8gvdl"; + name = "krfb-16.08.3.tar.xz"; }; }; kross-interpreters = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kross-interpreters-16.08.2.tar.xz"; - sha256 = "13jc263vj0jsqvhlcag8an5ixs3dn2q35q1p29wyy1fpd80snhcj"; - name = "kross-interpreters-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kross-interpreters-16.08.3.tar.xz"; + sha256 = "1629b9ihg3g5d0p5a0f7igfsmwn45jlsy7gqbdmrwzlbynrbq0jv"; + name = "kross-interpreters-16.08.3.tar.xz"; }; }; kruler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kruler-16.08.2.tar.xz"; - sha256 = "1cy7jx8nc9ajzpis13dvg7hpd1a76splc5yrqyhbmb7cga50098l"; - name = "kruler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kruler-16.08.3.tar.xz"; + sha256 = "0awhsaysqsgnvmflrz4svd2vbnmhykb6cfn2331mphv4ycyi0zyf"; + name = "kruler-16.08.3.tar.xz"; }; }; ksaneplugin = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksaneplugin-16.08.2.tar.xz"; - sha256 = "1glvx52gzrprywmi8n3npjfm5ixx8ibx7126n6n284jwigcr580g"; - name = "ksaneplugin-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksaneplugin-16.08.3.tar.xz"; + sha256 = "0hg1xw45x6xk8q893hm72skhhm4p1v1afbvdxqasaggl6l8765xh"; + name = "ksaneplugin-16.08.3.tar.xz"; }; }; kscd = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kscd-16.08.2.tar.xz"; - sha256 = "0axjc68ag84pvdskbhwqyg40qmnil9n6m8x3z4k24cgajr83hmbq"; - name = "kscd-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kscd-16.08.3.tar.xz"; + sha256 = "1dyh79x5zgc20f18hysvmnfpg7f2wxjssracyihg2b8cyhzz2g70"; + name = "kscd-16.08.3.tar.xz"; }; }; kshisen = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kshisen-16.08.2.tar.xz"; - sha256 = "1605fmsrg2pyydg303kf49hncdjcdq8m2g2xam0c96bdn44kd7cp"; - name = "kshisen-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kshisen-16.08.3.tar.xz"; + sha256 = "0xmjk6pij18sf3mq8hp3fmcvhqdx6l44hvk6nmp6v4y7fxw3fry4"; + name = "kshisen-16.08.3.tar.xz"; }; }; ksirk = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksirk-16.08.2.tar.xz"; - sha256 = "196fjfyrwspzcm2hlqr09a079sr8p4gp80c4xfj1dhmfavs3cmvx"; - name = "ksirk-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksirk-16.08.3.tar.xz"; + sha256 = "0bwnlfa162n6a5kxzbbxwgxj7rgpi5zqaj0arqwlq075b1kyfniq"; + name = "ksirk-16.08.3.tar.xz"; }; }; ksnakeduel = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksnakeduel-16.08.2.tar.xz"; - sha256 = "0nw1fsd7q9ar0922v3gkpig8smvlw0va6jh9a4v8g4pfsk5avii5"; - name = "ksnakeduel-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksnakeduel-16.08.3.tar.xz"; + sha256 = "1g26ip287fnlv95vmk69ji76mr8lpnjrgj855rdi64p16wxwirjp"; + name = "ksnakeduel-16.08.3.tar.xz"; }; }; kspaceduel = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kspaceduel-16.08.2.tar.xz"; - sha256 = "1ww7cz89jkn28qpk0a3xpcv9ngh39wwzpiam64pjlnniycxw3zk8"; - name = "kspaceduel-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kspaceduel-16.08.3.tar.xz"; + sha256 = "0ycfw4mr25apr21ffxv0pdxbrda09k4him19hck3yjkkhgwzq7a0"; + name = "kspaceduel-16.08.3.tar.xz"; }; }; ksquares = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksquares-16.08.2.tar.xz"; - sha256 = "04j30ld2ly6gm1va0yw2vsfrvab5kla6dlxir31375b1w85gfhil"; - name = "ksquares-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksquares-16.08.3.tar.xz"; + sha256 = "1x7gj4bxq2aza2cis3br2y20nbljx4n988f70wark9ywz8hydg5z"; + name = "ksquares-16.08.3.tar.xz"; }; }; kstars = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kstars-16.08.2.tar.xz"; - sha256 = "117hk0wj649f2b158sad0jcqsrb1a8cw0blx3yz83fxw8z160j2x"; - name = "kstars-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kstars-16.08.3.tar.xz"; + sha256 = "1a86zqbwp9vwbf1xd7j5a90krcyn2gps38g57hi8dvblx8qlfv4m"; + name = "kstars-16.08.3.tar.xz"; }; }; ksudoku = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksudoku-16.08.2.tar.xz"; - sha256 = "0y3w626g3ah8r3yipxsqg71gh886higlmr8ai0sc8179gcmy84zd"; - name = "ksudoku-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksudoku-16.08.3.tar.xz"; + sha256 = "0fjlw7krvi3z1aaiivzkbl2hya2fv2gwfahckfbs05vs0br288iy"; + name = "ksudoku-16.08.3.tar.xz"; }; }; ksystemlog = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ksystemlog-16.08.2.tar.xz"; - sha256 = "02l7bchc767jcdpyras24k57qddq7pk4h7jaa22ns134977rw8yb"; - name = "ksystemlog-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ksystemlog-16.08.3.tar.xz"; + sha256 = "1c5xb9m4k5hwz5fv6hvigp12cykgcrkc95axaxhfvas0g9z226hq"; + name = "ksystemlog-16.08.3.tar.xz"; }; }; kteatime = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kteatime-16.08.2.tar.xz"; - sha256 = "02knfjpb0p3bgdfwqjp3fqnqz4i6cqshhy14w71wviprybb40cxd"; - name = "kteatime-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kteatime-16.08.3.tar.xz"; + sha256 = "0af9dvwihq3dj5zps8d9ahx6zvp9ifwhiswk6v0w887vyf5nym36"; + name = "kteatime-16.08.3.tar.xz"; }; }; ktimer = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktimer-16.08.2.tar.xz"; - sha256 = "197m6ywq2bs7kclwxsdv7w4mqfhs9ad3wgcbw6m3yvkyz03xl3p8"; - name = "ktimer-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktimer-16.08.3.tar.xz"; + sha256 = "0yyc6hykfz3smznskldn192zpjli3dfjkkqp3h5akwaag2fkzds9"; + name = "ktimer-16.08.3.tar.xz"; }; }; ktnef = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktnef-16.08.2.tar.xz"; - sha256 = "0mpavsp6p2ipxf90ararnvz7qvb51fy3w7rh5giv3j9wc37awi39"; - name = "ktnef-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktnef-16.08.3.tar.xz"; + sha256 = "0c1zzn18gxyd6wxvwxw36jbas1hccyfyk44nxpqjfs7g1wpzzg3q"; + name = "ktnef-16.08.3.tar.xz"; }; }; ktouch = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktouch-16.08.2.tar.xz"; - sha256 = "08zzibxcv8gh527j0qwnhjs4rsk01hrx5iqa9d4r2b508h6xcwm2"; - name = "ktouch-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktouch-16.08.3.tar.xz"; + sha256 = "0pjdj9idqizvnw3ld3kp27cx92s033kp9mv8wrf0f9rvzp4q8iny"; + name = "ktouch-16.08.3.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-accounts-kcm-16.08.2.tar.xz"; - sha256 = "1ql13gkc16a0xjs159pjkw810dph0f3c8lvjxlgzg5dnavjpkmsm"; - name = "ktp-accounts-kcm-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-accounts-kcm-16.08.3.tar.xz"; + sha256 = "0g3l2s3kmy4k7gkx5gvdcfvx9szr33cxj3g21qzyy0kga381gxzm"; + name = "ktp-accounts-kcm-16.08.3.tar.xz"; }; }; ktp-approver = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-approver-16.08.2.tar.xz"; - sha256 = "1n885817as1j9s8c6ppj02hcih4v7k778q88lbxwnps32la7m6n9"; - name = "ktp-approver-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-approver-16.08.3.tar.xz"; + sha256 = "1k4g6vidi0xxl3gijc502lzmrnk7aqvjc0gdzy0f21avbk8j7hq2"; + name = "ktp-approver-16.08.3.tar.xz"; }; }; ktp-auth-handler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-auth-handler-16.08.2.tar.xz"; - sha256 = "1vfnj1id8jisxsalghr13blx8x19r376dc2v4w46jqxj1xaiwglx"; - name = "ktp-auth-handler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-auth-handler-16.08.3.tar.xz"; + sha256 = "1hda8xgi60avy65x8pwh76xa4h2li2awrwjnndk45zca8ysr1rnw"; + name = "ktp-auth-handler-16.08.3.tar.xz"; }; }; ktp-call-ui = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-call-ui-16.08.2.tar.xz"; - sha256 = "0jk09x53cimcs24cj3ay9al0r91xjwqf5cjnj16ibbnqhxd8rym1"; - name = "ktp-call-ui-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-call-ui-16.08.3.tar.xz"; + sha256 = "1ywklfiqpq1826hhl00h45cslzbfqark4l7lb86lk9m0pibzj6sd"; + name = "ktp-call-ui-16.08.3.tar.xz"; }; }; ktp-common-internals = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-common-internals-16.08.2.tar.xz"; - sha256 = "1mw4cmrpk705dcka1v3fhvfz3q1r142yrik98jma8v4pjlm84n70"; - name = "ktp-common-internals-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-common-internals-16.08.3.tar.xz"; + sha256 = "07h6v78b70ri1g6a9axpldfq6h4r890nbr63nsd7fxp2gf2m4byp"; + name = "ktp-common-internals-16.08.3.tar.xz"; }; }; ktp-contact-list = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-list-16.08.2.tar.xz"; - sha256 = "0rsljaimdqvrxfp8sq1bckzkx23xr5pq2q9mrgh0zy39abmdak25"; - name = "ktp-contact-list-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-list-16.08.3.tar.xz"; + sha256 = "0xk822sr3aizlbh307vdxacalwil2ll4376wdc1dw1d8pdf1sbq2"; + name = "ktp-contact-list-16.08.3.tar.xz"; }; }; ktp-contact-runner = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-contact-runner-16.08.2.tar.xz"; - sha256 = "0b3rhrvgmkwcsk9jdr6j8kg80zrwdsza8297hrzfv76bpxn60dbn"; - name = "ktp-contact-runner-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-contact-runner-16.08.3.tar.xz"; + sha256 = "0pzf7d6v8kd6vwn4ir3b5k3l819cpb6w68q6n3p97gsmgwj1q9vg"; + name = "ktp-contact-runner-16.08.3.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-desktop-applets-16.08.2.tar.xz"; - sha256 = "0d8ypp531zhb6i8w703hr02cb863z0g8sbaadrrp3x4h2dff2kcv"; - name = "ktp-desktop-applets-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-desktop-applets-16.08.3.tar.xz"; + sha256 = "0pdr9zm4ryr176anir4v57b1qnjb3my3lp43bjs61ggrmi0164zn"; + name = "ktp-desktop-applets-16.08.3.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-filetransfer-handler-16.08.2.tar.xz"; - sha256 = "0vh6h9cbamscjm22rib1dx8crr6r4a1bq5p2rrq6bq56zp78gkfb"; - name = "ktp-filetransfer-handler-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-filetransfer-handler-16.08.3.tar.xz"; + sha256 = "1873gy2s250micc0d85g478ashzfqfs9z5qdz2fnmn7mdsmq0l7x"; + name = "ktp-filetransfer-handler-16.08.3.tar.xz"; }; }; ktp-kded-module = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-kded-module-16.08.2.tar.xz"; - sha256 = "1lh1pi7xi60dsyz5g608lsfhpr5p8vqsfdc2cmyaalkcixb7s4wg"; - name = "ktp-kded-module-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-kded-module-16.08.3.tar.xz"; + sha256 = "0ly7apbq7amzdpmhcpa1cy2v7r73pzqv02aa8w0hv8mg9akwr0rk"; + name = "ktp-kded-module-16.08.3.tar.xz"; }; }; ktp-send-file = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-send-file-16.08.2.tar.xz"; - sha256 = "0q6mnirx6k8xs6pkfwrrhgg1i75xrd9bsg2liyjrjgbgm1lwm0jz"; - name = "ktp-send-file-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-send-file-16.08.3.tar.xz"; + sha256 = "1ql78n63m39rr5hylkyqxh1f1w7w9sf9jkj484p5nmkni3k7i6h6"; + name = "ktp-send-file-16.08.3.tar.xz"; }; }; ktp-text-ui = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktp-text-ui-16.08.2.tar.xz"; - sha256 = "1wrxa65rx0vjd57qk4c7ak43vb9h8yv7r7618hnfycjr0mgr6gf5"; - name = "ktp-text-ui-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktp-text-ui-16.08.3.tar.xz"; + sha256 = "0p4pzcrmw2vwv1dna33ar5d3jm2lwmra9v46m2nm2wqy38q7k0b8"; + name = "ktp-text-ui-16.08.3.tar.xz"; }; }; ktuberling = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/ktuberling-16.08.2.tar.xz"; - sha256 = "0337fvw21h62y8zlib93fyk5wbwrgkakpyd78q5mcn5sazq7nb67"; - name = "ktuberling-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/ktuberling-16.08.3.tar.xz"; + sha256 = "11xdh4pzcy71b697agc9biwyx8h1ana1ayahqw36cckkcrs1c4mm"; + name = "ktuberling-16.08.3.tar.xz"; }; }; kturtle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kturtle-16.08.2.tar.xz"; - sha256 = "1fljwnxr8vvy78mlwf58p48wv45g6k4w9xs6kzb0j3xayg389x36"; - name = "kturtle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kturtle-16.08.3.tar.xz"; + sha256 = "0g0c28wdmx89cgl0bf60c4gvp31xih4anabbk2cjd7ikf7ifcv47"; + name = "kturtle-16.08.3.tar.xz"; }; }; kubrick = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kubrick-16.08.2.tar.xz"; - sha256 = "19avy6001n7kbxnbqbxxv62qwn015z8jjslys6s81if8bh9b81bl"; - name = "kubrick-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kubrick-16.08.3.tar.xz"; + sha256 = "127p0c023gcv3rhgraah7qg05mjqcwk519qzym1afj0rm9w40g13"; + name = "kubrick-16.08.3.tar.xz"; }; }; kuser = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kuser-16.08.2.tar.xz"; - sha256 = "0vlckiy3n0ghfzjkl22pk29qrl8y7hh6a9q4bfj7a8mwmkskr8qc"; - name = "kuser-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kuser-16.08.3.tar.xz"; + sha256 = "0yhwlcq24hyn00mfjc8qqr05gy3p2h8j1ls24jdka7h5l6kwvcpq"; + name = "kuser-16.08.3.tar.xz"; }; }; kwalletmanager = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kwalletmanager-16.08.2.tar.xz"; - sha256 = "0nmriayyhxhf43kladp6bpzrrmdfgf6lbyr1ibpqp33mqrxqgiqf"; - name = "kwalletmanager-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kwalletmanager-16.08.3.tar.xz"; + sha256 = "0rii58dqw9dcs809zc70cb2vwgp7g2154sq55r67v3v0hcq2paq8"; + name = "kwalletmanager-16.08.3.tar.xz"; }; }; kwordquiz = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/kwordquiz-16.08.2.tar.xz"; - sha256 = "0xlhl3n1dl1y6d1kbbcw4p60hkyjlvavrslq1h7wwjp99pmqr333"; - name = "kwordquiz-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/kwordquiz-16.08.3.tar.xz"; + sha256 = "13jqclk45niqi6m9wjj4hdl11ybzcs3k2hilcf2rzx88karfkvwf"; + name = "kwordquiz-16.08.3.tar.xz"; }; }; libgravatar = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libgravatar-16.08.2.tar.xz"; - sha256 = "0nssi286sra4rggvljwvqwx5r2h0h26wmafq764vj97qqw2r3ikw"; - name = "libgravatar-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libgravatar-16.08.3.tar.xz"; + sha256 = "047ipm4hsv2kmsi873rciqyfnszzz4p1f0i237zadx2bxr96fikw"; + name = "libgravatar-16.08.3.tar.xz"; }; }; libkcddb = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkcddb-16.08.2.tar.xz"; - sha256 = "0hvhl4266h1a05bvid1x7kfaxqa5fcnr4f243k5ksjp7sxcba1j2"; - name = "libkcddb-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkcddb-16.08.3.tar.xz"; + sha256 = "1jm0wzq1bknvfn1sqwwd95szjz6lpnyrxcnccmgscnl5rss1rsin"; + name = "libkcddb-16.08.3.tar.xz"; }; }; libkcompactdisc = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkcompactdisc-16.08.2.tar.xz"; - sha256 = "1vvhbqg7rzcfqadglvjrifnla6gi6aawh0ki36zshi48jhpg978w"; - name = "libkcompactdisc-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkcompactdisc-16.08.3.tar.xz"; + sha256 = "091jg5f8v4j8a5iam2ljycizvgncwn188lym9s757p6xap9j73f4"; + name = "libkcompactdisc-16.08.3.tar.xz"; }; }; libkdcraw = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdcraw-16.08.2.tar.xz"; - sha256 = "179dv05qkn2h0szzqm6l09ln491q2jz6j0fwczakh7lvlrdb2zxa"; - name = "libkdcraw-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdcraw-16.08.3.tar.xz"; + sha256 = "0svfi7cdasrx1xkmyhkzh5ynj29qn7ry3ryyylayjj1p9yrlqr2s"; + name = "libkdcraw-16.08.3.tar.xz"; }; }; libkdegames = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdegames-16.08.2.tar.xz"; - sha256 = "1zzpdlyrhhzqis9f9q3b1b50ljcsmpccxq0bdqkjm3ahzw8rvdig"; - name = "libkdegames-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdegames-16.08.3.tar.xz"; + sha256 = "0mbp69clwk6qcv79gxadjl8ka7kbhlgavp3wlpbknxldr74zrqml"; + name = "libkdegames-16.08.3.tar.xz"; }; }; libkdepim = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkdepim-16.08.2.tar.xz"; - sha256 = "1w7bkkcpyw4b14qz7jh9kw5z2q7qdk78lac3fh448xdhf1ci6svg"; - name = "libkdepim-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkdepim-16.08.3.tar.xz"; + sha256 = "1id6vhv6dlzyvw141kc2sawpjdqpdfq15dbnbj8hwr2g9jslyd6r"; + name = "libkdepim-16.08.3.tar.xz"; }; }; libkeduvocdocument = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkeduvocdocument-16.08.2.tar.xz"; - sha256 = "1f0vyblxyha6c09nkya7q4v0j24463qpxxkkghm2z1xb0fwc852x"; - name = "libkeduvocdocument-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkeduvocdocument-16.08.3.tar.xz"; + sha256 = "0y74gyyxxjysacr4klia7kwm7wphj82ygdxljidbmvp5bmxc8iw9"; + name = "libkeduvocdocument-16.08.3.tar.xz"; }; }; libkexiv2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkexiv2-16.08.2.tar.xz"; - sha256 = "00phw7qax09k2aapyx1rp5w7ifn73i7w83jpz3sr24njxbg49261"; - name = "libkexiv2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkexiv2-16.08.3.tar.xz"; + sha256 = "0wlh2zxh4yzn5g1dl9ffkim5v8wi888mrfnfxw2y4yrzw65bk9yi"; + name = "libkexiv2-16.08.3.tar.xz"; }; }; libkface = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkface-16.08.2.tar.xz"; - sha256 = "10arzszgjx8zs0d2b0i74bf00bs0csikny4d9j5w5hiim4qhxza6"; - name = "libkface-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkface-16.08.3.tar.xz"; + sha256 = "0xln9pz4v4gihz8pg1ijmp6ifmr0b5bp5fn6mkii8cwz1x12qvg7"; + name = "libkface-16.08.3.tar.xz"; }; }; libkgeomap = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkgeomap-16.08.2.tar.xz"; - sha256 = "1h91bdld51snajrws9g4pr7n3nlwmpnpg95xhh91fykiqlw919ig"; - name = "libkgeomap-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkgeomap-16.08.3.tar.xz"; + sha256 = "0rqscfd6jb1pypr8mdlc5jfn5wn4z5x553gp4nkpq37dwsgzsxm4"; + name = "libkgeomap-16.08.3.tar.xz"; }; }; libkipi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkipi-16.08.2.tar.xz"; - sha256 = "13gkcjx3x6j5150pkbb5ijzasl4418rhlfxq70966zrsn9a7v6ad"; - name = "libkipi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkipi-16.08.3.tar.xz"; + sha256 = "09pfsb7498bwzz1nxrmmddi7wj8a516xknzza08ls7pd6zm1y096"; + name = "libkipi-16.08.3.tar.xz"; }; }; libkleo = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkleo-16.08.2.tar.xz"; - sha256 = "16k8qqhrchxc8hk4l6hi94nhn8pavqm0snh357bx293f5rxvk51g"; - name = "libkleo-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkleo-16.08.3.tar.xz"; + sha256 = "0jhhzvpgpn77qisxw0bv1zjcfwcrc7kwdffvqdnnc8hgjmvrb5c4"; + name = "libkleo-16.08.3.tar.xz"; }; }; libkmahjongg = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkmahjongg-16.08.2.tar.xz"; - sha256 = "12lnqpdpzcpljsdhj7y624g4iigam2cym7yv1czir26nfflk61ij"; - name = "libkmahjongg-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkmahjongg-16.08.3.tar.xz"; + sha256 = "0ymzxl37dscqn90dm90y7fxgqlrjqdx2djhqgc6nfk5g50rzlwry"; + name = "libkmahjongg-16.08.3.tar.xz"; }; }; libkomparediff2 = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libkomparediff2-16.08.2.tar.xz"; - sha256 = "0d08mgswjck9lfagf0wh556vy1k2k8414ps6jhikmsbff6s44i35"; - name = "libkomparediff2-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libkomparediff2-16.08.3.tar.xz"; + sha256 = "019ibb277nqxygmky254p95n91kza92sb26xqrqz1mi8wvaqmi75"; + name = "libkomparediff2-16.08.3.tar.xz"; }; }; libksane = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libksane-16.08.2.tar.xz"; - sha256 = "1clk8yh3sb61xll0wpni2ccixsvxp4d0k5k8ygyb3m1glf802z5a"; - name = "libksane-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libksane-16.08.3.tar.xz"; + sha256 = "1wbvdffibifhdd7cdly7rf6kg25322xapnabylcyaz31r5qczq10"; + name = "libksane-16.08.3.tar.xz"; }; }; libksieve = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/libksieve-16.08.2.tar.xz"; - sha256 = "0a0gym7y4qp83fs94y0xvm5i1qbh1vxy1wz2rw74k82cbj1yzviw"; - name = "libksieve-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/libksieve-16.08.3.tar.xz"; + sha256 = "0yi7x90k923v350bvsan7k40xrlz0w506j2ffw5xmr97zqnhhq47"; + name = "libksieve-16.08.3.tar.xz"; }; }; lokalize = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/lokalize-16.08.2.tar.xz"; - sha256 = "13misqakj232y7ib89clgcc7r6byw7n2894x0ylkahj8synm1y3c"; - name = "lokalize-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/lokalize-16.08.3.tar.xz"; + sha256 = "0vk3rpzm0bjfh6sr1dgqpsf81rg8vvynwqm68646pfj38k54yf8m"; + name = "lokalize-16.08.3.tar.xz"; }; }; lskat = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/lskat-16.08.2.tar.xz"; - sha256 = "1i2s10csw9k6zjw9yk03l9p5xmg2gpw86xbsxp094xcncg7yml3v"; - name = "lskat-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/lskat-16.08.3.tar.xz"; + sha256 = "19g2c0by67wnh8k8wg2wq45bablhzqaml04pvmy5zbf4vnvmcbyy"; + name = "lskat-16.08.3.tar.xz"; }; }; mailcommon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/mailcommon-16.08.2.tar.xz"; - sha256 = "1s3n834i9c33ldrrsq8vqsllnnicaginrqj7cm6lm317q0mgiiiw"; - name = "mailcommon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/mailcommon-16.08.3.tar.xz"; + sha256 = "080wf6ly7wrrj8ic9nz2cs7qcj6qvmfm8nfvlwymkzn4yyshf9rv"; + name = "mailcommon-16.08.3.tar.xz"; }; }; mailimporter = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/mailimporter-16.08.2.tar.xz"; - sha256 = "08a0b7yk02df2fhr7cazm4x3v1qg67rzk0z2f14ssp7sz835bpia"; - name = "mailimporter-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/mailimporter-16.08.3.tar.xz"; + sha256 = "13cpfvbyr2i3ny3k0dd02353r693cn948cjakzw9jrfb7ha0rab8"; + name = "mailimporter-16.08.3.tar.xz"; }; }; marble = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/marble-16.08.2.tar.xz"; - sha256 = "1y8mqafji4lr8q1caipdgbrqcbivirzi8r6vw1iz3fjfbhi71c77"; - name = "marble-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/marble-16.08.3.tar.xz"; + sha256 = "0lxax24p3l04qcy2hmyb6c69s7cayjcq6m03nw8nbpjwlmik4b8w"; + name = "marble-16.08.3.tar.xz"; }; }; messagelib = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/messagelib-16.08.2.tar.xz"; - sha256 = "1kmiww8051bfldxb1yx1b45k78ihvsm3z7pbmdnw06nlz8a8xycb"; - name = "messagelib-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/messagelib-16.08.3.tar.xz"; + sha256 = "11qk72h45adgf4vmqb6vy8far8j9yr3s3ndj415iw3s07wkinhqa"; + name = "messagelib-16.08.3.tar.xz"; }; }; minuet = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/minuet-16.08.2.tar.xz"; - sha256 = "1cshjbzdjfs0g8lqxq6n7hnh032scrymapfc8il58rb3hir2fa0s"; - name = "minuet-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/minuet-16.08.3.tar.xz"; + sha256 = "0p3x1f4nsamhrdnmvpmnv9swi96823sb2sh6r0lfgyzamkkj5mhm"; + name = "minuet-16.08.3.tar.xz"; }; }; okteta = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/okteta-16.08.2.tar.xz"; - sha256 = "0gzriksvd8f409j63hyiqrj4j739f6apf99r4ic6271y50np9fk0"; - name = "okteta-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/okteta-16.08.3.tar.xz"; + sha256 = "01pl32wzv46xxq3mgb0vpw35vwmmdrkc4qfsm750ay58x99wm5hq"; + name = "okteta-16.08.3.tar.xz"; }; }; okular = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/okular-16.08.2.tar.xz"; - sha256 = "1hih12hk0jckprfphb0l67qpsrc2vgxvvvjb9wnvxqyvy29sk37k"; - name = "okular-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/okular-16.08.3.tar.xz"; + sha256 = "1wz4pmzi4wv5zc92lr8qrqfqmg2lymzfqhh6b33iqr39jkv504xx"; + name = "okular-16.08.3.tar.xz"; }; }; palapeli = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/palapeli-16.08.2.tar.xz"; - sha256 = "1skx37v3vx45xdn8m3g69qw1rnkhzzmnfxv5z0yiqvc9jdxl1zrh"; - name = "palapeli-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/palapeli-16.08.3.tar.xz"; + sha256 = "13pcwpks5bg9bw43lb4k2is22a7mzhkwl0sclp7lb9wn8qc831ns"; + name = "palapeli-16.08.3.tar.xz"; }; }; parley = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/parley-16.08.2.tar.xz"; - sha256 = "19m8czgzvr7rg5hcgig4sf28rngqdsx27c3p7qrmwg9xw2b3pgbr"; - name = "parley-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/parley-16.08.3.tar.xz"; + sha256 = "1s3h4ywc84bnhm217jcffiwb3654j8nikl0zzzi1sigr9vhc9xmz"; + name = "parley-16.08.3.tar.xz"; }; }; picmi = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/picmi-16.08.2.tar.xz"; - sha256 = "1z90b98rf7b089kl4gcll86xlq4d49lh4nl6lngbb6vv7xgcz740"; - name = "picmi-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/picmi-16.08.3.tar.xz"; + sha256 = "0qywy9n1ifyc5srqx3b0xzhmsv7h54llsxv0m9yxngrbnc7jc3bw"; + name = "picmi-16.08.3.tar.xz"; }; }; pimcommon = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/pimcommon-16.08.2.tar.xz"; - sha256 = "1gkx3qqnmckf9hy9kysgil2m6kg1h920ywj8kq0fafxhg57w6pc1"; - name = "pimcommon-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/pimcommon-16.08.3.tar.xz"; + sha256 = "06v8ak03rc7zmxmasqq12xi4misg73jag0vjy67a5izbqn613pry"; + name = "pimcommon-16.08.3.tar.xz"; }; }; poxml = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/poxml-16.08.2.tar.xz"; - sha256 = "0kpimgj0mrdbpma0pm2la1686y2nac4y5zd61qlmsczk0sc0g1d5"; - name = "poxml-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/poxml-16.08.3.tar.xz"; + sha256 = "0zp0lrlha5npagb4d04c2ga4kpxgi96si29xncff59nvw8l5p1cf"; + name = "poxml-16.08.3.tar.xz"; }; }; print-manager = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/print-manager-16.08.2.tar.xz"; - sha256 = "06560241d1r4ca17n62r26yxdccnkx58k4w127z1xsi12bjihf1v"; - name = "print-manager-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/print-manager-16.08.3.tar.xz"; + sha256 = "07bd7jyz2iwfw7vf63jkvhjk6la1gkjwz8nva3ms78b48byd96bx"; + name = "print-manager-16.08.3.tar.xz"; }; }; rocs = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/rocs-16.08.2.tar.xz"; - sha256 = "0404sp8hf73r0mxn94j4371m2ks6gkwkm13mn8ycig2ys0w6dc6w"; - name = "rocs-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/rocs-16.08.3.tar.xz"; + sha256 = "1z4l75gr5ixfzyk2198asbm8i6nv03wg0srxgf62pxx5ycvmkygw"; + name = "rocs-16.08.3.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/signon-kwallet-extension-16.08.2.tar.xz"; - sha256 = "12vsk3fydpjwai3l4gm1irhc0157qn8hb81d96kr07zg8k3jqjhf"; - name = "signon-kwallet-extension-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/signon-kwallet-extension-16.08.3.tar.xz"; + sha256 = "11n1ychcl3piar7mk3lqxi70vjw6558nwzlqkjprlj8kqbcwphg0"; + name = "signon-kwallet-extension-16.08.3.tar.xz"; }; }; spectacle = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/spectacle-16.08.2.tar.xz"; - sha256 = "1aylgyfsmg2jmgg090glns2qmy5bqsf43fwglvwmmfbly0h5i03h"; - name = "spectacle-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/spectacle-16.08.3.tar.xz"; + sha256 = "1ma5q9c66mbnbdv2izgfx7jpzlph3mvi9dkq89vkyr2hi3nznp4b"; + name = "spectacle-16.08.3.tar.xz"; }; }; step = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/step-16.08.2.tar.xz"; - sha256 = "1kiyc009cf0pw6qfn3ravfbch8cvsv5iv6cas8mcszh1wil3y14h"; - name = "step-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/step-16.08.3.tar.xz"; + sha256 = "0lii1jydca6ksvk0qqy08acq354xwwvh5rjkj58x836fxrb39y9d"; + name = "step-16.08.3.tar.xz"; }; }; svgpart = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/svgpart-16.08.2.tar.xz"; - sha256 = "1idfmmmg65cqga1klmd2vwp8abpafda4z1fsd4p383wfjkmwgp09"; - name = "svgpart-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/svgpart-16.08.3.tar.xz"; + sha256 = "0xriqcqffqdamxavby7gwjl4pxchslamci6xg0xwx7n0w9qa6vgv"; + name = "svgpart-16.08.3.tar.xz"; }; }; sweeper = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/sweeper-16.08.2.tar.xz"; - sha256 = "0y777yz51rs9m9lrx41mrj0wmp83vz6xc353acdk8ilm8lfqc9qh"; - name = "sweeper-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/sweeper-16.08.3.tar.xz"; + sha256 = "01c89p54h497fk9pwj0hz86vyfqnx83iajmr3pskfsbh601xmipd"; + name = "sweeper-16.08.3.tar.xz"; }; }; syndication = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/syndication-16.08.2.tar.xz"; - sha256 = "171swz7dqxp8c198hlprpj3lzdryvbz3603iawxh6663fa1da2lx"; - name = "syndication-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/syndication-16.08.3.tar.xz"; + sha256 = "0dqhrzw8xbh1zpxkj40sw72g6sfzhm0slsnvmx3p3ivas0slmqbf"; + name = "syndication-16.08.3.tar.xz"; }; }; umbrello = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/umbrello-16.08.2.tar.xz"; - sha256 = "0m32lxzilzyycw9jb72zxzprcwk19sj5h45hvz6w9nvrk9k80a6h"; - name = "umbrello-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/umbrello-16.08.3.tar.xz"; + sha256 = "0r1cw17pyyiq4052bdms4vn1vwzwlcyymili0d9m1n0ib8q9dpsd"; + name = "umbrello-16.08.3.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.08.2"; + version = "16.08.3"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.2/src/zeroconf-ioslave-16.08.2.tar.xz"; - sha256 = "0yl1cnpn86gkbdg0h8y1kdyjj4b3n3wmp9ifmczfd6jw7hsvwrm6"; - name = "zeroconf-ioslave-16.08.2.tar.xz"; + url = "${mirror}/stable/applications/16.08.3/src/zeroconf-ioslave-16.08.3.tar.xz"; + sha256 = "16hani3ajdysyrw5gy86360zki54kgmlzn65ishl6lzp8c8bp7q9"; + name = "zeroconf-ioslave-16.08.3.tar.xz"; }; }; } From 39297fa36bb12d100421bc3831ea999fbfd37536 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 15 Nov 2016 14:33:56 +0100 Subject: [PATCH 022/107] rush: 1.7 -> 1.8 (#20424) --- pkgs/shells/rush/default.nix | 6 +++--- pkgs/shells/rush/fix-format-security-error.patch | 12 ++++++++++++ pkgs/shells/rush/gets.patch | 13 ------------- 3 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 pkgs/shells/rush/fix-format-security-error.patch delete mode 100644 pkgs/shells/rush/gets.patch diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index bbad1f8cdf47..8280897c47ae 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "rush-1.7"; + name = "rush-1.8"; src = fetchurl { url = "mirror://gnu/rush/${name}.tar.gz"; - sha256 = "0fh0gbbp0iiq3wbkf503xb40r8ljk42vyj9bnlflbz82d6ipy1rm"; + sha256 = "1vxdb81ify4xcyygh86250pi50krb16dkj42i5ii4ns3araiwckz"; }; - patches = [ ./gets.patch ]; + patches = [ ./fix-format-security-error.patch ]; doCheck = true; diff --git a/pkgs/shells/rush/fix-format-security-error.patch b/pkgs/shells/rush/fix-format-security-error.patch new file mode 100644 index 000000000000..ed3ad0aa4c1f --- /dev/null +++ b/pkgs/shells/rush/fix-format-security-error.patch @@ -0,0 +1,12 @@ +diff -Nur rush-1.8.orig/lib/wordsplit.c rush-1.8/lib/wordsplit.c +--- rush-1.8.orig/lib/wordsplit.c 2016-08-18 20:11:43.000000000 +0200 ++++ rush-1.8/lib/wordsplit.c 2016-11-14 14:37:02.976177414 +0100 +@@ -2330,7 +2330,7 @@ + break; + + default: +- wsp->ws_error (wordsplit_strerror (wsp)); ++ wsp->ws_error ("%s", wordsplit_strerror (wsp)); + } + } + diff --git a/pkgs/shells/rush/gets.patch b/pkgs/shells/rush/gets.patch deleted file mode 100644 index 94b1f5dd2f51..000000000000 --- a/pkgs/shells/rush/gets.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- rush-1.7/gnu/stdio.in.h.org 2010-06-13 19:14:59.000000000 +0200 -+++ rush-1.7/gnu/stdio.in.h 2013-12-30 14:29:55.000000000 +0100 -@@ -138,8 +138,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not - /* It is very rare that the developer ever has full control of stdin, - so any use of gets warrants an unconditional warning. Assume it is - always declared, since it is required by C89. */ -+#if defined gets - #undef gets - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); -+#endif - - #if @GNULIB_FOPEN@ - # if @REPLACE_FOPEN@ From 76b1413a87fbe2be095f81154ce1cd4edccb69ec Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 15 Nov 2016 23:45:57 +0900 Subject: [PATCH 023/107] firefox-bin: 49.0.2 -> 50.0 (#20434) --- .../browsers/firefox-bin/sources.nix | 366 +++++++++--------- 1 file changed, 183 insertions(+), 183 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 9d895a383e1d..ac4bc88e1280 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "49.0.2"; + version = "50.0"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "34e58b3394e51a48e168513e73d916e76ff8cbb733cb85483c3f71076b31fb2d2fd72cc19994339cc23ec84989caf23514e84a393946ecbd2765ac388672ae27"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ach/firefox-49.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "fb640df0aa14ddf92db3f8cf94598b7321b2b9f6a0360de20a2c8a70e697e3a0e6f13b13704ce766766c8a7a428e4601e8cdc3044d64558976c81e34cb5b1a2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "8772744f9ef9ad3a0f37fcdddb90b08a105d65f347e6e1fdf66955a95a3e12e5e18dae2b1f75895fa73914744c0a9d98556e84c6a1813f4dc9d22d7633749688"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/af/firefox-49.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "475ad078d26386336954a747ca32722422122638632c75d8f8302875b5d3ae9c6271352e700ebfbf7bd226fa5d740c6eb4aeda83e6df712aa03583d54e7cfedc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "782e1a0d98506a66413f4420609e51ef8b49ff711b89345b806f243414fdbb1d179b1ad3e74f25e0aeeac0103ca75fb497cb2a6a94e1b138f98c593350a34c85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/an/firefox-49.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "2130aefd45506e9dfa56183955dae528edca747bbd186b108a5fc31cd0271017ec9d8d2f88ac061e2de94b3c235876d6c20f65c11c4a6ae95625db3633553d74"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "aa3d9ac9cb446b63d1275a4bc2172a127a002f07a2c98771fe09e5585e2617a9bf8bd3171dfec839a47ffae10b47a65c9c76403449207b745e8b587d5356ba10"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ar/firefox-49.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "4e1649a2feeafedd73f3b7a137105dc6fde8cd83e49b1ca58c65367e262e9abbe3b2be73e0b778503b33458dccc99a9ca8bb3f9a6a01a7989c20ac8a262f7bf8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "db178c3bdcff6f2c8166d28a380bf47c457c53bebb5d0bdd811af96d41b2233c7e487ac17a61a479979f494dca78800c289ce4e1f00a371bbd4e1478ecafedbe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/as/firefox-49.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "bc37a83dcfc488a32421a784559f6c236230c3ce189888c695ee2f476024f5d60dbf83782eac5f41824a63cf6d9c7e2f775717dd664ab311b1c4337c0a9489c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "7699c57014e5a8545fafe2a11c8dfb066d5f0c9fa3257264df78d2926b86cdf5dd44846ff3ce755eb13f9e34b60a78777b9ae5d0799890ad93bd390109ca055a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ast/firefox-49.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a2f0af3df56a3a99afa9f8144760545724f48ea454f84d51988773003d3550340402736a592cea1bfc3b4b728f8d38eee53fd22aadb6fc032902b14a5692b153"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "20f5911c186a9e11ac9f1913bbb4a5c4d6cdf99e4225c8025df0967420b18452cc10f8bc1d6508607b27ba067b2e9dfbeb68bf3ed08469d87997121363990705"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/az/firefox-49.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "85fa4add0e7dfcb5209c36a56438aa1480462bbaef29340fc76f710de81a419a3d6a58ccfc28592ffecc0464bae51b75cf0e658d078d7a18251849d5333a98e9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "b93544226bca7eac5220878f34b23e1a9a740dc2bfeef4bec90057bd0197d77e6eec142e04f072f227d379a085660f3d19e112e3f55233dd82ad59e9e91f6635"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/be/firefox-49.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "fe752476db9babd70882ba947b860a810f76dfb9f2dde8ccdefe72ce960a7676440fbefc261c3b70a6d6ded6874166b81c34ad62c159b1e55101b804e93b02e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "b0436dc79fd6064e5d455d6ecd5f835b6b1cd855aa147675502468c9a332698b4d91e505eb92a45bf2aaa8479074eeda745c7340852a071a4ebe4b19a6e9ded4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bg/firefox-49.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "892af8626ee894bdf6408ebeae6c5239b5531a52b0f107cf7f207f4f87225a0f3d690aab233e0e6db9628b29cc572d65fbb4ed3f3ba0c15b54c54fca195929fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "371dcf9a6cffa6fa5a505d390e082d6703a4ca906be8870a07d28d47a00f94808ee456409e24d50d1ac75affffcb2b1f341aed638a0c6d54407f7d7bf1484e07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-BD/firefox-49.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "866629e3b07bfc6884c6974d411b553f48edb18ab3b01d2d8b74e72b2d0c1bec4d8ccf451c00dc3567f939d78f7b16837c8b9c54e875a987294f7c9e88d85395"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "a87004782631b26012dbac62f6a3c2dd5303a65e1c3a23113e9a20419f280450a4bbc7008d3e78448db65f6bcd670011e27a76dc5f930d96e480e1fc6e8a3e3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bn-IN/firefox-49.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "4195e49bd40edf6aa3767be6c706d66e5d2a22c6e8effb57d101684934f5497d01abdc7f897c296e9129710365d0b34cb3f6f595a244d03bf0b25cd725433c11"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "a2977e3e4d926cc21e2dea941f34a7b75f0d99d454ae9de6a97f95e31277402420fb3efbf606098feac0832355b7ab36e2da90ca7b85cfcc3a9065bcbcc90c55"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/br/firefox-49.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "7c26ed2e7b9e37c97e4186fa02610205e4b4b4540a29efe0ecaa0851e65ffbbeca3b26b47ae99b8f87baf2212a8c5b6ab69cbc51ee4d3ef6805cd37cb8a936bb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "08f93fb2c29e2f090702570a9390088954328f22a69d50a2eabccc3893e1f28ecde95011b3c0ee1f2082a447d61f86d4417b5e54b39858b666c69b6ea546257e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/bs/firefox-49.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "1b4d4e9f74532974f7cf0382c2e4ca6cbee1dda11037df203f5a643305876e9bb33965ecbf68935b9ad626e77f86886b3deeebfd9326251f3dfe2b11a70c24fd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "e9b270bd2b2b2e48dace759ea61d0c78e4b0eaa4f9e44d418e37c55fb8ca96ca16304649b1d57b30a31575c2dc3abc4b4e40d89ac32fcf8beedba055bd38049d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ca/firefox-49.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "d44b1c0b434f92bff6edc4c514d5263f2d48e31a741ab10f8ca3a29c831b24058c1952ec09d4f2e2318d0b851281b0d228ee7941fd07e4828939b7652d86f08e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "6b687dd14de728612de1ac96534a57ee1a82bb5e069cb1a5715ca688d19f33fe00079339a7fd93e13674c3fecd645ffebb36ba84bc597ed047ff4f3e51d9aa68"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cak/firefox-49.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "35a68ed2b047a70253af24112554e733274bd531b5cf85bd82893d8abae19f56eb9e712b564ea44a3c72fcd9887338a314a02f9dfec747d5eb51fcc5b91e8e7f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "c206bd2c38e38ceb7722aeaa607f29ecefde9c9a7dce67f3685948e2bd347e18807398b050d65a0a0f7aa75af28eb360733a2b55a1004845d24ca00276f8894e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cs/firefox-49.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "7b0a0236d16b6443cd701b6b87347839d218e458a99b62cb8a85e47fad46d7dbcc778042906db189532e37f4392fcdc08c150e81baf838e47af1894a9a3f03b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "0d1a025f349ab6a87d82fdcedb2b5d5227fadde3b071d54347e66e4cfb9200b9a3e689898b286d5d9e92d05989e817c75e8ee633026a81e2c36fbfd89bd63ebb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/cy/firefox-49.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "e52b74c7ed70df4d9d182ddf43d3aa385f8d9d3020a51553b2abf03ba1e1002c56571b199f8e96155eef25bcd296add90c59eb389e5f96b9b671a67819532a42"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "9760bc438dbf5d318d34767898e4c585435694ba051fc3e88b9c21fe64d2513ae306d30655c021af6feb43de62576630dabbdf84dc379978ad7f27293206863c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/da/firefox-49.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cbaa47308c0718da93615fff7fddd026d9396dba581b9a095bb86025a63e0eafa900aef6ef306888cb6c8371d9c5d5fca7f8facfc3f603746d17b3acfabbdd54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "5bbfafea2170467dd84a297dc3308d73b01b41c89bac3fccde203205bd8a2ef6b699d239df22938d4edc71e6074b4d797f4ecebe6140ecf28e75e07a35bd86c0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/de/firefox-49.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2b86397fa086b15afb255f733ae12e821ab57b5045e3cb5e47bda703bfa170ef879c966049c2bca5c15f76136af250489c49e313674e878e1d0815d02e5e5d84"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "e761e49fe6d38ff37688b6b700c943ef5461e99990ddddb6b642403b9ed99cd815286860907245d27c3561f1e26d16b757a631ebc13de05df61b86bcba272f1a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/dsb/firefox-49.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "ce65e525200dc1b6890c1ee5c847e2c720680b28221c700367d373f0eb262f10aee1831348c27b03af9218cfc14b40106130d62005107c674b5e4e89bd8183f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "559e97300b603e1159beefc3d58715b437a9741cfef77f8c36955825e103d3510a88617601e95ab230b7dc27185b6ac091aa7659b7fb059a6c4780ed5efd3977"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/el/firefox-49.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "ddfdce0ad9215c2a41e659c8bcb0aa7f04bd4906e5420ea47c64158a15ab111f8cb4bb410fcbaa2a747e74621dc8fd13fcb63861f5bce06bb045c4170501bad4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "cc32b9418874f1fb60d2103a03a99bf56d2565be31e530e19ffdc4fa3f855d6baf8ee6e03363b1ad3beef624c9865774abae8563c7744e995ab13a3c4b50ca3d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-GB/firefox-49.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "85b3f54f69de86a3461e977934a21ce1226af04c3df07635e592b1531c06084a31d5fe50687990d982994cea747c1a32e4f6ee65c90954752c05494c5a144583"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "fc7309f05662a2bed24566076047a7ab328bd098c3764c7b8ac8f58388be7225a26d9e917542b712338b29cfc06a603569750d607818946e2880f66aee8a892c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-US/firefox-49.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "cad0ee863c3362e3e2798ad9c3026d5ea5ed8f46ad9409922fcd8e4a9fff9fa7d383bd32d7e0e13aed98116f85463060a99044398a7673fd2015a97eea06ed1f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "1f5411b427384132e5a4922249d1cc5596942840ddb3225864e888651dc50dcc601de59d52caae242e3c09733113955162a061446181ab85a582047baef019dd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/en-ZA/firefox-49.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "7846e2db723636407eaff1f7d8327f683ed2e76600e0b2ff4cdbf4a2f5ffbb54bc7f8004a4604abe128fe15809f7ac257cb4c895c5a8d434e20fa896f73881c2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "71544335b093db847bbb75d95d85ce79fca7ef628172fae7a4aaa42f1860ec700472e75cb42b5cd7ecaddd62e86cf99cd105b2afb03f6a523cf8ab430398101b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eo/firefox-49.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "1712059dd0583535706f91819aa664732120b9771a2db9c19374b82dd99c3b08c5f96747936c4e004182e5a4c7226e38aa567385a91810b2d6569080881defb4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "7641053300343cae1ba6167cec8f35f02f7536b1d711dbe3522a52c3de841d4a1ad8798295ebf01805a7897118797c641cef380fcb00b59ccc6c609023df242c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-AR/firefox-49.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "1c25707e13c94039cbd2f05c72c8cff35c26f31566a89f238d27c5277362a4c9b26f57c85b35ca9740b14a8771c9dfd54346b1db8d843827d61184d9ad7063d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "d9a10289461272833bdc1423b0e943633edb352ec3db52511f64c35b9f36c8a9b807432799ad140d6086a839992bdacfd864f0110756d5991f288abf1e9060f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-CL/firefox-49.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "e96dbfeb2c5d17f0e174d7975e57ec964c8dc6c4322b510a1819eabc081f371f43b63bc85085c8ff0bb0380afc9c2583ae4bc0aa4224dad99e0134746b96019f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "db99c4ccdb514ee68291fc41f38a0c0fca22bd235831b4c079a649e6e5b5a6b87dbd7512ba44c72dec31a173d128907298866b4855ab7259168402e3709e4114"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-ES/firefox-49.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "0f2497e1dd719905494e2290f2dd09ac51b51058fbc27b65a23eac3e2d5e49adbb88a845e51393154ba69e2d5e67d7cd1911753efaf43838587ad417f39da251"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d612e453d1f952c65a5352f54f52189cb8b92ccbb7bf8a191efaa7f919748dc8538f07152b3182839ccb3f66171d7e1d48a1927a3a346e51dd23018d144b0453"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/es-MX/firefox-49.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "f1c47ebab9dc88932ccb93b24b7411080dde9ebb335b1d8f56041d1841f8425d104d0c1cb765f01222325ca5be10208f8b3326ad5aaae474ccee3c828648b4a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "683ec0c1eb4716b9b8ae897052a1208492a24ca6803ce890d5ad4044fbca57a6d8c58581c54faff5753134b6144d157202d047e0b80cda1125df0d9e495e7457"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/et/firefox-49.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "a3da302a585a4cad943a71a8f6fa9376821e4ab4953acd56ffd3f3993fd9e8971bc0ac1b2e5c37a8ade28a0fdaa0b47b277abed18f38246cb1885de532186afa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "988a8c2411dc43e4599c9db2a94e220738049e2cca4fc59ca073e2c215a71598809d5102356fa36132b5ab0e5a552183252ecc17688ad83a76eefe726f62e7c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/eu/firefox-49.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "873ace38cbcdcd022f932c1753eb9b4c9124a41b2589e89a84f050f90383483b6fa8d793a830d79860fe6f20295b5a8971775136e70877256f9b23900c7b236f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "0a1119a749db6cc2b277f4c1037d8163b6f35a0bd76ac0c121941502a821ea9c698822096037c242f29ffe85aa58fe97da821eed0b8995ef8f94f373567cef95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fa/firefox-49.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "68aba1cc55f22c39af1c68e4e77e5f8eed5005a1f7c4903b03a3cd711a9583a99042cf82d2dbdeb74b897ea1d840888ef7a417d9f6142b626d8c2f3654e01794"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "9cbef7bc67fe071cf40734eeaa64be8ee0b7f3c5428cfeaf5b81eb4eef5c4fb38e36af6de389164b2b0a65f2cfa0d14b2e933883d343cef1212f03f6da9c1801"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ff/firefox-49.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "d8b5362bea1305546da3681c98452594c5b15ccb57945efdb7b6971cfd07b7b940c9952a8db8143ab9bc8ef55f034ef9c8a162ea9b8dd4a82af033f99c34d9cf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "4f07573325b6def42bbe66e7dac08396520b66eea71230fcb432724cd6187c11d21325ae6084ed6c8c416b31f2a582fbb0efdf98905c566cebfdfae002875714"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fi/firefox-49.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f5dd198d264426ca8e759eef8801e31d90f628788451ea4802397a525938790a7b83a68fdba6839ff669239c79915f9596cc7f0ed48454fa528833041d9b7e85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "135da7e143fda33c6821002a0153cee11dff432bb75036731af68296142558f371d595f448dcb74b848b5e7a9318e80f2d0627c1554d9fb47de6143b5d2fd046"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fr/firefox-49.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b57bcc4602433cd703ec660b57b3b7d72c5e859b69d8b12c77a8250a09c6148fcbbfbc3bba59a984d8dc3ab284c11dab9cec1ea67e9d1f56e5f0b177e11358bf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "901833140bdb0eaa7375fb9f83a395fb62de11df2b094b65e4fdf9c1c1b55e1fbc61330fab861214c843bdca5722f1f0f5c25765b15c883434fbc571d86768e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/fy-NL/firefox-49.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "3aadc1c35a8d498b336fc9f6300a467efc1d51161dc15099fe8d588deb4eb6f4255d2730ac21c9cbb98b136ac5f31993458368892969d0bd00423e778fcc09ea"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "42f85212a3826f2a80c957ab717e918b0f3ca622cd057ef091f5ad749bc6b3173db3e8d0029ad1cd79d33b1d0b88eaa2b8e3de22ff76895cf1abe3f166610c83"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ga-IE/firefox-49.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "e2103c5af60b6d318f8f009418811f0f7c27933ccf1b72ca998b8e66dcd61c3e833a8b3a9f078f0ec212202cafdba25f8054cb13f999a8aae88310ca6439b797"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "b00d74f2f954395027d48a1c91325ac21c0bbfc2d20a44242f5bd8f74780d6e2fa46e4344113592b5b4f6c8d106406eb62d2373f3b8adb042cc8fcebc3237f98"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gd/firefox-49.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "fd1c042d586a59ba35d77095cc8f9a72a74a68c3e90318050854433f74b79a62019535f0baa63e33c7687cef401ab1668694ad1fa54a6dd731c77ccad66f599e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "e339859eaf9b2bdd8b4c09e2b3c22f35a8b72bf9a5c3fe4756576c34318cd1219c663190596196801acc09652e8710c8133e91e9abf30a1fd9e4c2721a9270db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gl/firefox-49.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "3beb1c6cdd6372615283af42074c4356009addc9ad41d98b01d008896182831c6275dc2398dbd477b9befacfd88a84415d2a45ef2f03d4748de8c5837fa4e7c8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "dbf599e7eb564146977cc59587b40bcf02c0e6b0e853ab71715635884d883e0427fd53df6950e7da9bcecd979bcf5f9c5a08cde9894e8b68d6faf42467baa020"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gn/firefox-49.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "0e6f7818fa7c22483ef976684730b93e5793cbbcf79ff96645f9527b41d1bdbec8b0c25aba7ef5a3c4895888a9374dbb259ffa7ee95a1c3eb3633d46848711a5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "c439babad0a48b8eb495b65510f33879038b950ff11820f7cf9fc7363092e761a95c9e9b7b9b51b7621efd4b39ae4ba45bdbd0ecf9fa14aa2bcba656a38a1106"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/gu-IN/firefox-49.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "48d9c9233115365bbdd5fcc4d5a59f5e254394b030387f4338086552734376bd77a7d4405ba75807e78b332d49fc04dbe4f2ce9c4d4fc625eeaf5ccf2cf29a14"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "a74cf826abb5ad09b4ad76e5292eed081c904560fa7579c8ea2663bace3e23f630f7410782e47b44bb123693b5a053513e07e3377b36770d3deee4bbf8334b4e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/he/firefox-49.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "0266dbce27dbd09262b892d4bb6f8179cc5f710ad27618c6f3fc2f4a4850d715c12162729d17b87b60327b057fcf5e8ce0e8d64c7fdfcd56f41f0396e34ff5f2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "ffe0bfc30861ffbbc50fac77fff688bc716e4485c11134757c6ea1096ab6a76311d69480f47bbb6ee9d67b6c00061436d8d402b31e3c97b86283cf0a027d1b49"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hi-IN/firefox-49.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9ade7154bd38c9fac3291574d0ba956ef39c47d49d24c4a0006ff28b6065ee020074287e093742bc073b3d5f9e32ca517f84054ae5df72e513a7c4dd1da05903"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "0d1d75e61fd2e70e09168e1cfef9a936868d49c31a0df036b15a98f5eec353c122748369eca9ccbf696621702ec3e2521b76ce92a6c9ee0cc4ac7e20ab6beae5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hr/firefox-49.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "da7ba8fbb68ea0028408ceadb328fdd59b2df2514948cabf14da56ae548441b697598eb199772e65fd6fa001ce5e116fe8bdff9818c54110dd4a9574a021400e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "f3bb00b3725fb8c5817923a2a40af5e21abe9b85304be2787987132822af9318cb7b1c7f1f9657543e1b8e07f09870411e00c061ddcf293c5ea0634784197390"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hsb/firefox-49.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "7119d7730d4231d2e1a9c3da810fa1f030afd4fcfdd19df2e7879ce294bc114468324bec41126aa3a234604d30d4fa7517028ceb9c4258b470b4c45b6e796131"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "41f68050eab542a96482f63769b3cd760b5a61ef06c5e11af78be7428d287d06e61bc5367b9cbf30a96cd33e785c21f939639e64071ed1828e0a2e9bd834b584"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hu/firefox-49.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "295f9f02994d40c658f70819d42ed9e5066b55675acf4f639ffa88b5b922d586b9bede8a20608a4c6e7533b206dfbd5b4c78d933d05c0d45e6d248c7e8ede611"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "80a2f18d1f2a306005761c7df5a7eac3d5c1a0ddf8a556e9ad641ae1d0f099c359d9950a1e29f9444c191d27659242935b8ce760d80118096c4334047ef4c3a3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/hy-AM/firefox-49.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "318767607dff10d4ddc5b18e77756eef267a49c5a8d866c88f971cd126577632c9385c7f9981282f2720af82a7c050db098312e07c5d8e7f442d6610fa93f935"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "33355c4b3a5bfc0737bf8d473bfa0b91eab12ebf1f7960f2c06e2b70940e928712398147eafed5e3e72ebd1cae3ed0df262bdd3fbd9b8314f52afeae1540ccb9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/id/firefox-49.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "dcf596d4013b5d370802b0f717e327d2cd2c6fad377e77e3230d2d1f9b9cb081bcd6af514a56aa06bec625c5fc55213022eec4ed6fc45289dcd459205deffead"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "4e8bc5fcf1dd6e059bb1aa79955040f3a59c814b3bd3812c59df83a9ae7e07d0b9bec64c14ae33ee9f6688ad027e3545d54a435fda8a340f11f4bdb96200b5f0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/is/firefox-49.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "5368d47f4676eb165b91bed0d9e53f0f0e9bfb4b0edd821e17b689267b90d7932c84b8668c1e5f06f7ee3dc6a66fffa2516446f1ad40faaa87d7fd521053085c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "23d8b1e901f213a84123192796cc314ef6bcf664f31c15aecbf1112911a4df76aad41b93806067437cbd40c0722b54ee1139911b32057efa2f783819d39fa2e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/it/firefox-49.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "378e7765f081bb2abd25bff5bb3a89046a9f2bf09390c2830f916f8c7e811d32359cbaea832d433062fdd31b9251242361483851e91a15070b0420cc7a5d6344"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "f20fb6d3bc76c5ae40b11547ee1f4542460f781bc19a88fdd70dd95e5fb74de2adc3e642283d2baa7ef26cc49e5574addadbb5b18a804dd77b9c83900c15809a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ja/firefox-49.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "aec4ba1d3c33bd586649b219a1fcd7beae8e51bdab1b44c311414cf141f452550a41e6a5044fb2ed9a184938f49e2196f97bda93e0cf5c7400463222da1e920e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "b7e72ef90953825ef50d98acdb0040b9a452e5e7f3661dd1e574eb045cf8679375afdf6695e866a9e70eb2d46c38d3eea5918b8373bddd6956ea42fcc3c50a3a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kk/firefox-49.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "c2c03344eb5cbfdc3555221fd66b245c38ee9fb5df40806ca475b1b5a94ac7c488816d18946c7cea0b8a556519d4d40d39224ee327ec59fd399c3c8e761fe575"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "1f79fd7893de0c5c773912ce5c96ccd81f29fa5ff879ff882d96dfd778b12c05f9476fa8e01a2f84d35dafbb53aeaeeb53f9a06a7abeb0b93482dd8c430891b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/km/firefox-49.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "ccd6987dc3bcb13f483c12015933801b6e4e85d0de1f9179e7e959ee7f6d75bee79de67551bde5ade7c5d0afdd58aa9367fef13f9caf0f31c9626742e20f03ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "c63724966e962bd383ae8ba0dca744c547c9a794f0f96f1a51bb2bad04a786ae3f00a09a39d679c28db254c37a99795f474042fb8dee46754ddfb0a7c50297bb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/kn/firefox-49.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "8916c80f522578152783af409b5df23ea554f4d711a1d85de1445678372eb856a2798263b2e638d72a5dedf3870fbde5c23ebefe7d051bc5c781f0363447a112"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "da33a16e3f8b414cc32b9dd3b4993d8c3645fae0066e92f50d659dda50de664ce6a15c0959f0b3883c7ddb23e14620e5d045fc0961da4c6c57bf638ef238e871"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ko/firefox-49.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "fba1f0fd69974d679c52246b9977f4d03d70c32ef4c77831d3305eaa30c4e19cca36692bee92aaa5195a4db34b162b909dd4b56370a4391aed33897b7f36463c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "28879f30f4db7f26f5bccf9219dcefcbf79437dcbe84d2ba7a27406d4ea4e6b4f3941bf2944400952c37df861f65db98ba60581df33a49a3b513c260ec33afca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lij/firefox-49.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "d0eea75c2bcf8f1040025807ff496c7e48b0949b633d475367b9721cf6c3447d2a30137afcdd54217f1d226cd67e3e5413d348eab9b63f95f3bb96b43e5fa5b4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "0991e328fc606eea0c7b67dca5a19c2c94a925d20e998994bee262a90fd69ba592936f29fe88ace97607c1bc3207f5f30ffafb5044a6e088967dbc2880bab154"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lt/firefox-49.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "eaa6aeabf0f1c00cbd08d69e2a03d332ac9b022711aca0b09794ead8989fcc714313e8157de1884cdd3364b1fbeeaf62d31d61aab9baf34bfe97b5f56a55682b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "113b76cc2e5f0467b7cf02091857dc60bdb1fcb965089ad8a7196dbb15494642d161836d79035c26c09aade1ea1eb5cd734dc23ff80402b5b1b45efae9770892"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/lv/firefox-49.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "531f667d61dbf8b6cd90c918464e8456f907c964899b5819ac91fa6493b446ced18ada61c5a2227cc7bc044851142e03388e1b924cfc135cf5d61d1642369104"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "42ba06b3c89c9702574f89f225663dc438bf4d2c8cdc698e80e46bcbb292814fec2487b540a3b4e4cfb484c146a34bedfe3cde0af504b9453ee7f7dea6688c29"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mai/firefox-49.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6dd7fac8a46343a0abf3958a044e534e0669894f30611aeb753a77cbb0da607f240672d1912490a3d05f312179d02ca96339e92f104298b9ccad45ab076bdd3e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "fbe110a9ba35be23b38511d5caffd2d1d0d365d881403b287980727987fe2b40ada8d6fa656faabc4eea4bd798f13ccc00de90091bf14cdc3dd4cacb28349f6d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mk/firefox-49.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "831d7f10a08bb9e6bb5ca163c8e172f9a4855b2062fca66c4832192eda45b20d64585f88ddb08268328e00f2d678b943e5d961f630cbd9730fd788997101ce8a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "5b7e6f3c8ae0dccff269c97b8efc3a77e0468f0689a90afa61cddf8e88c3f3f4c3d9bf5ca0100376dc7d23f4d676739a2582235edee8bea836366cd38a4f4fc4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ml/firefox-49.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "0a6ed3141038fdbd9c4a68dbac0178a3735d6777b60cbab679d6115e4c3b382bb59c6fe964924695a23975b44c064ad997d3f2f053b76dd8a0f241f157a86a54"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ab8d8f2984e94a37116a49453e0662a56fb83b981ef15627f5e328dc7d2bb595f09d6efa51d8840ea351be48aef311c177ddb24238bee6a5b7bc3996f7f888ba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/mr/firefox-49.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "7bb1f611b4304f514183cb445b2bdd8d74140a4758b4c3a9664d7f62137540db191eecedb52287e45c269198f3d952c3e617d3bdbce2606dcce3f12efa59f5de"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "c6ff426bd09681209a36776e2a4b4282f3c4d50b3c9509b1e964da536527e03ece806b6d615e035a8f7425752d4796f11bbeb51cf8ce10b7c4b2770096366d94"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ms/firefox-49.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "dc7ab98a4d65df6a7e3496bc4ed37db622c8c26f790a2072f869cae8e4232ca2a3a7e299af25e7bfd855516e2de41745ef2cfdf2452e4d98bd60881c0845f44e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e4a2cb87bdd925faf6518e38fc7ccfed781e679df22c5456239cc5aec0afb5aa48f774225ee6fdaf82c6de56ef53c8738f8396c76a133c5eeefbac6a9ab96af7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nb-NO/firefox-49.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "5f0e719b40e67832968a1e8c9df8c3ddf7890b3e82ed555a3a2369637202e5f4c9f2a0b8faf7a2f6aa6719b033e3ad4f27dae3d6b5b0f0333615a8bb636320d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "cfc57c748e0f940ba164b13c64d1129263d890e489ec0753900696947f869ecb1793f69a1f8b2cd986eecdd857ff7e94c28985248950f6a15f6ab15acd9046ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nl/firefox-49.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "e7bdfd3976ae41a5f9fbfbd6b177f5f6815e68d9069e8916123574afdacfd28e0032211e7b1760275bded18bd3602ebf5697702edf89990c3ebac3efac381861"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "85fd914b626e27727461dc269c125539793e1a1c6001ea035c636bfee62d42ade799fb89bfba0bd4a915c5b33f6dd4569845cce3f189df1cb31ed2052fb90c30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/nn-NO/firefox-49.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "6a478dd27c868c5e5ec0cda838044ca132eb89d93dee8556591c5651ad9ef8a6d89522498dd5d004e8e84d7ae40c09c69faac63591270b211a60b37667196a6a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "335e08ee71febcca07e7d11310ed407a888aeb840c2cfc960a13706ce7ef1ecffcf6f8a21f65e1ae1606e88a3b383f9f3bb8d3110a8f3ae768c0c4277d3cf5fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/or/firefox-49.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e4c4708c363346af1e7e58664baff9003e890aa934ccbdebaf682ec4b140bed7ab9b93cf657440401672ef1cfb79916d63f164066cc8ead18546de4718aed9ad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "67a60e43ef5670dc2d669efc62101b87a1caa97c8bf8052c66396efa75c11dd90717b78b7dbac17cb8207549d26ea41d8bdb2965ea249618258de5892c4a40b3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pa-IN/firefox-49.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "c77dbfb443da63d0503a9c3586d01517b463071bfa8b739397b070ce80b8fde2a6ae86ba4552a2efe995eb7eb47cef7f6e2688526c7455c9d308dfdbd229ae6f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "85f6e5525f0e1b6d691613903f1646c84bcb7758092101c5b64e2190221e5d041e66938845c97877dc79c72aacaf9da6d6009bfaf9745d7138b58bf957591880"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pl/firefox-49.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "0dfccd89d0c8a58a37b66e3034491139ad5fb16102f229c45f5ffcfabe77fc2f6a3a5d01f38c2471a770a1c8c8cf884e3a65cc793efe298366098280eab9da71"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "8b4ac20ae1fc5a7370199c6dd1e56f2bdb8f394b84e61410d4d33916de3aaab13d1c36d9944f8d6676895838aaf5e8a8beb0d5eadc82429a827214f528968aab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-BR/firefox-49.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "2c34abddecd5a2b83d8abef842b165ebcf601b7b90ffb8dc80a265b5297ab33da193ba450210be025d9ac8f826b7b4227063d66c9624bbcee06f01c787406a91"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e5a1618114152348b19bc88f7e584d8bad09fedc893ccda0b38b55a1c449ec7f53f74dbae5901414edf74e4f3946e997e79da1ee597db29ff2f884460c2596a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/pt-PT/firefox-49.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "6cce28d554977a263c4d38675f88bfaccd4272c75ab82543b023f57ab503dcc806cb4f824681aef47dc788ed9fe85d54b0b1026cb0dcc4031267715929269fa7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "f06f72078658dc8f28fe376af8459980b1ef0470c7fd9557afb3cb4052a14e4e57d6e6131b5f158859ff53efa76ddccb10b95a5731a3c42654907bb8e776db85"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/rm/firefox-49.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "73b537df635d7278f8251ee0de6ddaceb1f9f843187d7b5ec5f0a7ccb8670cf97020a4ad9d22a4479b12dd0e81c36b94f557fc99f45dc70e6efe1914395d788e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "8ce0260f462af9e2035987af36d90bf3b410d450cc69baada0326962b8a682c5b0e905c7d8a4d30875e4a6f09ca21a04c38db21955d3834c7edd3b5b72758e8b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ro/firefox-49.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "d195066b01b39292121e4016a93d5e2ca02e0f8c3941f371a8033bcfaa4bef2966244ab0def982b1d8814b8d4af95be14b3e4ca3b900401f142aba9376e9387a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "5860019163bd0bbb2f2a45396f74618358f294bc0a18cfdef148c28dde288050432bd4e1f68cab46b1d08e822f8850f5d940e6ab153a929052e5569199cfc2db"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ru/firefox-49.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "67c6e5e5fa32458db4fb4849796dc042a3f8f8a681c7cea52160f21841776dde9b746a068b090dd21d8db790b37d2306d344fcfc173a92291f73dd0b5d28b293"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "b218ca70de786cc046146d237283b808f54896c5efb8ca3a9ed2f5b6bc3201abba3ce0d01e3af453b097035b5a19ede69e8ce2543a84efd836d72cbdd3f60070"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/si/firefox-49.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "531f00041cb3eadf78b21f4bfef4429462b4bb3c497209724af5cfd75b879e2dfcf0f64135c79f6be1fa4c9b61a8735f18d6b74d4d6ffab0c252c2e02eb88ab9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "cefc02bb41d10e463af03b086da872e1cb191c5c44da2b69d0b3005c04d994cfd7c9a05205c2a74b46cf4fd920e12c3fd439da85b6ea8301a04ba07f0387b80a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sk/firefox-49.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "8334ff7e81e83e2a478705e1306fa8d1fe30edace143b5e84ddfafbb8d1b21fcb6875fcab4b36fc7f264fd738dac2821d21c0abffe71899691092ec67403ffe5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "2bb22102e3597987f81d02f0f162b94505d191c580016af1ad425d7722ec3913ed17d86292eef094d3631d4e0bb8adfcafc5372dbf6c17ce4fd73f4ce8695742"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sl/firefox-49.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "97c9d25d58f0fa546237e9f10ecf9faf52e98242aa233e105233fb36ef97de76719588032d1fcd6b85cf2bb2f096e158a3c02774eac7cb026788d6e336cb5015"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "8ceeced6f4800f66499a30a2ec2275f70006ab875a7f1c14c095da0400cc7b9e93251da2156df07f2c861f5ce30adf5cbd3c263b6173ba71cb201d0dcfb28aba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/son/firefox-49.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8808edd0aced9810f191ea4e160aa316db12dfa663e6e085d848cbe2379d664a7c9005d5f9ee024d441398f47a87978d5182dc1b4b69bb9fc5a3b8be83f44457"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "cf278fecf4a9c7a2590ca4484643c0e430e2f696479d3c50f06068b8191d2353b93c254385c59bed7b077aa83718561c0b387890093f2f026133362a5f2c45d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sq/firefox-49.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "5b89d98d4bd5f618472bf0531839a5faed960fcb4ecbfd03f894f1aada0f73126a6f9351e1096379e606c6e7ed1665457da9eec05132b5838340be254c091873"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "3a9549e949628d170e04e696db4f8b436ca240ecff99aff8cf7431391b73124b3278a04f5d758a1b3359de6fe264ba2552072582a8b385c797fc01049fbbd3c5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sr/firefox-49.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "45e4d83ebc97cd5da01e97a6bb083b3464d4b423dadc255ae49c927143be92843dc054357aafb6857f95fe004659833720453b049660f6dd6a75b4d433cde3f7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "a203c9c80b4c64fec9ebef68279f70b23e1ddfe6a43ce5f6bcad48c9ccb3fbd1835b7a5783c1b4aec3e389301240007bd1fd402db692d2d9000dd5f28384feaf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/sv-SE/firefox-49.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8bdb4da9149743ec4e66f37e0346c46bd011105d09a6517ba8ec35eda4d47d06ea8763114f736cf98aa79b0dafec42e8c8f8285ae87ced63f51f60e2c7088cf6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b6d1fa74bcb003f2c5a3dd57c226ecf1a7a99d2874ccf89a525ca23ec5809f12f2d1fee20ebbe9096d9fdd13714d93a46b8ce83544c582a94cb9e39f80fe3ddc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/ta/firefox-49.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "0ed976141674b93154cd0f48cbeb70d5349a3642066bed36b53f9c9e8e78fd2c0409e4bff7de038d07480e0fed87fc96485296f4cda9a2a3b460c7dcab622ab7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "60c4e8c2a1d61ec87a6ce0e0a77a61412d3f9e28dd3310666da0c8ca58ccd93765f20315e8c4866138ede58465626fd16fba5196808fd716dff9ed9ccecd0e95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/te/firefox-49.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "85fedf1de1c5ceaef81765031e8d5e24145bf1851331d82a319ac54ab0b3abf7f896d69262c82615015e8854649321a9352037c59baf0827c2d3d2d7f40fdfba"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cacc9b4ccee14f1bfb8c9828c69903933d92fcc73c8fe7b83eb5057e6636b4cc35d231746ecea4e319e7537f7af645fa0c0f8dc5bbc70a333f83ab06780a4ac5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/th/firefox-49.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "88070db1c08bc68231fd32c4ee812ab4c225a3b53a09773bc55ad82381813b822d12fefccbb4dce6b41bb89cc57ab423caf8051b9ecdbb9b9f8e55025d90ec4a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "effa5261281a2c45549943d2ea757bd0f2a6100921566114bf6186695f906ee6a19a84992643f4ba5e434b397d4da976ef137cc3992965d269d3f8398def88e4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/tr/firefox-49.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "759cdbed5de7367fb04a412122423b863095743f15e310ec4b4416f89aa8b76cb74fbdbd05524ab0d6ca8f420057d9fe937c7f44e44d5079d35afcf8835e11c7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "57937cd67abd7aca0e5ebfed3e890237dd305a45499dea46d31d8e4994195af0365e27981ba624068781df5b0f64437148564604dacf83f96ceb32448503ed41"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uk/firefox-49.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "94ffa3c69613db6124278edeed6df2d11880a47941c8761eefd86b30eaa6f6b60e83d5fb5df25156613ab74f9f0491e58794042dc1df74909c14089b8cb3b232"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "b5280fe0b3d5afcb37afc1c0d18d583f698eca1cd01abbe22ed9c3726db9327e9f758079856fedf23b533a9d64fd47ae9da733a1138ac715b4c0ff043618b89e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/uz/firefox-49.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "d6c658a6c76606ee2861b89f109e1de707e32d1b3136bc92de9f60f2257286b271a0594517d53bcc727a86cb457d33a27bc9574de60c4059b2a203fdd5601a2d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "cbe65faa2d20a3740cf1ce97efa29f3e9e1697feef0f63f26d9f7577dc626114834f8435c3b7c7d3989bf3f985d5ac518ab59f6ba9eea4fa86b8f5a20dcf7cc2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/vi/firefox-49.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "919f2fdbf20f39698264a7760ce8df4c7d979bbc91a44ac6a2a258c2ceafa62bcc945dd07a3fb4a4535f47c4e90dc34e06ac0d58165d6ea8edd451bf147aa818"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f8c3c5424bf6bb41ac9143b20a57bb1e78688ad9ba9ba35a5fe00c524354ca9e65db3e0d4dd2b3447c76a80332b9f4adc16fc5daeab61e35ecf868ea935228cc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/xh/firefox-49.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "1d331b1b1c1bf3f84c7378189faa17ca112869b0fcaed57184d5f40d05c9d336a06fecd84bac2a2cbfff5494f0eab472fb4678a82af4541172b240f5baff68e7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "0f59002f5d5ae044a07d3c6136a5db19d4c3d067da8617614b8e8b68f266475fdccc32e1bc59bfd3195dff3e475a4e3f1cc6d505b560b8322744277b5d88885d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-CN/firefox-49.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "1a18d792941b4a0d49c1321cd53d397a9c667de62cac58c75229c0b10327cb4e39b7c5df294be378aec581647de1f52c17a309724689f010d37141aa5691cd2a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-i686/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "d58697f7898bf018958d5fc9389b4aa65c81c61fc104e51d758b0a15e19febf22c882b740f12536dfda3ba776019859637b66aa4e302735b31abcff098762175"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0.2/linux-x86_64/zh-TW/firefox-49.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "4a53044f7e44e5239587256d24f8149ce0d4606bd53ac6a3f1ec48ca6950a67c1892036730ed7743ae53905ef3c33aa4e192805c8a279ced68c3202342439a77"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "d1fc1b384b44067920b63385d486d41e6fcd47ed14ab31dce708ae25029bb5b437ba5824725c90573d9ccd010c3d4c83131afaf2a2494fdee56a8b7f2ad3c24b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ach/firefox-50.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "cb4a8a03e4a2fd495c8fd6e9b42d6a9556ef7033b8aa6d587b45ed64f2d7b96e1cdaf3dd4413f1a55aaf4300c473ca6abda8cd823efc3a33f15b6f2c693cfc31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "f2d22dda5b35a4a093fdde9fd6d99b7ba6540c5da218ab8ec87fdf1094b740c71a73e3bd62997fd4a3726a99c39a4c441e1cf3adfb5d56f07752dd508001c802"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/af/firefox-50.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "4dee2a39797423ae4f525b14a007019ac0f4ec2ca781c3ba2b2e6d62dc7fa538c1fa8d2f4b8d7eebdfbece391bcf56bf96a2ef74fb290ebfd217e7ce8f43717b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "56778bd3626177faaeed0a0da8d5db2913fe9fd0f2341b9f438a9862066a8e5818f2ae746f79e03c6c576c5735945c5df378c72269f80054bfb93228b881403b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/an/firefox-50.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "b509fddc94fca6960be4bf358391e2dcd256c70d7a0c730759ba2832b56b654c5d4aff74773499f7be4bf2238c6b575a97a4df28c5943439d0025dda9dab7c18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "5480712a3a2a40872ca7ac9625d76761b81a64319b3bb8e675d86022973784621a104dd28c651d7ab633ec11f50823d1a849def5cb06016b54d44c86f586d383"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ar/firefox-50.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "2fc3d317f1afca7784f949bf56dec725228db5f41c8e3be855d5d2bedf416803ba7e32a1fb89628ab844967212cc3a7d0b6320f4a820563e71a70edf0637d3f9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "d6634c1ca6d82e2ed2e7e283431ed95dd65b1db558f50c73130b6d3804517a199d22819c74d6caf66cbbbb3185241990c7bc90fb4932249e5d19c6c48eee6caa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/as/firefox-50.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "1688ec07557c477fdb6ea2df524e28a3acc125016d6d2ea5042d8bc0cc8ba3a8e77f65f44ff41298502459f10749f615484aac9dd3ac6ffcfa8db04f6355d8b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "96ec194358754aa1c71c1d929fe0641544fb25bbc73e31a865b7f31b5def4320c56d56ffe81388348bc24ac9cb62c4d5055aa2e6b31124cbea9637c1e529f13b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ast/firefox-50.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "46497eb1eb6c432bddd6ae1e9a39f4d86c9f14d3f956302ab2bc5d57625a6f966f687d978e1e93bc351be2c0d32150a5b2873fbb62309698fa7c37794adefb00"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "208d81168e9cdabee3b590813d64bce6211ab9e3cc2bcd11ebeff90a2705f037d2c489a6a50c6e786ade80eaa17faf388b6540610e51f308da03e14e453cc7b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/az/firefox-50.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "844f3be9b6f52d34f2fb87d8a881a50e49a4820fa97f522d9e462127b88ea4ffdd36a514f353fbbf80e702452a26e2dc30bcd750a0cbd43b26452937955c9c68"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "e0e2f3d6eef948867888f4564dd3322d5e44cde5573675c6d58fbbaddee65e787a31284172f688854e3646bb57e71961ca04ee4623ea3192be1483e5d677dcff"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/be/firefox-50.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "459f5192ca7a1f8dc6f3f22c106db1dd216a41cb11122050e02f86cec06e578fa033b00c1d8355a5a2a759fd8702a14dbaa3a706ec28c50911c2250d4561b228"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "3ce16e6e974c41d671a58c16b44f660f420dabb7eba7eba9213ba6d86fb029ff495f507a09a1669c6c3641a6dfa9b377a511141b0c3d55839a7ca1e2790a188d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bg/firefox-50.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "53e965cdf50e12a876a9301370029254953eea1bf4e6ff45ef62835a48d25630a59de0ef655b8bd1664e1746b656c556d0955f39ca2e0c9fbf95b795a93197e2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "789eb6dc6f3f42051ba5f91999fb675955b568198dbe7cce3b2bfe3f3763859a1610009480edd348c857f42704da3338eea28617f97d8272b24a2ff95c7b2450"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-BD/firefox-50.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "9cd693b98776e426c0c6d66934c0f7beb7c692b0df5967d09c91889dd12a8a2652cd4641acaaf1c6d7aff9b740504ca54c4fe518496d855316eeb82f82c6f31b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "b36d55da04a98b29291b65c6f6ced5ccc67bdce7d3265665258e2ad212c5c0f7928943f55b98678924ed1d05121e2d2beaf7fafea9044d7ea4e0263ae2aad3a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bn-IN/firefox-50.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "f9049cd7d5d67fb52587710d5b7a273819439064a621af6de051a196c5ea597d0d27aaecf638eca1670ac08570df91be906d30935e1f79c2d53c080a5d715ccf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "c8c61f8ab7476c073776e27a9c8110ed5c2968782c9580b5d9afe3670472f984fb4e586a2ce50cc6b0f65dc3628f9fa632c12c9219cb9a5375c5d845f1d39f18"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/br/firefox-50.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "601f5785b61f6900c496cd73430d679d459ef8e4fe37463e752b483ddb16c4c879451fca67c97a4e74bf75473116c171f5ae4ce8da4fb17742785ef7d0baa365"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "c45716c519a29b5b94383b7c23c592b4d7922c0778abdd0c87519576ba1af459180dbdd87aee112cb9b7f607d3100cf38bb47c59ec1b2dabb6f96169f09c97c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/bs/firefox-50.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "a3a4873487737ca3ad80f4b683ee3342a340dee4543af007b21e7bec008c3187755857cfbd3aa63a16478e93d80b4f40ab1fda44cbf9bb7ed7abfc760073b535"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "5470ebe85f960627e9b9f08ae37fda4eaf0203542d8e4c2aca85ba54fa8fd8d1694b8722a67e647c9b71ceb75d7eeedb338f9b75f630694fe084160c241d6a1d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ca/firefox-50.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "98ac4372d48b0b7f714ea81da512ca46ccb2fc5d35c17a8e4e17f48942a34008de55935ed65295034376a6d6c6d0b9c984cf7eb82f9450a90adc7d714c8514c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "499fc78ab65e872218282cecfdb72ea8ffc54cada9e9f533d5b678c235512489a3f75c78893058a05853372c23cce11e581cc95b9dc249c9932e9d0e4d9ede30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cak/firefox-50.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "e92f0713a43a1ef4884de071ac598df37499bef2f636031f3e685308dcbc62bdd11ad5b633c4e35f07eb85279bf1114a0210a890f4813d68b114ca52a9122636"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "0f068b5756a5c6bea869207282cd916703ddabdefe815bdc08a27c70e9992a1041db9ce6dcbb3cc063788ee438cab624cf89ddea480765ef3f09d6b4467c3eb7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cs/firefox-50.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "12f0eae081ddaadbc89283f17b0f69ba677c4f368b29f6cc3bbe308be5beb5be7938019fdcd924abf274c49464ce23e03277e010fe40bbc78f7aba2b6ad8995b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "ab8a1f8afdece2b69a510a3946dd6fc5763c25bd03456ffe4181aa2b6c3f17471578a64ea1b0a65085ca8682bb7f6cd8c4939394c4686e9ffc3478aa2a7b3a7f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/cy/firefox-50.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "2aec664a8884547a81b2cb0bb8a0cf2aa7f5f1ad6c02ead41e6e752cfd0d6739aa408b6d0461a88eacdadf4f2c8323f4de9f8d50669ce756c904510a243d964d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "77d28752fb60f2347393cd952329ab9ab128cbe3442117d2f4d53e84ea69ff10862d930a1884788db61bf6a910909d9ded46e56f2b3ea791a2e4f89b8dc1fab1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/da/firefox-50.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "e864623ef2af94a161f1a22d233480f7bf94adf0a9f75cb23caae207b47a5d34ba9d1d1cc00fe8a51121d3d465f5af087ac5020fc6ba246fc850c5ae4ff3edda"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "148e4c1990f0e68e0550f00d517355f0d2e81f744ec592b297ad3c6a1be12baadedc0d7485ac1585e09891a162fc3fcab1d96645a2b4ab04dbe3b2853fe837f4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/de/firefox-50.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "a13463559ebdd0409d9e2c5de410b748be28de1455fc5b38d8531fd3afaac17e5e5520435908788f5370d4d8329c9dd692d3c2c1e6e0cd00e7f0ec76b2797b1e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "699f12418a92ea82b3bf96b2b2217f20260dbea294c2e7a37f03f9a6f15820fc15cbfb73c0ef3f2e0ff10353b5e6f61a39a4c57d61d6e51da5ba48cce9b6a0a1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/dsb/firefox-50.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "7a8de523144d4f87062f2984788f77e2a36a12087d62e5bb3f054ae7251821aeb9b8d11b5f1c45304dfb9bdd2380f4b5a131c1d5c5a9918d23e0c419f0f27fc0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "9058fa8f99d96eb073581ba96ed37fb6d17ac87040730219962b0afa7348ae39582167b051d3c5e8f11ed6467b36fd73433c3262217f4990b917ad14470a4255"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/el/firefox-50.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "7b4230b827e08863c427ad1b059a8509d9e4bd8de953f588cf750b0dfef5e40bf310022301a2005152fea31c9fe14510c9503ee4fea2362c37e98e52f90abc16"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "352ef41a90a9bb237a223d33235d98b0b1d319d30ff091e4b7c3bcf62c7f2511c8fb42d78bc8cbc41f52be4e0111975ad7e7e67e71611170409f41d126e648e4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-GB/firefox-50.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "d452f6bf0bf4a361ca42e9545dc98cae9dbaffe1815efc92e3ee59a91d59554a248b95737d6cfb0e1e40b6cff3fdbbb66a13ded7366572a2b7bb5acb15bcb62e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "ed9153779e91537aab0f44f86262663da2c0fd32850cb18c86a31952926d0df0ad07108989d698bfbe9f6fd4db8d4e000d5eccb10a9080f1ff0e7fc055e8319a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-US/firefox-50.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "f9c077f4f196cb664383824ef8899db8916890addafaf850aaa99629ede100cfd438af674f37dabe2bd5f8f1e56b870cc308476e5d13e5a24bd3f1694b9719fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "baa0c4a63a9849dddabfc99f63f42ef007eaec21bfbd9929629c7b3201005256f4862046896a4099c143653bc29967d26c3db35dcf8b39bedc920b8c06625103"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/en-ZA/firefox-50.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "28c11301d9937a1a7489d2d26d86b44b942d84396a8c0ec4af2cda078ba7c2159452ed44a0132ff3c0d6b93487bead5de373aa0463eede5ea4a9cec3eb95c698"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "400763f0273a3be94cde7c38bb410e654e99d190ace2a81d1b588f2bfb143fa7e4a425a9549b5edcdb02a324825d70faa65020752f236043d9e3448313062748"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eo/firefox-50.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "8bcea2944595a7900dc3a55c4e1d8b0fd70bede700bb244bc75ae981f33e32b67e89878715114e073e64d17b5ab351019628224b47bfe33ddc9a195a0ef08ed4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "57a5daa81df3381f32246813e352d453424264cf724b3666d796a0181f08ff0e1a57df53fd089facd5fa32ed072e7821412383de997141cf50fb8a8d73c0ade9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-AR/firefox-50.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "caad9fe9203dbcb03dde31c3a3826d9ab3fc6a8df9a55e79036848d055d7594988c479e6021762a94d5a47fd931aa8f6650947e34d3bbbaccb702002f967e5f3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "61ea4becca8ccd9ee635567bb87e881b57ddda08ec00a0cdf4a50c80532789f9730a3a5e7a1c1368d6a80354369471603e89f3e7f2539c6dbce2a40b7821524f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-CL/firefox-50.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "748fec2bf32a63ee7eeb59835e17dc0c60ae78ff3fb3f05b59d4082e29475d8b3758c978a8fbf260ff616c32487e36f2efd0b51b69c8647e9997e8a6c7d0e5f1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "2fa4107225c498691148f444eb6497e71111613097d50e4610ac0bec893acd7893e0f3bd4024e2351509f4778af281df3baea97a523d4be4540c6ff28f29aafb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-ES/firefox-50.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "1d9b298fc979b7baab7dfbfca12c172544cec8828afca494a75d0e0517b6cdc89693e94e3cd1c2887d7156a0fd54da9c59adbbc055947f1e9f4c4880f6a125fd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "903146601206d5e196684fd908de24ea34d287aee2d03ce68fe2ae8092799a38054ec5a9be2d94b2d3680088eb4a58d2a8a8834652519dd3db2340667041e032"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/es-MX/firefox-50.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "e84dac8ca10564581f6a13b436a86010da60e88c38ae6f06c67129f2d3c33b4c1bf202810c19bd781aea7a55a809f4bb46cc8fed4b26e892dcd798731d19ea92"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "689674c1ce12fe8f04d0a2824d78ccc0e0685320dbfc83ce5ad00b07ef62dd34bac5ec9719d97241d790daaf20dedfaf63f05b062aff63ca87eaf9b43f796b9b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/et/firefox-50.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "37b8a6b008402ec8ae0dca89a062e9f6b0c84de04a3ebef98de45453252e3f373bc5c58c918c5e7caf05afd8c97fb4b691ec67b22330e3386ff8810d8b46dab9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "54d5963fbed7204c0311430f620479ce5eeb0ee3f8d5dc2611c8bf7fc76ca6e44c26d5bc8156afc2406d17b7e6c72a966469333ee1426e2de053666a246a9008"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/eu/firefox-50.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "8296591b01349424dcdea4683795b5063b89d15aed67c299298abc2842e313b18c426e42e687fb7fabe7d6a54cb39af7ebbb1374ad0fbdba42d9c012a82ec8f0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "3da3bd8e914e155662c9d8377e198e3363b931d4c2483ed880b1d7f7199380165e44183d9e9bb8189a7d461f080c3a0b5cc5b2041c939a2fb8625e4728f4c8ed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fa/firefox-50.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "1fbaceba15cd7e11b93c0e6977f5711e9aeae64d42e2b8a21aa42c814ee432c7cb0a64a84f0b5d1268275a69dfe2677859f37fb5f62e3d8c729473f4483fe794"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "21825fd0502866603d3878702d505e3db60e21fde005a4e3ce1d6ddb2c695859c56c1ee352f9a4dcfa6ab4f3bab7a8f7bb4f75d0868920af0186f16d88850d20"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ff/firefox-50.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "52ee181257cac9b916be9c804a1ff7e33f363a1ad2b6aafbbe00d461c4f9d1949345cd7b55d10df0eecf7f0e410ac07a9d7d5ae6dfe142cd594b5b72348726e1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "612013364ce9f9d984d00c815e8e76f1b45c2de7bc013bdf49aa83c46d522c940e694c530c8a1d9971c1c5a2234b1bdd438f41903fd777b29ea5d51df6c314b4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fi/firefox-50.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "aa93258af4ffa49068887638a33ff41ad29895ecc86ed329094a2b925b655755048b08f862cfb1a5c1d86365dcc1adef2227054c8b5eeac9f46268e1558d10ef"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "be02f1bcc28af5d4b3cd6e1eca126846cd1443a2f0caa3d1e59be0f3046c5373a22b3fd5c3a853601249ee3e34100cf308bfc1ba54c514bc4cce3b647ce0c691"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fr/firefox-50.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "008d3b64553faaff26ff79a2123d81c0df3d5aa2dc9a6c678cbf472bee47c11d235c59711c5915e5ac991401d076dc7f3edc1da8207481d1c1f871a79a4362b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "74dbea8c626496a356a0b29fc302f03565dfcdd60e9ea4d68b8b3d3a45f43d66230b2c76919ec4cfd2e4b8d5d4d07d901912a471aeb582c3d35c5799c4d3dda4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/fy-NL/firefox-50.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "982ed9e4b817e90b19b2c104b3eae8117b59bded0b066dc773b9515aa8daadc322dc80105a5bc961ce7b0a3c5630838a26492f014be41d92ebde140030dad5c1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "4be2dfcaf244ec9a3ac64291dc1a77a6359fa4922bfda8a57d847418104adc7f591ae3ff51a5b2d0b2b04e916649889d852e9527b0b59f965fa90b3c091be431"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ga-IE/firefox-50.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "151ca36fa5fd165a1992a682934f0219fb2b85a7a9aab8f503f4cc6685bce5253c7c9317c71007e8fcb2064c3c63c4107c696b5c2651bb1aa3b25897a2d3b17e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "37dd8b1d6162c05bffe114ea632485316e99cade321f4bda64ee61718f85d61e39c85f543b221833ba3bfbffec29926c907c9ea9349fb54600172c64d1d751a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gd/firefox-50.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "ae2b24bbbbac0eac95e559cb21561e15221d4d40acb4b6bc069c353e1c0af123cc396a960918683f88f2ab8d6b0207e585a83289704c18ff4735fea3c7e8f51a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "7105f05777629d12e7c90ec1574cc96a762938841e19185b3b077bdd52d6c28827e285eca95d2d6b0be899541981370f09944bad7773edd646b5199100f50b7f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gl/firefox-50.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "a7dec692e8500d9e884a46cb1f2e340522d770c35b5f0c2743448747ce4322cea63149679f7409162772bd9a13c8275d099ea22ad711ce124d426300e0bb9473"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "74a46b05abfe713b3f9df1fd651dccd97b281d7d5c5ff93856c6d88c50b0a49428610dc7d8fe6ad5748290d15c2194750e890ddb79b7f7b2eeee77cf9d277bed"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gn/firefox-50.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "486d32491f9f54d374fe24622477677ee90d09209c0eb74bcb52b93d33c2d0a8a540e195cdcc3fb117bf82ed0b777bee6465da51291f1d2998b0fcc1dcec1557"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "e471f9cf94e85bcf3a0404c9ea0cec7adfb38b64f93a931b86a164814d7b8cdb95d9e78d3790b21235a4da816710ca7f2b9fc547ceb5c11f9d4ed949a7a68ab2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/gu-IN/firefox-50.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "70399ee841ca80a3add669509249a57d5be11a7fd69aec4bfdf6eb0d5df5d40941fd59ebd79a0598699fc3adb5e162837691261e31922af8d8074caae6ea0977"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "dacacdfcc223c9709d0082be2a1f51568b8d8adece09640cfd4df74e29ee41c0cf28fc926899310d15a3ee81975f860ae00e896a825f3660ada72fc9318aa23e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/he/firefox-50.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "fbf321e64deba8b83d5e128179671b4c9fc6582ec5447b1a85044f1b142cbbf7f1a38abaab1b6d85f6ce9fff00575f3cc1dc08906f469a8f51b9a51f2d1c86ad"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "3434e4e259373981127422de30f8d659789651ba5220135a05286ac76e5a468d6d80c9a09f379ea0f4f03f1542ba5fbec064c54718c73bfa85cdd3144ccf5991"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hi-IN/firefox-50.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "d400e6afb62dbcf65e1697bca8aca8d2aabd5391bce50b83201e28fd140c00cef11dcaa7d68ad69a9e82f31e93b3ae350bb0aa2ddf4370cc672a77510bdab89c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "2210439603d946eca55701bdb95449fffb898442efe85d31059d0314e033c39a8b460b6e7f95c08bb9da145acd27744dc7d59600111bddfee05302c9743aaf4f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hr/firefox-50.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "154d4124cd2fab2f7c01e8e8c4b55ceac6a6582d2c425517a04ab0ba7211f9a834840baf56042a106d59e33e2e6f616597e1f29a21b183567f410627a1bf658b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d33f95c47d6d56599b67e19185b629b05e35ef085d0b8fe08ae461aba3cf9d21b186667f55a5dceba1019fdee6fdc4c105b7e5d7f625252cca5f939c8b7a0cd7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hsb/firefox-50.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "a10434af0fd28a6c38a3bc57acd257dced2f2ec476ce18c7da07927295a98e8ec86f5dcc9012e2c6eb155b70d0ac7c143f74ead9f18bba932c192e5efff87087"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "f82ba0dea755c93cac27cdfa58b40a79cba3cf09efa126bd978aaead0d64716ec4f9aefbdc3a8e1af0d06fcf2279f1c545efb6177b641fbbcdc24052c7655860"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hu/firefox-50.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "65ae4501c718705163fdccf39e53ef9c753f8b841221832ad6967921e0e7b385a23c0dacf9a1d5f5b309cd1dbfa813879f5a2fd3f0ca93c3dec6865ff36ef5ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "dded53d77f186a64336517d5d0cc7777bea256de43cb31f96d35cffc64a55c703b9b986038e82949369348ac83a7a42d4356b72e329e635ec827ddad8d6b5cf9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/hy-AM/firefox-50.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "95c883bed5f89a826241b0e8c0f8ca5db10a534a1045ac2b0bc4ac9c93b9dd788644bb3404a95883641c6ed18696096f198dfb74f243a6a6a2d9b59f5e075c4e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "1dbd123dc5a8c15eaf311964fa46175cbefd6a72c84f0e046bdcf0904d942f8e375ad0205e2b708403482ace902b8457377c988eb57aec5a64f366273f818177"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/id/firefox-50.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "d1ccf36aaf7f85cfbdf34f5ec80b73757fb5fa7d1a0f7929bb97e5ebe5ad0cd189d0d288a4ca9466467968234b5b3939b1ffd2650266e26c506c95d0ab36ef61"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "7092e252bb6ed7290d0e0acb6d6fa0be6a4b89e48610909b74a954246eac6066fc2931132afdd15aee617000f59ad042141fe8a83e1a37a1ec9f0bb96197330e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/is/firefox-50.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "1f4b21c65356dc4fb959072020123850654cd0eaecc6057f138608ecdcdca215a64089441d0a2cb2f0b892c430d41f5b24cfc202f3f2fc994ec2cfb5d520cfc3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "41a1e8b539b0eeefbae4c031a997fd8196a05ff4e7883288936b8a4caf6d30f0b6104aad3b955843bd982f8a6785e038bc15913a6423c4a8bc43c5815f890343"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/it/firefox-50.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "cdd26321281d3049b9e34ccbc153af22f8f6a8b43f989df7ad74c448f21b5bc318ec3f6d26d6b9e35e60efe856b831a26e2785bb08b005791ad5b5a7d68feb15"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "87a8b95bfb8171dd49999ae47f788b1818df0916fc66da9a4bacab5ffafd9791055e49ac5497d19aeb9404a62c6cb9874596f7d5a29c4c7355f119b5105e80bd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ja/firefox-50.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "04c6e5be875955cb4333ccf5bf8134c8485cd65bec9f86f3b06e8e9593bc45ca0d85ffccb7a0477287ed9a5700621d0555627c1261bcc2322d4c446086b6cdf1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "e3e597bac7ec1aa163a1e758d23c633d9d453613f8b52bac4b566b6499b1fe1658fcaff1b466f37a752f862a48985a811606ac9c92ea65b8f75a9ff8c2172d7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kk/firefox-50.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "1f686ebf1cf1ca38e7e67a9ebfc73af6e9e72e648c34f7e3d2a0e4092c14697dd7608ab4ead11ce38edf3eaead09f96e01d81ad6b8491b54523f37268d1527e5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "b21bba0745523be576c2f99002e01463bbcf5a3dd122578bf78b5614c303e336d3e5c1a27a2b7ad88d53b7df4b063352c867fe66bfd25c167c17c7fc2e81622b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/km/firefox-50.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "9f6b1506ed8fa820f1619d30dc045781a1bcb92f6755c0aad38fc5143c522341ff62afc39d6158aab863996d400a89546d4d2b4fec4f207c01d5c1ad1df8163c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "1822443cf61962f06ba82bfb5bf344aeedd12ee77e44acec0fb292ed6ec9fd843f2dab3e43caa0cb633107b8b79f30db88d0fbdfbbceaa5b6441141796a82699"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/kn/firefox-50.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "54542ebefdeecc74344396862dd443bc09c910ff02cc49980e40dc8ec202cc187ee925d560e3d5c409f88b92158aaea2fe2be3ac24a56d370e50f6a9d0caaff1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "0ca6dca9be0e957d35adfb7f95a38677836620be986fe2b99a5437d5dc64258d081b91c31502103ad61f8f7828d1d6f18049fdd3248721a44ea31a0648512366"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ko/firefox-50.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "9503bd88caf715738f8fcfb2b249fac0cb69873c4c5ed36eda4b06fd1e7f3032c7c8488613a042fc8236cbdaa93c1ef5d7a1d81d374559070006bbd714597313"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "666615b5905236e42c96c40d911a26b5d9c6c888d825d5bfeb6eccf9881668df41258920093c477e06470ba97046896390fc9fdae4e29e00ef5aad12064fd66a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lij/firefox-50.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "88d7accbd48856477137efde6b2b3d37b017c2b7126e4d37e0b328094e6d110e278ac75b61ac3a09cb5de63aa76b21adfb093327a099013d107fc772b1a7686a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "eb2300f63ac5983be2138afe6d588385b80595b736ec4d2f878bec3adebb27c5f1fa789103fd500e7297ae5034541287512602d6edf35035bff2c4d2b8f4c087"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lt/firefox-50.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "b45dbcde74268f95b2279ab735140a14ebb2c2a375e8dd296be95136d24f60c2ddf687f61a09218f9bc17575b0014827415b02dad4b3958540cb1fb2b78fff40"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "6252465e24583b2ee5599a47ff008287a3321955cdfccfb0a8d9b174e02b644e463c2aedf77d9ae9678cf2c682fbec07796a13fea060c735ccc6b11390c3792e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/lv/firefox-50.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "068ecd5325471dffe741bcd02adcb3308497eb3c1e2a1679675e27fc8ac58e233457589a56d4eae658540a0876b2e3c1f39407b404a322ea079d95195ae736b9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "4690b802d91833bd96f7beaabd302ffd9bd40795893cd196a0f09ea47e333e7d645f0462b12fa0ca8909cdee07f2efab5094a0925d3fc11e48138098468ab43e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mai/firefox-50.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "88b4c27346fd74cea35eb635b02840ea771f015fd9f2700751ca26978f502ebce23cecf425e70cf558e38ad4ccb6cc86558190aeb559194005474b6777399591"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "171fe438b11434ef3ed68507d6bd1465b0d8f9af9a77fefcd2fc7730f0bc8a46a319d9e3d94227b2051e18b990cd8167103e0cf50293bfc0fa57a3b539b4fe5b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mk/firefox-50.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "1f59cd9237149dc22c540461abc640367f02d65103cd60e1d7afb8f43b973cf03122130fb6c665b418896932cae1d4deb7241b45f7d4dcdfe8ea69f0bd4b8143"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "0cfc6ff07e0fa2b194ca8851d52e3f819f96626d21b827fac14319c849f0fdde21d269637cd5c833d6f0adadd49656b9dbf603d1c0f761aea912c4b8f89917dd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ml/firefox-50.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "de1c49aff4dc4cc4fe2c57a658d1c7dd2ef7b7b7067247c1c261a89109548ba3d22ec7ae488b9c7d338fdef50317ed095ac4cb7390673c6e10e5eb28ffaa3d08"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "f4a470619058a8d509d4fb25f017f859628c0f502de4af7504ec189e70dd07460aedf7ad0dd36224c57eb6b6acad763d6781893369e1db7ed1e12050a0bbd6e2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/mr/firefox-50.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "13e5c2fd2f0aab0ebf186d4042e3aaba4b5a7d01a6de1515e9ae34c2d1d81825fd6db52ae7994f0c6f711830dd95e32fbe61e1e09a020cae08a85f575ae2d22d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "3ee62d50bf8dbf1d013e61b19856efebe5a5624f4111286c81ccb4449a6d8124702106a49405570cfa810c0a32f0737e9cc105bd75229d466864e8471a5e5c44"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ms/firefox-50.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "39531760eb1cfe7ef58d7c2eb8eee3fa8c467e9880d3a1ddb0f957364949df0af06c0d03b91e50efe420f16c26df32ce5214979fa7088a79cd1de70691fa8a9c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "e566041725660698d2c51941859301036801aef3596ff250ad9faa96d1333951ba388df09aaedf04204becfa9e177448fff5229845f6a8b5507784e4df0665c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nb-NO/firefox-50.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "b11ca7ad3089bdcd2921a882395384cc2e35512488224e0d3b7b227c05436064a8fa6d174221adbcf405bf274a63e61d365a3a3b4b5a6d9f053714448cb267c7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "7f6f5a34bd1f2a6c9b637768af109f7612847258f45dd59d713004dc2b7c9cb46387310b000416d96e6ce1266e709f30df9fc48bdc97312f082ffa9c5ed3fc28"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nl/firefox-50.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "db633339a4ab8c788b267aa2435a13607a5d1fda365c06f1d90f19e5604b60a809dae31e8d135204fb14d8af8a67334dcf62a88e29102c30a19c1ecb9ef415ce"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "841de10098e98a2148dd035983d7d1e2429e1b10789d5bdc8fad5d3276427eafc6ad9d9cf2db0038eab313484835a8ebd77098c7018f81fb0b9fb523c4841bdd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/nn-NO/firefox-50.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "ae58d4a6a5d0b5ea1d5d080598fbcd6235c06657b4a3ee3b294bcd4f7360094a47a26bbdc6d5de8d2b782b3f243dda31bfb663bd3c7f81b0b980b9b75a089205"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "20d1a99edb738fde9791404ab0b55385386d33c74b1d2f944c1f8cd3b3175fc8a8ddf7351ab8f551a6d6299379e7551366a6cc02461c8ce3a28e59da4094e636"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/or/firefox-50.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "b3e77c5d5730c616170361d785ce138bba1ebff030b33d88eb3340eee53114e07e9129072e77e2cc10513b036bd05ccf7e1e1e46ab3a7c760b8eab7963a69152"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "7e2a99511fb20a8f34a9fa18f66a45643cae32313818dde229239a48eed7ab8ddc71c501f8b14233e67daaf0f4dc914fb9ffbb0ef807a89209a5a46fe4ae62cb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pa-IN/firefox-50.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "8d3b86add09c64c76bbf0ce7530d43785704fd38c98859dc9c2c42364f58633de61de8dbe00dfae9f89f8c9960acc42eef317c1d87b8e7944daf54e18b295073"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "9aa2853624394395ac0f17ca3a0fbf90b8519e852e16b12ea8221a9ba146cb87d7e3b881e26db4be69aa9499e8f6c2f83be2ce7aca9a4c1ed8eaf562d98b80d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pl/firefox-50.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "7dd5dfa772b8869eef4b47ba01380b84989135690fae5417ff029ce2b1226c7335239e4832fae760a311c184d21a6cf3f92f30531620614c16829084b41cb48d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "d9a431bd40fdefe3c84e820c6d6df478dd26a8eefe7ec42537891fb8043ac0101363e256d953f85cf48f812aca09e8800aad4263f6999da1e079d75d09386031"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-BR/firefox-50.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "f1c2a10e5ecb74570c5e985ba09763d362105242b53fc9e9cd51098f3bc8f4f9280c7290b9ba4335e455ce9e3dd175f67554fb25aa86544d37fc609b8b98adca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "0958cb1f5ef1260da0931cc4e16c81ab8995711acf846a2658c5f184968c13fd8d40af27613ce2b5c6e5ad462ee14f39f2a614294bea9cfb2dc875d0f0e8779c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/pt-PT/firefox-50.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "5ae4cf72ebc9af54a7b24ae0a37947cb4e8045f674538d26ee642d4fb7547e6ee2fe5525c4e04b8aa41a34ec26276832663088ba379f6abbcc9ccde533388f7b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "48c20ddc5d312f3720bdb8b40cde75830475fcc00ef579c100aa45d668416ae9dd048fe5711448eab59d50b019326aea7885110ef15112e7c4e58185dade84cb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/rm/firefox-50.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "4e2a66781f0d7e7349debaab08a6c532a82a603562a65437230c7301f2abc6674a6acbd4254c616e3bff8eab53978c780f870141cab42872a0361f853e3be6ee"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "d2cbb5bd4e7dea0596c3fe16ce2dc383e4c8408f5a4f0a9035094a8b714961d3d541b473c586ec8a3140984e8ac902d940e5e86be5215321090c14fb67688a33"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ro/firefox-50.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "81ec70d793ece3f33ca7dbf7667764a9ed9d0234b084dbd2ea1e92bcce281ed71133f342618c30be4195da49247ac09b44eb27c9a2996cf07d5f5a17455ea939"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "07e460bf0545e35399c937f06a6a848e4967eed45e86562a6a9a673baeaf1beade10ff7bad1d3892f9304e6018bc87260e212c067a81ca7bc25f2a8e9fbc5f2c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ru/firefox-50.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "23a097dd2e8047f9623a35f4190c7acc70123f9f0347e2ca204bc7cd71da4b2c20a3c26192773eae70bc5fbaa7ec194b9137a8f30c28bae672c608c58bdb3f23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "1bfac64a39a787f02311a0486badc56f0a3058362b6c4947b92688cc654e21c6502703464f0e3a90ec7eac35fb2596e3ddff7b23b3970316320d38e013d5db88"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/si/firefox-50.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "dddf6b5248c71ec8fd152d5d9ee24809add324d529fddfca6166c48e300e92a9bcc96084b2b3b99968044174cefa757e8af8f5d13198a0ff0fac59c321b3f00c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "1ca56172371a3470cec3ec174b6cc14fd5721bc29e3f7683d8f5009c5ace2a5aeb005d28cc9096398e79c03dbeb6a3f14677b9792ce95fb36c8c69d0070a0b78"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sk/firefox-50.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "2fa6ec9328ab40f46eae66e18ae167d9bccd4d5be43fe3ab5fce73059941178af8813bfe7fe26106ad569e6d1c03338e440ee32722f041e73ec63338828e4d23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "b3aa500e2b55b502d60f322c63f08f5add6063b8b5f0f2d4cbecabd56b08ab8a20792f47c34daac6d9c56e9d74d10fc15ef3901f27442e5de2db0933932b3dfe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sl/firefox-50.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "c1deecac7551c39b3b47b0b97896ae8264519251e58f5f34272bf15f53f4d6b28a82bd8a55ff584d501aeed00b6c2d6c56a7d6594d2ea4129fa2f16951cec4d7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "4655634990c822e94bc9cea432a0c90de92dbdc3b6d033a546c8d30a23c078b5725e20151f61c60c92ade138aca083032c7182fb7030d53accf2586d03d435f4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/son/firefox-50.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "8c5a0d0e3a042750a72b40908a862e4e98d0350efe9f10ee7a1c0c27913ebdc94ebbf4cc216f12b7ba459b2b12c889df2715e2664a6eb3ad52107c3c791f26c3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "7a9616abba37469aa5c8686a726723f32059a682ab35c0d3ca179ae8c817490c01947b69d329e224526a972e9116d4755303fc99f601b1a4d2581e75b77924b6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sq/firefox-50.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "39b28857af6b2ca281eda2525731987a9eb3474f538fcdc402d3bc067ed28d43c445f88355ed84a30c5f99f1b9f7281435501fb4dc89ba217ff9a0b2d7121026"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "318dd8b07c62f2c98c35695d36b4273d4e3189d0003b5047be5f5c1bf49ae9b82a33ea3244f37e354b4c6b0db75c068042c22a6949b2dc90045ae2f87a8b45c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sr/firefox-50.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "690ff481c3c79ed3bb8b0ee3157a5f1708f53a985cefa245776a47ccb93ad769228fe76db665d8488884a93f397d219dd8474fd1a63744be54d7b9cfa58ef37e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "d55e6447238a8bcd1521eae2167064eb4951bc11dcd7a16227ec4690d4ca7d56a567a70d2737a084bbe3aa4e5276970586b4bf21d16c85e2435ed60824d32a38"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/sv-SE/firefox-50.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "f48485a6ce34e2915d91a4673af7bc050776bdbffb8e9dd3656691e9cd389c9534666969de7bef065c4825012594ee1e4e633b1fcf4f4947bdcf644c08962304"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "b7b006f1ff11895bca5b33cb138385055b902730892dccd5620d1537c3dba6c4a5a8c6a11d4a61ed0baa75feadccf04aad29ca251f7bf19c17c7d8db13c401b7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/ta/firefox-50.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "1f7c5dd068f4829569b398691ebb719c851ff165844eb4ca1d26026a4d40926ebc3c71c4ddcaa5e8d9b9b159ed5d08d24e2b50d3a93d111cad3d3d02d5a26f43"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "ee698d3366f202ae4ff8ed2f1d8bbe1e592fa6200e9734469292d76595e3629d3818744ae05d1d37e7372c622f79b4e8c075011dd7b835a61aba86b272c6ac94"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/te/firefox-50.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "7037a57a9e456bed79b7527b35bd680c32a94204c94b1b9d0247c0e521867ea0c606875e11a3bce6f5c2271a5e322f3481cc5451fc413cec5a5f6f199a676a2b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "62870d113beadebcfafba9c6d133cdc88769f20088b788a8577a99afa85562df901f14ce1f2c8bf6e344ac31b8a8dcb96172a5724add11936f78aba7d26d5444"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/th/firefox-50.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "5c9cca0455a4da647b8f2b178bbe73037b1d5c7ffe95dd12ee3042ab982da0cea21ff9afd4b954805966d25b035d0ad83fe138dc80a7d345a81a01df722a9dba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "0f7e16b46d0c931e147f1f6efa7ba4d12d629bb909f220bfccd9646e968e52e1d7641ab174880313781f1c149ef7b4f6311acb042b704fd18337a31531fc8863"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/tr/firefox-50.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "864a500456f1728c2043e6841256a21613864501d7428248606495c8c34ceefe0db23b3dca6a3fca9f92a22af663109d41ffe46daf19d64aad379774848a448f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "94cbfc40c5c9cbf13592a7134cc4ec2ee2fea4b733738acb45ca454e029228cf741111c5478961494a9e7965f771fca06aef0e58eca076721e8bfb11ee237202"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uk/firefox-50.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "a4d7ca792c89f37fc1457e36beba54e75a5901bbad1832272a03b0bcaa3536ed237559aca38775e16940c035b117efd1caa1929e96c889843d2732d5cbbe38a4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "e3b740953b1a9456321e684cb0dd606967d46d9ebc120d43a10244b88586c1ac4fa7cd6c7ede0fdb52690fb102e8a8a456c1c226ac7eecaa50776b52062e5285"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/uz/firefox-50.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "6a45689d06f4d52c5352d69049e55346c8791720f1d38257a49ad8ddeb9d94c0b0adafdb10a3432b4e4a75dd83eff618d7731a3bbf8752c979c0efc09b67a363"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "f1691996ead43b59409f590a46bd97359183a05ca5f5bf49966d128b2de6b8bcc2fff2c3f73e3966a8f6182aff9c1dabb88e659ce128ca6ae4cf11aa877c8df1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/vi/firefox-50.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "9fd0fe5312763143d83677b11efd0dab2e84fd93cf4a884261d33dfc23d76facd7be7d6e3701e3dc9134bfe7ac7cf8d3138f63dc490964d1b6dd696451ae18cd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "f15b3c3e4b57447023a6086b948b5f68bb5c6301c3e7f138d7e61b2cf34d87357b7e5894bcc6262552449a5d67c2548f52fa3942b01603c15cdc9803fa45660e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/xh/firefox-50.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "b28e30d95f608733099acfc6c39e0062bc3470d8ba386ea563d9b376f95e5a4bb9374d0fc360d0a387b9edd1ba252b437cf32c555c68667323648830efd96e45"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "b351d0c9f5bce2da39dd4dc500377e7a07812c6ee2c3359a15b095be562b90b43da6bd7c61435c04791278b9e47eb2ed9dbcb589fc86abdf84a16dea86c88dca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-CN/firefox-50.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "3912d4ef5bd3e9cb5bd7e6f559c66e06568a1441394c41a9a47433c28a551f3c012717adb66f02441106e20cbf866a4a201af079f4f59b9c34ed1250fb64b22e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-i686/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "1438e36a719409637e246b2d2b18b7493b00446daaa18579d2c1c45866e0aa597a8934e9d3c15893d987dccf1c1df5d4a03d34f37cbb3b3f2d2fcd52392621ca"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/50.0/linux-x86_64/zh-TW/firefox-50.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "cd5f4baef991942ac555dcc8ed37857d4a9faa29befb8b8dcce82f000a87b0bf62f0ce208df7f7238b8d7e684294f33d63194bedb21e988085bc64241fcf633f"; } ]; } From 1624f7f17474bbcfe68ac6d78bbe62ae6bd57462 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Nov 2016 16:33:41 +0100 Subject: [PATCH 024/107] nss: 3.26 -> 3.27.1 --- .../libraries/nss/85_security_load.patch | 52 +++++++++---------- pkgs/development/libraries/nss/default.nix | 6 +-- 2 files changed, 27 insertions(+), 31 deletions(-) diff --git a/pkgs/development/libraries/nss/85_security_load.patch b/pkgs/development/libraries/nss/85_security_load.patch index 632cc418425c..9e4be3bf282e 100644 --- a/pkgs/development/libraries/nss/85_security_load.patch +++ b/pkgs/development/libraries/nss/85_security_load.patch @@ -1,8 +1,7 @@ -diff --git a/nss/cmd/shlibsign/shlibsign.c b/nss/cmd/shlibsign/shlibsign.c -index 63a4836..a128c1d 100644 ---- a/nss/cmd/shlibsign/shlibsign.c -+++ b/nss/cmd/shlibsign/shlibsign.c -@@ -862,6 +862,8 @@ int main(int argc, char **argv) +diff -ru -x '*~' nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c nss-3.27.1/nss/cmd/shlibsign/shlibsign.c +--- nss-3.27.1-orig/nss/cmd/shlibsign/shlibsign.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/cmd/shlibsign/shlibsign.c 2016-11-15 16:28:07.308117900 +0100 +@@ -871,6 +871,8 @@ libname = PR_GetLibraryName(NULL, "softokn3"); assert(libname != NULL); lib = PR_LoadLibrary(libname); @@ -11,22 +10,20 @@ index 63a4836..a128c1d 100644 assert(lib != NULL); PR_FreeLibraryName(libname); -diff --git a/nss/coreconf/config.mk b/nss/coreconf/config.mk -index 61d757b..b58a98b 100644 ---- a/nss/coreconf/config.mk -+++ b/nss/coreconf/config.mk -@@ -205,3 +205,6 @@ $(error Setting NSS_ENABLE_TLS_1_3 and NSS_DISABLE_ECC isn't a good idea.) - endif - DEFINES += -DNSS_ENABLE_TLS_1_3 +diff -ru -x '*~' nss-3.27.1-orig/nss/coreconf/config.mk nss-3.27.1/nss/coreconf/config.mk +--- nss-3.27.1-orig/nss/coreconf/config.mk 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/coreconf/config.mk 2016-11-15 16:28:07.308117900 +0100 +@@ -217,3 +217,6 @@ + ifdef NSS_NO_PKCS11_BYPASS + DEFINES += -DNO_PKCS11_BYPASS endif + +# Nix specific stuff. +DEFINES += -DNIX_NSS_LIBDIR=\"$(out)/lib/\" -diff --git a/nss/lib/pk11wrap/pk11load.c b/nss/lib/pk11wrap/pk11load.c -index 5c5d2ca..026e528 100644 ---- a/nss/lib/pk11wrap/pk11load.c -+++ b/nss/lib/pk11wrap/pk11load.c -@@ -429,6 +429,13 @@ secmod_LoadPKCS11Module(SECMODModule *mod, SECMODModule **oldModule) { +diff -ru -x '*~' nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c nss-3.27.1/nss/lib/pk11wrap/pk11load.c +--- nss-3.27.1-orig/nss/lib/pk11wrap/pk11load.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/lib/pk11wrap/pk11load.c 2016-11-15 16:28:07.308117900 +0100 +@@ -429,6 +429,13 @@ * unload the library if anything goes wrong from here on out... */ library = PR_LoadLibrary(mod->dllName); @@ -40,11 +37,10 @@ index 5c5d2ca..026e528 100644 mod->library = (void *)library; if (library == NULL) { -diff --git a/nss/lib/util/secload.c b/nss/lib/util/secload.c -index eb8a9ec..f94f67d 100644 ---- a/nss/lib/util/secload.c -+++ b/nss/lib/util/secload.c -@@ -69,9 +69,14 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) +diff -ru -x '*~' nss-3.27.1-orig/nss/lib/util/secload.c nss-3.27.1/nss/lib/util/secload.c +--- nss-3.27.1-orig/nss/lib/util/secload.c 2016-10-03 16:55:58.000000000 +0200 ++++ nss-3.27.1/nss/lib/util/secload.c 2016-11-15 16:29:50.482259746 +0100 +@@ -70,9 +70,14 @@ /* Remove the trailing filename from referencePath and add the new one */ c = strrchr(referencePath, PR_GetDirectorySeparator()); @@ -55,12 +51,12 @@ index eb8a9ec..f94f67d 100644 + } if (c) { size_t referencePathSize = 1 + c - referencePath; -- fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1); +- fullName = (char*)PORT_Alloc(strlen(name) + referencePathSize + 1); + fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5); if (fullName) { memcpy(fullName, referencePath, referencePathSize); - strcpy(fullName + referencePathSize, name); -@@ -81,6 +86,11 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) + strcpy(fullName + referencePathSize, name); +@@ -82,6 +87,11 @@ #endif libSpec.type = PR_LibSpec_Pathname; libSpec.value.pathname = fullName; @@ -71,9 +67,9 @@ index eb8a9ec..f94f67d 100644 + strcpy(fullName + referencePathSize, name); dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL #ifdef PR_LD_ALT_SEARCH_PATH - /* allow library's dependencies to be found in the same directory -@@ -88,6 +98,10 @@ loader_LoadLibInReferenceDir(const char *referencePath, const char *name) - | PR_LD_ALT_SEARCH_PATH + /* allow library's dependencies to be found in the same directory +@@ -89,6 +99,10 @@ + | PR_LD_ALT_SEARCH_PATH #endif ); + if (! dlh) { diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 841795383805..ff8b0fec0a12 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { name = "nss-${version}"; - version = "3.26"; + version = "3.27.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_3_26_RTM/src/${name}.tar.gz"; - sha256 = "0r65s5q8kk0vr48s0zr8xi610k7h072lgkkpp4z6jlxr19bkly4i"; + url = "mirror://mozilla/security/nss/releases/NSS_3_27_1_RTM/src/${name}.tar.gz"; + sha256 = "fd3637a1930cd838239a89633a7ed9a18859ae9b599043f3a18f726dc4ec2a6b"; }; buildInputs = [ nspr perl zlib sqlite ]; From c2b9404c02e567b163d62cfdc7f24f1b19e79680 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 15 Nov 2016 16:57:33 +0100 Subject: [PATCH 025/107] firefox: 49.0.2 -> 50.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 650f4a3006a2..f9d5768903ea 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -141,8 +141,8 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "49.0.2"; - sha512 = "e9daa62c8e645ec034f1435afb579ddb5c503db313ea0cc3e48b7508f8368028979de07ca1426cc4c0f3ae82756f39dcb3b349712d520b8503a34afbd443fb1e"; + version = "50.0"; + sha512 = "cc325515e238cc3b78cb2cffcc2d80c9f233c0adf750c10100f0dccbab2aec6794f737d7374e600d547d5306de966dd00a0bf40a2dd71ec9dfacb6b157300a76"; }; firefox-esr-unwrapped = common { From 334a1a6f8ae550aa43c2562ee0f8abbbdea61548 Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 13 Nov 2016 16:15:45 +0100 Subject: [PATCH 026/107] Revert "Fix icu4c expression for latest gcc (fixes #2341)" This reverts commit d393c6c53803a6c1d61fa5e58e283aaa4beba7b8. The commit removed C++11 compatibility on darwin by overriding the --std=c++0x flag in CXXFLAGS. Which lead to a failing build of mapnik, which depends on the move constructors being available in the icu-lib. Since it builds fine without the headerpad_max_install_names flag, we simply undo the change that introduced this flag. --- pkgs/development/libraries/icu/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix index a7bf4af99fb3..ba8fe038ffac 100644 --- a/pkgs/development/libraries/icu/default.nix +++ b/pkgs/development/libraries/icu/default.nix @@ -16,9 +16,6 @@ stdenv.mkDerivation ({ outputs = [ "out" "dev" ]; outputBin = "dev"; - makeFlags = stdenv.lib.optionalString stdenv.isDarwin - "CXXFLAGS=-headerpad_max_install_names"; - # FIXME: This fixes dylib references in the dylibs themselves, but # not in the programs in $out/bin. buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; From 80eafb39e140b64f1366b26f5aa210ae2d80e68a Mon Sep 17 00:00:00 2001 From: Josef Kemetmueller Date: Sun, 13 Nov 2016 13:18:39 +0100 Subject: [PATCH 027/107] mapnik: Make dependencies explicit for SCons This is necessary to fix the build for (at least) darwin. If the arguments are not specified explicitly then homebrew-install locations are assumed for at least "icu". Closes #20395. --- pkgs/development/libraries/mapnik/default.nix | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index 1df9cf0492dc..e5845fee3041 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -24,7 +24,31 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - scons configure PREFIX="$out" + scons configure PREFIX="$out" BOOST_INCLUDES="${boost.dev}/include" \ + BOOST_LIBS="${boost.out}/lib" \ + CAIRO_INCLUDES="${cairo.dev}/include" \ + CAIRO_LIBS="${cairo.out}/lib" \ + FREETYPE_INCLUDES="${freetype.dev}/include" \ + FREETYPE_LIBS="${freetype.out}/lib" \ + GDAL_CONFIG="${gdal}/bin/gdal-config" \ + HB_INCLUDES="${harfbuzz.dev}/include" \ + HB_LIBS="${harfbuzz.out}/lib" \ + ICU_INCLUDES="${icu.dev}/include" \ + ICU_LIBS="${icu.out}/lib" \ + JPEG_INCLUDES="${libjpeg.dev}/include" \ + JPEG_LIBS="${libjpeg.out}/lib" \ + PNG_INCLUDES="${libpng.dev}/include" \ + PNG_LIBS="${libpng.out}/lib" \ + PROJ_INCLUDES="${proj}/include" \ + PROJ_LIBS="${proj}/lib" \ + SQLITE_INCLUDES="${sqlite.dev}/include" \ + SQLITE_LIBS="${sqlite.out}/lib" \ + TIFF_INCLUDES="${libtiff.dev}/include" \ + TIFF_LIBS="${libtiff.out}/lib" \ + WEBP_INCLUDES="${libwebp}/include" \ + WEBP_LIBS="${libwebp}/lib" \ + XML2_INCLUDES="${libxml2.dev}/include" \ + XML2_LIBS="${libxml2.out}/lib" ''; buildPhase = false; From 9e851d3b110fa7548d7a9e103a4f1bd7aaa4d99e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 12:30:55 -0500 Subject: [PATCH 028/107] linux: 4.8.7 -> 4.8.8 --- pkgs/os-specific/linux/kernel/linux-4.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.8.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix index a1f5230ac002..e6e26a4ae5a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.8.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.7"; + version = "4.8.8"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; + sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w"; }; kernelPatches = args.kernelPatches; From 24c342fde7da069ddcd39f5d3afcd4ec4ec47b00 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 12:31:27 -0500 Subject: [PATCH 029/107] linux: 4.4.31 -> 4.4.32 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e2d184c2c673..e307520cf6b8 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.4.31"; + version = "4.4.32"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03fzi08xs9xp7r7bla6n3ykr81a365n8c5br1x7vwpgpacm63rk6"; + sha256 = "03n3wzbqc2h09ydwz3jybrc8ll6f2znr0k7f0hayj0qi5wx1rnpc"; }; kernelPatches = args.kernelPatches; From 703b404c62326d186ee5771b37e4c098827ffd41 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 13:15:10 -0500 Subject: [PATCH 030/107] kotlin: 1.0.5 -> 1.0.5-2 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index e1de97e17c40..52a47c50420e 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: stdenv.mkDerivation rec { - version = "1.0.5"; + version = "1.0.5-2"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha512 = "0bkgxr4an1fq890s3bw4izwc8ly29xk28gdibvnp2q9qd15rwrny5dgns697rnbw2gg0nn08q5p33asvbkac001cfabfphamjwndvc9"; + sha512 = "0z8phc51y8dfjnm95fs2dnmvhp7xm2am5xm71byh598flkpjmagnwah4j8z9fpg4qy94dwmqxf5zs3q8nfra89kmwskzpvp7bbibi0h"; }; propagatedBuildInputs = [ jre ] ; From 207b8d1c46e431a6ac2bfbdf14f9385098b4b51d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 15 Nov 2016 19:22:39 +0100 Subject: [PATCH 031/107] firefox-esr: security-only update 45.4.0 -> 45.5.0 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index f9d5768903ea..5c3749f83fa1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -147,8 +147,8 @@ in { firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.4.0esr"; - sha512 = "2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715"; + version = "45.5.0esr"; + sha512 = "fadac65fcad4bd4701026c9f3d87ba7dec304205e3c375769db7f7de9e596877deed9b21d3e8c34c1ce8ae689dd2979b3627742dfbec9bc0cb16a5cb1ce7507d"; }; } From 3c3dfbc40255b26d5d2286a06eeac293991d4b88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 15 Nov 2016 21:43:08 +0100 Subject: [PATCH 032/107] aha: 0.4.10.1 -> 0.4.10.2 --- pkgs/tools/text/aha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix index 6bccd16edf7d..9851f9596c36 100644 --- a/pkgs/tools/text/aha/default.nix +++ b/pkgs/tools/text/aha/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "aha-${version}"; - version = "0.4.10.1"; + version = "0.4.10.2"; src = fetchFromGitHub { - sha256 = "0j4jn8c0bhvbmpp2ynkw1y0l5dm49s7g5rmsvdxh0g1sjai161ss"; + sha256 = "14n0py8dzlvirawb8brq143nq0sy9s2z6in5589krrya0frlrlkj"; rev = version; repo = "aha"; owner = "theZiz"; From 2ca507a2b8408228cacb56f59dfbf0039bcff6c2 Mon Sep 17 00:00:00 2001 From: Stefan Goetz Date: Tue, 15 Nov 2016 22:01:29 +0100 Subject: [PATCH 033/107] youtube-dl: 2016-11-08.1 -> 2016-11-14.1 (#20440) --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a2dd91e83bc9..fe6838d52000 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -15,11 +15,11 @@ with stdenv.lib; buildPythonApplication rec { name = "youtube-dl-${version}"; - version = "2016.11.08.1"; + version = "2016.11.14.1"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "95d45438254c949952127b269451da861682fb06a7ef62b5f5dc75bc40bfaeeb"; + sha256 = "d96b5e5fe7de67ea01c2be746c00dc78ffbf3f74654aa989db8baaf153243537"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; From f11b7cf579d09341f701766ef7a360848808c255 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 16:11:29 -0500 Subject: [PATCH 034/107] gradle: 3.1 -> 3.2 --- pkgs/development/tools/build-managers/gradle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b995e76f63ab..dee5146e7307 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -52,11 +52,11 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.1"; + name = "gradle-3.2"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "1z0h60w0wvdg2rlxg5izcbhnrzdmr3mdgs7p09cm4lr28d139pn7"; + sha256 = "0d9911011hg0rsqs7r4fz1xjrx0h43qji8s7f0vw0v926xlb68ak"; }; }; From 7df3d7446f868170848227cd972fa833c827f07c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 16:31:55 -0500 Subject: [PATCH 035/107] Add initial basic support for cross-compiling to iOS --- .../darwin/apple-source-releases/default.nix | 11 +++- pkgs/os-specific/darwin/ios-cross/default.nix | 54 +++++++++++++++++++ pkgs/stdenv/cross/default.nix | 6 +++ pkgs/stdenv/default.nix | 6 ++- pkgs/top-level/all-packages.nix | 4 ++ 5 files changed, 77 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/darwin/ios-cross/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 8625ac72c104..d86754ecc74c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, pkgs }: +{ stdenv, fetchurl, fetchzip, pkgs, fetchurlBoot }: let # This attrset can in theory be computed automatically, but for that to work nicely we need @@ -123,7 +123,14 @@ let }; }; - fetchApple = version: sha256: name: fetchurl { + fetchApple = version: sha256: name: let + # When cross-compiling, fetchurl depends on libiconv, resulting + # in an infinite recursion without this. It's not clear why this + # worked fine when not cross-compiling + fetch = if name == "libiconv" + then fetchurlBoot + else fetchurl; + in fetch { url = "http://www.opensource.apple.com/tarballs/${name}/${name}-${versions.${version}.${name}}.tar.gz"; inherit sha256; }; diff --git a/pkgs/os-specific/darwin/ios-cross/default.nix b/pkgs/os-specific/darwin/ios-cross/default.nix new file mode 100644 index 000000000000..d9f4320556c9 --- /dev/null +++ b/pkgs/os-specific/darwin/ios-cross/default.nix @@ -0,0 +1,54 @@ +{ runCommand +, lib +, llvm +, clang +, binutils +, stdenv +, coreutils +, gnugrep +}: { prefix, arch, simulator ? false }: let + sdkType = if simulator then "Simulator" else "OS"; + + sdk = "/Applications/Xcode.app/Contents/Developer/Platforms/iPhone${sdkType}.platform/Developer/SDKs/iPhone${sdkType}10.0.sdk"; + + /* TODO: Properly integrate with gcc-cross-wrapper */ + wrapper = import ../../../build-support/cc-wrapper { + inherit stdenv coreutils gnugrep; + nativeTools = false; + nativeLibc = false; + inherit binutils; + libc = runCommand "empty-libc" {} "mkdir -p $out/{lib,include}"; + cc = clang; + extraBuildCommands = '' + # ugh + tr '\n' ' ' < $out/nix-support/cc-cflags > cc-cflags.tmp + mv cc-cflags.tmp $out/nix-support/cc-cflags + echo "-target ${prefix} -arch ${arch} -idirafter ${sdk}/usr/include ${if simulator then "-mios-simulator-version-min=7.0" else "-miphoneos-version-min=7.0"}" >> $out/nix-support/cc-cflags + + # Purposefully overwrite libc-ldflags-before, cctools ld doesn't know dynamic-linker and cc-wrapper doesn't do cross-compilation well enough to adjust + echo "-arch ${arch} -L${sdk}/usr/lib -L${sdk}/usr/lib/system" > $out/nix-support/libc-ldflags-before + ''; + }; +in { + cc = runCommand "${prefix}-cc" {} '' + mkdir -p $out/bin + ln -sv ${wrapper}/bin/clang $out/bin/${prefix}-cc + mkdir -p $out/nix-support + echo ${llvm} > $out/nix-support/propagated-native-build-inputs + cat > $out/nix-support/setup-hook < Date: Tue, 15 Nov 2016 16:39:08 -0500 Subject: [PATCH 036/107] llvm-3.8: Fix segfault in llc --- pkgs/development/compilers/llvm/3.8/llvm.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index 6112228bf4fc..fa647e62ff14 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -35,10 +35,14 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; + # Fix a segfault in llc + # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html + patches = [ ./D17533-1.patch ]; + # hacky fix: New LLVM releases require a newer OS X SDK than # 10.9. This is a temporary measure until nixpkgs darwin support is # updated. - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc ''; From 459ab0e0fde940343efbd7eb79bf05a7c813faae Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 16:41:24 -0500 Subject: [PATCH 037/107] Whoops, actually add patch for llvm --- .../compilers/llvm/3.8/D17533-1.patch | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 pkgs/development/compilers/llvm/3.8/D17533-1.patch diff --git a/pkgs/development/compilers/llvm/3.8/D17533-1.patch b/pkgs/development/compilers/llvm/3.8/D17533-1.patch new file mode 100644 index 000000000000..79ca953d6e5b --- /dev/null +++ b/pkgs/development/compilers/llvm/3.8/D17533-1.patch @@ -0,0 +1,60 @@ +commit eb92f5a745014532b83abfba04602fce87ca8393 +Author: Chuang-Yu Cheng +Date: Fri Apr 8 12:04:32 2016 +0000 + + CXX_FAST_TLS calling convention: performance improvement for PPC64 + + This is the same change on PPC64 as r255821 on AArch64. I have even borrowed + his commit message. + + The access function has a short entry and a short exit, the initialization + block is only run the first time. To improve the performance, we want to + have a short frame at the entry and exit. + + We explicitly handle most of the CSRs via copies. Only the CSRs that are not + handled via copies will be in CSR_SaveList. + + Frame lowering and prologue/epilogue insertion will generate a short frame + in the entry and exit according to CSR_SaveList. The majority of the CSRs will + be handled by register allcoator. Register allocator will try to spill and + reload them in the initialization block. + + We add CSRsViaCopy, it will be explicitly handled during lowering. + + 1> we first set FunctionLoweringInfo->SplitCSR if conditions are met (the target + supports it for the given machine function and the function has only return + exits). We also call TLI->initializeSplitCSR to perform initialization. + 2> we call TLI->insertCopiesSplitCSR to insert copies from CSRsViaCopy to + virtual registers at beginning of the entry block and copies from virtual + registers to CSRsViaCopy at beginning of the exit blocks. + 3> we also need to make sure the explicit copies will not be eliminated. + + Author: Tom Jablin (tjablin) + Reviewers: hfinkel kbarton cycheng + + http://reviews.llvm.org/D17533 + + git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265781 91177308-0d34-0410-b5e6-96231b3b80d8 + +diff --git a/lib/CodeGen/TargetFrameLoweringImpl.cpp b/lib/CodeGen/TargetFrameLoweringImpl.cpp +index 679ade1..0a0e079 100644 +--- a/lib/CodeGen/TargetFrameLoweringImpl.cpp ++++ b/lib/CodeGen/TargetFrameLoweringImpl.cpp +@@ -63,12 +63,15 @@ void TargetFrameLowering::determineCalleeSaves(MachineFunction &MF, + const TargetRegisterInfo &TRI = *MF.getSubtarget().getRegisterInfo(); + const MCPhysReg *CSRegs = TRI.getCalleeSavedRegs(&MF); + ++ // Resize before the early returns. Some backends expect that ++ // SavedRegs.size() == TRI.getNumRegs() after this call even if there are no ++ // saved registers. ++ SavedRegs.resize(TRI.getNumRegs()); ++ + // Early exit if there are no callee saved registers. + if (!CSRegs || CSRegs[0] == 0) + return; + +- SavedRegs.resize(TRI.getNumRegs()); +- + // In Naked functions we aren't going to save any registers. + if (MF.getFunction()->hasFnAttribute(Attribute::Naked)) + return; From 0d4e1b5eddb57ed428ac30bfb248ea60ccc2bd2c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 22:45:06 +0100 Subject: [PATCH 038/107] grsecurity: 4.8.7-201611142350 -> 4.8.8-201611150756 --- pkgs/os-specific/linux/kernel/linux-grsecurity.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index a1f5230ac002..e6e26a4ae5a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix +++ b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.8.7"; + version = "4.8.8"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03qgqqy1kxdqpb844g2yfyq45xy77110hrz8ddqy0rlkia8kzx8m"; + sha256 = "0hm60zjsp22rbh8jz4d8rpwsj6bysmlcm0c5m1cxpnfj6cqcjp7w"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2f7398a0a4b2..3c6058c407a5 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -86,9 +86,9 @@ rec { }; grsecurity_testing = grsecPatch - { kver = "4.8.7"; - grrev = "201611142350"; - sha256 = "002zm8j130ras0dabp95bb82c5h8y9z66jl81jip226y3bk3b019"; + { kver = "4.8.8"; + grrev = "201611150756"; + sha256 = "04sankbjlrji3hrhgwfvmgkrh5ypblb706i0hch4sn3vcc0dq87b"; }; # This patch relaxes grsec constraints on the location of usermode helpers, From f477bc98bec323cdb58735580f17701238a7bc68 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Tue, 15 Nov 2016 22:55:17 +0100 Subject: [PATCH 039/107] torbrowser: 6.0.5 -> 6.0.6 --- pkgs/tools/security/tor/torbrowser.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 900ad39ecb23..be93b291dcc2 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.5"; + version = "6.0.6"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "fc917bd702b1275cae3f7fa8036c3c44af9b4f003f3d4a8fbb9f6c0974277ad4" else - "e0c3ce406b6de082692ce3db52b6e04053e205194b26fbf0eee9014be543d98d"; + "0ydcbkpyrdwsqn841cxzpbr05nzly720xhsin89gjc1sirvmlxmx" else + "0q8ygkgs47wjq12l37kwm93v1420gzrlacwqc0yz4b3b58aa1d4z"; }; desktopItem = makeDesktopItem { From 845b56d25af40d90e3cd6ec4d60c6b3f091c7588 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 16:59:09 -0500 Subject: [PATCH 040/107] Initial support for cross-compiling ghc --- pkgs/development/compilers/ghc/D2710.patch | 19 +++ pkgs/development/compilers/ghc/D2711.patch | 22 +++ pkgs/development/compilers/ghc/D2712.patch | 158 ++++++++++++++++++ pkgs/development/compilers/ghc/D2713.patch | 17 ++ ...pass-linker-flags-via-response-files.patch | 20 --- pkgs/development/compilers/ghc/head.nix | 60 ++++--- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 7 +- 8 files changed, 263 insertions(+), 42 deletions(-) create mode 100644 pkgs/development/compilers/ghc/D2710.patch create mode 100644 pkgs/development/compilers/ghc/D2711.patch create mode 100644 pkgs/development/compilers/ghc/D2712.patch create mode 100644 pkgs/development/compilers/ghc/D2713.patch delete mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/D2710.patch b/pkgs/development/compilers/ghc/D2710.patch new file mode 100644 index 000000000000..0ee1b06c7346 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2710.patch @@ -0,0 +1,19 @@ +diff --git a/rts/LinkerInternals.h b/rts/LinkerInternals.h +--- a/rts/LinkerInternals.h ++++ b/rts/LinkerInternals.h +@@ -303,4 +303,14 @@ + # define OBJFORMAT_MACHO + #endif + ++/* In order to simplify control flow a bit, some references to mmap-related ++ definitions are blocked off by a C-level if statement rather than a CPP-level ++ #if statement. Since those are dead branches when !RTS_LINKER_USE_MMAP, we ++ just stub out the relevant symbols here ++*/ ++#if !RTS_LINKER_USE_MMAP ++#define munmap(x,y) /* nothing */ ++#define MAP_ANONYMOUS 0 ++#endif ++ + #endif /* LINKERINTERNALS_H */ + diff --git a/pkgs/development/compilers/ghc/D2711.patch b/pkgs/development/compilers/ghc/D2711.patch new file mode 100644 index 000000000000..8d229f273999 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2711.patch @@ -0,0 +1,22 @@ +diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c +--- a/rts/sm/Storage.c ++++ b/rts/sm/Storage.c +@@ -1314,7 +1314,7 @@ + ------------------------------------------------------------------------- */ + + #if (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) +-void sys_icache_invalidate(void *start, size_t len); ++#include + #endif + + /* On ARM and other platforms, we need to flush the cache after +@@ -1327,7 +1327,7 @@ + (void)exec_addr; + #elif (defined(arm_HOST_ARCH) || defined(aarch64_HOST_ARCH)) && defined(ios_HOST_OS) + /* On iOS we need to use the special 'sys_icache_invalidate' call. */ +- sys_icache_invalidate(exec_addr, ((unsigned char*)exec_addr)+len); ++ sys_icache_invalidate(exec_addr, len); + #elif defined(__GNUC__) + /* For all other platforms, fall back to a libgcc builtin. */ + unsigned char* begin = (unsigned char*)exec_addr; + diff --git a/pkgs/development/compilers/ghc/D2712.patch b/pkgs/development/compilers/ghc/D2712.patch new file mode 100644 index 000000000000..d938d70bbcfe --- /dev/null +++ b/pkgs/development/compilers/ghc/D2712.patch @@ -0,0 +1,158 @@ +diff --git a/includes/rts/OSThreads.h b/includes/rts/OSThreads.h +--- a/includes/rts/OSThreads.h ++++ b/includes/rts/OSThreads.h +@@ -15,7 +15,12 @@ + #ifndef RTS_OSTHREADS_H + #define RTS_OSTHREADS_H + +-#if defined(THREADED_RTS) /* to near the end */ ++#if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) ++#define BUILD_OSTHREAD_POSIX ++#endif ++ ++ ++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) /* to near end */ + + #if defined(HAVE_PTHREAD_H) && !defined(mingw32_HOST_OS) + +@@ -205,13 +210,25 @@ + void releaseThreadNode (void); + #endif // !CMINUSMINUS + +-#else ++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ ++ ++#ifndef THREADED_RTS ++ ++#ifdef ACQUIRE_LOCK ++// If we have pthreads, we pull in the threading primitives even when the RTS ++// isn't threaded, but we expect these macros to be noops on non-threaded RTS. ++ ++#undef ACQUIRE_LOCK ++#undef RELEASE_LOCK ++#undef ASSERT_LOCK_HELD ++ ++#endif + + #define ACQUIRE_LOCK(l) + #define RELEASE_LOCK(l) + #define ASSERT_LOCK_HELD(l) + +-#endif /* defined(THREADED_RTS) */ ++#endif + + #ifndef CMINUSMINUS + // +diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c +--- a/rts/posix/OSThreads.c ++++ b/rts/posix/OSThreads.c +@@ -35,7 +35,7 @@ + #endif + #endif + +-#if defined(THREADED_RTS) ++#if defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) + #include "RtsUtils.h" + #include "Task.h" + +@@ -225,47 +225,6 @@ + return NULL; + } + +-int +-forkOS_createThread ( HsStablePtr entry ) +-{ +- pthread_t tid; +- int result = pthread_create(&tid, NULL, +- forkOS_createThreadWrapper, (void*)entry); +- if(!result) +- pthread_detach(tid); +- return result; +-} +- +-void freeThreadingResources (void) { /* nothing */ } +- +-uint32_t +-getNumberOfProcessors (void) +-{ +- static uint32_t nproc = 0; +- +- if (nproc == 0) { +-#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) +- nproc = sysconf(_SC_NPROCESSORS_ONLN); +-#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) +- nproc = sysconf(_SC_NPROCESSORS_CONF); +-#elif defined(darwin_HOST_OS) +- size_t size = sizeof(uint32_t); +- if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { +- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) +- nproc = 1; +- } +-#elif defined(freebsd_HOST_OS) +- size_t size = sizeof(uint32_t); +- if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) +- nproc = 1; +-#else +- nproc = 1; +-#endif +- } +- +- return nproc; +-} +- + #if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_SETAFFINITY) + // Schedules the thread to run on CPU n of m. m may be less than the + // number of physical CPUs, in which case, the thread will be allowed +@@ -353,6 +312,51 @@ + pthread_kill(id, SIGPIPE); + } + ++#endif /* defined(THREADED_RTS) || defined(BUILD_OSTHREAD_POSIX) */ ++ ++#if defined(THREADED_RTS) ++ ++int ++forkOS_createThread ( HsStablePtr entry ) ++{ ++ pthread_t tid; ++ int result = pthread_create(&tid, NULL, ++ forkOS_createThreadWrapper, (void*)entry); ++ if(!result) ++ pthread_detach(tid); ++ return result; ++} ++ ++void freeThreadingResources (void) { /* nothing */ } ++ ++uint32_t ++getNumberOfProcessors (void) ++{ ++ static uint32_t nproc = 0; ++ ++ if (nproc == 0) { ++#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_ONLN) ++ nproc = sysconf(_SC_NPROCESSORS_ONLN); ++#elif defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF) ++ nproc = sysconf(_SC_NPROCESSORS_CONF); ++#elif defined(darwin_HOST_OS) ++ size_t size = sizeof(uint32_t); ++ if(sysctlbyname("hw.logicalcpu",&nproc,&size,NULL,0) != 0) { ++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) ++ nproc = 1; ++ } ++#elif defined(freebsd_HOST_OS) ++ size_t size = sizeof(uint32_t); ++ if(sysctlbyname("hw.ncpu",&nproc,&size,NULL,0) != 0) ++ nproc = 1; ++#else ++ nproc = 1; ++#endif ++ } ++ ++ return nproc; ++} ++ + #else /* !defined(THREADED_RTS) */ + + int + diff --git a/pkgs/development/compilers/ghc/D2713.patch b/pkgs/development/compilers/ghc/D2713.patch new file mode 100644 index 000000000000..80cf35a52974 --- /dev/null +++ b/pkgs/development/compilers/ghc/D2713.patch @@ -0,0 +1,17 @@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -437,7 +437,11 @@ + else + CrossCompilePrefix="" + fi +-TargetPlatformFull="${TargetPlatform}" ++# Despite its similarity in name to TargetPlatform, TargetPlatformFull is used ++# in calls to subproject configure scripts and thus must be set to the autoconf ++# triple, not the normalized GHC triple that TargetPlatform is set to. ++# It may be better to just do away with the GHC triples all together. ++TargetPlatformFull="${target}" + AC_SUBST(CrossCompiling) + AC_SUBST(CrossCompilePrefix) + AC_SUBST(TargetPlatformFull) + diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch deleted file mode 100644 index ebbb9326a829..000000000000 --- a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500 -+++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500 -@@ -421,7 +421,7 @@ - args1 = map Option (getOpts dflags opt_c) - args2 = args0 ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env -+ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env - where - -- discard some harmless warnings from gcc that we can't turn off - cc_filter = unlines . doFilter . lines -@@ -911,7 +911,7 @@ - args1 = map Option (getOpts dflags opt_l) - args2 = args0 ++ linkargs ++ args1 ++ args - mb_env <- getGccEnv args2 -- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env -+ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env - where - ld_filter = case (platformOS (targetPlatform dflags)) of - OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index d57b6e575da5..21f0eecc87f7 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,27 +1,35 @@ { stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils -, autoconf, automake, happy, alex +, autoconf, automake, happy, alex, cross ? null }: let inherit (bootPkgs) ghc; -in stdenv.mkDerivation rec { - version = "8.1.20161109"; + commonBuildInputs = [ ghc perl autoconf automake happy alex ]; + + version = "8.1.20161115"; + + 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/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + ''; +in stdenv.mkDerivation (rec { + inherit version; name = "ghc-${version}"; - rev = "2e8463b232054b788b73e6551947a9434aa76009"; + rev = "017d11e0a36866b05ace32ece1af11adf652a619"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "12nxai5qqnw42syhd0vzl2f9f8z28rc0fsa7g771dyzpqglak90l"; + sha256 = "091zpb9vqqy4jqh4q7sz04dh1yfdczaaikbxi5ppim01gzbxwn65"; }; - patches = [ - ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch # https://github.com/NixOS/nixpkgs/issues/10752 - ]; - postUnpack = '' - pushd ghc-${builtins.substring 0 7 rev} + chmod -R +w ghc + pushd ghc echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID patchShebangs . @@ -29,20 +37,14 @@ in stdenv.mkDerivation rec { popd ''; - buildInputs = [ ghc perl autoconf automake happy alex ]; + buildInputs = commonBuildInputs; enableParallelBuilding = true; - 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" - ''; + preConfigure = commonPreConfigure; configureFlags = [ - "--with-cc=${stdenv.cc}/bin/cc" + "CC=cc" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ @@ -76,4 +78,22 @@ in stdenv.mkDerivation rec { inherit (ghc.meta) license platforms; }; -} +} // stdenv.lib.optionalAttrs (cross != null) { + name = "${cross.config}-ghc-${version}"; + + # Some fixes for cross-compilation to iOS. See https://phabricator.haskell.org/D2710 (D2711,D2712,D2713) + patches = [ ./D2710.patch ./D2711.patch ./D2712.patch ./D2713.patch ]; + + preConfigure = commonPreConfigure + '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + configureFlags = [ + "CC=${cross.config}-cc" + "--target=${cross.config}" + ]; + + buildInputs = commonBuildInputs ++ [ stdenv.ccCross stdenv.binutilsCross ]; + + dontSetConfigureCross = true; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e376eb40d62c..3d74d74e18cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4855,7 +4855,7 @@ in # Haskell and GHC - haskell = callPackage ./haskell-packages.nix { }; + haskell = callPackage ./haskell-packages.nix { inherit crossSystem; }; haskellPackages = haskell.packages.ghc801.override { overrides = config.haskellPackageOverrides or (self: super: {}); diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f305c55dbfa5..a3867860799d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ pkgs, callPackage, stdenv }: +{ pkgs, callPackage, stdenv, crossSystem }: rec { @@ -50,6 +50,10 @@ rec { bootPkgs = packages.ghc7103; inherit (bootPkgs) alex happy; }; + # TODO: how should we support multiple versions of this? + ghcCross = compiler.ghcHEAD.override { + cross = crossSystem; + }; ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec { bootPkgs = packages.ghc784; inherit (bootPkgs) alex happy; @@ -121,6 +125,7 @@ rec { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; + # TODO Support for ghcCross here ghcNokinds = callPackage ../development/haskell-modules { ghc = compiler.ghcNokinds; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-nokinds.nix { }; From ef4a335be4844a593f26cdd8c2bc4a9d0ddf6e89 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 18:05:02 -0500 Subject: [PATCH 041/107] git: 2.10.1 -> 2.10.2 --- .../version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e432543df452..9c44d420c136 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.10.1"; + version = "2.10.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9"; + sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; hardeningDisable = [ "format" ]; From 6f7593fddcc70a96d219bd7c72658e6ace8ffa9a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 18:30:26 -0500 Subject: [PATCH 042/107] ghc-head: fix hash. Apparently fetchgit lies... --- pkgs/development/compilers/ghc/head.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 21f0eecc87f7..2399a44fc0d2 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -24,12 +24,11 @@ in stdenv.mkDerivation (rec { src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "091zpb9vqqy4jqh4q7sz04dh1yfdczaaikbxi5ppim01gzbxwn65"; + sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; postUnpack = '' - chmod -R +w ghc - pushd ghc + pushd ghc-${builtins.substring 0 7 rev} echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID patchShebangs . @@ -44,7 +43,7 @@ in stdenv.mkDerivation (rec { preConfigure = commonPreConfigure; configureFlags = [ - "CC=cc" + "CC=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ From 289604273803b548605a3eca8ef44a26e7c43c7d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 18:38:48 -0500 Subject: [PATCH 043/107] gradle: Add variable nativeVersion --- .../tools/build-managers/gradle/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index dee5146e7307..8d9308e7fcff 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: rec { - gradleGen = {name, src} : stdenv.mkDerivation rec { - inherit name src; + gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec { + inherit name src nativeVersion; dontBuild = true; @@ -21,10 +21,10 @@ rec { let arch = if stdenv.is64bit then "amd64" else "i386"; in '' mkdir patching pushd patching - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.11.jar + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so - jar cf native-platform-linux-${arch}-0.11.jar . - mv native-platform-linux-${arch}-0.11.jar $out/lib/gradle/lib/ + jar cf native-platform-linux-${arch}-${nativeVersion}.jar . + mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/ popd # The scanner doesn't pick up the runtime dependency in the jar. @@ -53,6 +53,7 @@ rec { gradle_latest = gradleGen rec { name = "gradle-3.2"; + nativeVersion = "0.11"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; @@ -62,6 +63,7 @@ rec { gradle_2_14 = gradleGen rec { name = "gradle-2.14.1"; + nativeVersion = "0.10"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; @@ -71,6 +73,7 @@ rec { gradle_2_5 = gradleGen rec { name = "gradle-2.5"; + nativeVersion = "0.10"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; From 224331adc7d7e95c367e01f82eb63da9c799af1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 15 Nov 2016 19:03:40 -0500 Subject: [PATCH 044/107] liquibase: 3.4.2 -> 3.5.3 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 27c9cc7955f8..5305297a27af 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "liquibase"; - version = "3.4.2"; + version = "3.5.3"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz"; - sha256 = "1kvxqjz8jmqpmb1clhp2asxmgfk6ynqjir8fldc321v9a5wnqby5"; + sha256 = "04cpnfycv0ms70d70w8ijqp2yacj2svs7v3lk99z1bpq3rzx51gv"; }; buildInputs = [ jre makeWrapper ]; From d9e63424b7a81966b9fd768c37b928617f3be62f Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 15 Nov 2016 19:44:21 -0500 Subject: [PATCH 045/107] ghc-HEAD: Run boot after patches. This allows for patches affecting configure.ac to take effect --- pkgs/development/compilers/ghc/head.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 2399a44fc0d2..aec6faed585e 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -27,13 +27,11 @@ in stdenv.mkDerivation (rec { sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; - postUnpack = '' - pushd ghc-${builtins.substring 0 7 rev} + postPatch = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID patchShebangs . ./boot - popd ''; buildInputs = commonBuildInputs; From de87138b9ac14a466fe5f0b43462542308913cb0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 25 Jun 2016 23:45:55 -0500 Subject: [PATCH 046/107] xcbuild: add wrapper Also updates xcbuild version. This changes the raw string expressions into nix expressions that are then converted into json by builtins.toJSON. Then, converted to Plist XML by Apple's plutil. Sadly, xcbuild does not support using raw JSON but Apple's plutil does so we just convert the file from JSON to XML using Apple's plutil. The result is not ideal but it looks like all OS X systems have working plutil's. - set mac version to 10.10 - add setup hook. --- pkgs/development/tools/xcbuild/default.nix | 11 +- pkgs/development/tools/xcbuild/developer.nix | 33 + pkgs/development/tools/xcbuild/platform.nix | 604 +++++++++++++++++++ pkgs/development/tools/xcbuild/sdk.nix | 31 + pkgs/development/tools/xcbuild/setup-hook.sh | 17 + pkgs/development/tools/xcbuild/toolchain.nix | 100 +++ pkgs/development/tools/xcbuild/wrapper.nix | 64 ++ pkgs/top-level/all-packages.nix | 5 +- 8 files changed, 859 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/xcbuild/developer.nix create mode 100644 pkgs/development/tools/xcbuild/platform.nix create mode 100644 pkgs/development/tools/xcbuild/sdk.nix create mode 100644 pkgs/development/tools/xcbuild/setup-hook.sh create mode 100644 pkgs/development/tools/xcbuild/toolchain.nix create mode 100644 pkgs/development/tools/xcbuild/wrapper.nix diff --git a/pkgs/development/tools/xcbuild/default.nix b/pkgs/development/tools/xcbuild/default.nix index e313672aea3f..1393034ff205 100644 --- a/pkgs/development/tools/xcbuild/default.nix +++ b/pkgs/development/tools/xcbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO }: +{ stdenv, cmake, fetchFromGitHub, zlib, libxml2, libpng, CoreServices, CoreGraphics, ImageIO, ninja }: let googletest = fetchFromGitHub { @@ -16,13 +16,13 @@ let }; in stdenv.mkDerivation rec { name = "xcbuild-${stdenv.lib.substring 0 8 version}"; - version = "49f8a5923f1381f87ac03ad4c1b138d1d2b74369"; + version = "0ab861abcc11185a17d59608f96a015752a6fadc"; src = fetchFromGitHub { owner = "facebook"; repo = "xcbuild"; rev = version; - sha256 = "0l107xkh7dab2xc58dqyrrhpd1gp12cpzh0wrx0i9jbh0idbwnk0"; + sha256 = "12h0rn8v0js2vph2pwp5wvcrfkj12nz365i5qxw9miyfn4msnz26"; }; prePatch = '' @@ -39,5 +39,6 @@ in stdenv.mkDerivation rec { rmdir $out/usr ''; - buildInputs = [ cmake zlib libxml2 libpng CoreServices CoreGraphics ImageIO ]; -} \ No newline at end of file + buildInputs = [ cmake zlib libxml2 libpng ninja ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreGraphics ImageIO ]; +} diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix new file mode 100644 index 000000000000..993a5fb861a2 --- /dev/null +++ b/pkgs/development/tools/xcbuild/developer.nix @@ -0,0 +1,33 @@ +{stdenv, platform, toolchain, xcbuild, writeText}: + +let + +AbstractAssetCatalog = { + Type = "FileType"; + Identifier = "folder.abstractassetcatalog"; + BasedOn = "wrapper"; + + UTI = "com.apple.dt.abstractassetcatalog"; + IsTransparent = "NO"; +}; + +in + +stdenv.mkDerivation { + name = "Xcode.app"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ + cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ + + plutil -convert xml1 ${writeText "folder.abstractassetcatalog" (builtins.toJSON AbstractAssetCatalog)} -o $out/Contents/Developer/Library/Xcode/Specifications/folder.abstractassetcatalog.xcspec + + mkdir -p $out/Contents/Developer/Platforms/ + cd $out/Contents/Developer/Platforms/ + ln -s ${platform} + + mkdir -p $out/Contents/Developer/Toolchains/ + cd $out/Contents/Developer/Toolchains/ + ln -s ${toolchain} + ''; +} diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix new file mode 100644 index 000000000000..692a673e5c9d --- /dev/null +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -0,0 +1,604 @@ +{ stdenv, sdk, writeText, platformName, xcbuild }: + +let + + Info = { + CFBundleIdentifier = platformName; + Type = "Platform"; + }; + + Version = { + ProjectName = "OSXPlatformSupport"; + }; + + PackageTypes = [ + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-executable"; + Name = "Mach-O Executable"; + Description = "Mach-O executable"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "YES"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-objfile"; + Name = "Mach-O Object File"; + Description = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-dylib"; + Name = "Mach-O Dynamic Library"; + Description = "Mach-O dynamic library"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.static-library"; + Name = "Mach-O Static Library"; + Description = "Mach-O static library"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".a"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "archive.ar"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.mach-o-bundle"; + Name = "Mach-O Loadable"; + Description = "Mach-O loadable"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ".dylib"; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.bundle"; + Name = "$(EXECUTABLE_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper"; + Name = "Wrapper"; + Description = "Wrapper"; + DefaultBuildSettings = { + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; + INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.shallow"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Wrapper (Shallow)"; + Description = "Shallow Wrapper"; + DefaultBuildSettings = { + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + SHALLOW_BUNDLE = "YES"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.application"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Application Wrapper"; + Description = "Application Wrapper"; + DefaultBuildSettings = { + GENERATE_PKGINFO_FILE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.application.shallow"; + BasedOn = "com.apple.package-type.wrapper.shallow"; + Name = "Application Wrapper (Shallow)"; + Description = "Shallow Application Wrapper"; + DefaultBuildSettings = { + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + GENERATE_PKGINFO_FILE = "YES"; + SHALLOW_BUNDLE = "YES"; + }; + ProductReference = { + FileType = "wrapper.application"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "YES"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.framework"; + Name = "Framework Wrapper"; + Description = "Framework wrapper"; + DefaultBuildSettings = { + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".framework"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)/Versions"; + CONTENTS_FOLDER_PATH = "$(VERSIONS_FOLDER_PATH)/$(FRAMEWORK_VERSION)"; + CURRENT_VERSION = "Current"; + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; + INFOPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Info.plist"; + INFOPLISTSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; + PKGINFO_PATH = "$(WRAPPER_NAME)/PkgInfo"; + PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; + VERSIONPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/version.plist"; + PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; + PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; + EXECUTABLES_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; + SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; + SHARED_SUPPORT_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; + LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; + DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; + PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; + SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; + JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; + CODESIGNING_FOLDER_PATH = "$(TARGET_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)"; + }; + ProductReference = { + FileType = "wrapper.framework"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.framework.static"; + Name = "Mach-O Static Framework"; + Description = "Mach-O static framework"; + BasedOn = "com.apple.package-type.wrapper.framework"; + DefaultBuildSettings = { + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + }; + ProductReference = { + FileType = "wrapper.framework.static"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.wrapper.framework.shallow"; + Name = "Shallow Framework Wrapper"; + Description = "Shallow framework wrapper"; + BasedOn = "com.apple.package-type.wrapper.framework"; + DefaultBuildSettings = { + CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; + VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)"; + UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; + SHALLOW_BUNDLE = "YES"; + }; + ProductReference = { + FileType = "wrapper.framework"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + { + Type = "PackageType"; + Identifier = "com.apple.package-type.bundle.unit-test"; + BasedOn = "com.apple.package-type.wrapper"; + Name = "Unit Test Bundle"; + Description = "Unit Test Bundle"; + DefaultBuildSettings = { + WRAPPER_SUFFIX = "xctest"; + }; + ProductReference = { + FileType = "wrapper.cfbundle"; + Name = "$(WRAPPER_NAME)"; + IsLaunchable = "NO"; + }; + } + ]; + + ProductTypes = [ + { + Type = "ProductType"; + Identifier = "com.apple.product-type.tool"; + Class = "PBXToolProductType"; + Name = "Command-line Tool"; + Description = "Standalone command-line tool"; + IconNamePrefix = "TargetExecutable"; + DefaultTargetName = "Command-line Tool"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + EXECUTABLE_PREFIX = ""; + EXECUTABLE_SUFFIX = ""; + REZ_EXECUTABLE = "YES"; + INSTALL_PATH = "/homeless-shelter"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + GCC_DYNAMIC_NO_PIC = "NO"; + GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + STRIP_STYLE = "all"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.mach-o-executable" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.objfile"; + Class = "XCStandaloneExecutableProductType"; + Name = "Object File"; + Description = "Object File"; + IconNamePrefix = "TargetPlugin"; + DefaultTargetName = "Object File"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "mh_object"; + LINK_WITH_STANDARD_LIBRARIES = "NO"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "o"; + PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; + PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; + INSTALL_PATH = "/homeless-shelter"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + SKIP_INSTALL = "YES"; + STRIP_STYLE = "debugging"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + KEEP_PRIVATE_EXTERNS = "YES"; + DEAD_CODE_STRIPPING = "NO"; + }; + PackageTypes = [ + "com.apple.package-type.mach-o-objfile" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.library.dynamic"; + Class = "PBXDynamicLibraryProductType"; + Name = "Dynamic Library"; + Description = "Dynamic library"; + IconNamePrefix = "TargetLibrary"; + DefaultTargetName = "Dynamic Library"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "mh_dylib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "dylib"; + PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; + PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; + INSTALL_PATH = "/homeless-shelter"; + DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + DYLIB_COMPATIBILITY_VERSION = "1"; + DYLIB_CURRENT_VERSION = "1"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.mach-o-dylib" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.library.static"; + Class = "PBXStaticLibraryProductType"; + Name = "Static Library"; + Description = "Static library"; + IconNamePrefix = "TargetLibrary"; + DefaultTargetName = "Static Library"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; + MACH_O_TYPE = "staticlib"; + REZ_EXECUTABLE = "YES"; + EXECUTABLE_PREFIX = "lib"; + EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; + EXECUTABLE_EXTENSION = "a"; + PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; + PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; + INSTALL_PATH = "/homeless-shelter"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "debugging"; + SEPARATE_STRIP = "YES"; + }; + AlwaysPerformSeparateStrip = "YES"; + PackageTypes = [ + "com.apple.package-type.static-library" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle"; + Class = "PBXBundleProductType"; + Name = "Bundle"; + Description = "Generic bundle"; + IconNamePrefix = "TargetPlugin"; + DefaultTargetName = "Bundle"; + DefaultBuildProperties = { + FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; + MACH_O_TYPE = "mh_bundle"; + WRAPPER_PREFIX = ""; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "bundle"; + WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; + FRAMEWORK_FLAG_PREFIX = "-framework"; + LIBRARY_FLAG_PREFIX = "-l"; + LIBRARY_FLAG_NOSPACE = "YES"; + STRIP_STYLE = "non-global"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.wrapper" + "com.apple.package-type.wrapper.shallow" + ]; + IsWrapper = "YES"; + HasInfoPlist = "YES"; + HasInfoPlistStrings = "YES"; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle.shallow"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXBundleProductType"; + Name = "Bundle (Shallow)"; + Description = "Bundle (Shallow)"; + PackageTypes = [ + "com.apple.package-type.wrapper.shallow" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.application"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXApplicationProductType"; + Name = "Application"; + Description = "Application"; + IconNamePrefix = "TargetApp"; + DefaultTargetName = "Application"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_execute"; + GCC_DYNAMIC_NO_PIC = "NO"; + GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "app"; + INSTALL_PATH = "$(LOCAL_APPS_DIR)"; + STRIP_STYLE = "all"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.wrapper.application" + ]; + CanEmbedAddressSanitizerLibraries = "YES"; + RunpathSearchPathForEmbeddedFrameworks = "@executable_path/../Frameworks"; + ValidateEmbeddedBinaries = "YES"; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.application.shallow"; + BasedOn = "com.apple.product-type.application"; + Class = "PBXApplicationProductType"; + Name = "Application (Shallow Bundle)"; + Description = "Application (Shallow Bundle)"; + PackageTypes = [ + "com.apple.package-type.wrapper.application.shallow" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXFrameworkProductType"; + Name = "Framework"; + Description = "Framework"; + IconNamePrefix = "TargetFramework"; + DefaultTargetName = "Framework"; + DefaultBuildProperties = { + MACH_O_TYPE = "mh_dylib"; + FRAMEWORK_VERSION = "A"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "framework"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; + LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; + STRIP_STYLE = "debugging"; + CODE_SIGNING_ALLOWED = "YES"; + }; + PackageTypes = [ + "com.apple.package-type.wrapper.framework" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework.shallow"; + BasedOn = "com.apple.product-type.framework"; + Class = "PBXFrameworkProductType"; + Name = "Framework (Shallow Bundle)"; + Description = "Framework (Shallow Bundle)"; + PackageTypes = [ + "com.apple.package-type.wrapper.framework.shallow" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.framework.static"; + BasedOn = "com.apple.product-type.framework"; + Class = "XCStaticFrameworkProductType"; + Name = "Static Framework"; + Description = "Static Framework"; + IconNamePrefix = "TargetFramework"; + DefaultTargetName = "Static Framework"; + DefaultBuildProperties = { + MACH_O_TYPE = "staticlib"; + FRAMEWORK_VERSION = "A"; + WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; + WRAPPER_EXTENSION = "framework"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + DYLIB_INSTALL_NAME_BASE = ""; + LD_DYLIB_INSTALL_NAME = ""; + SEPARATE_STRIP = "YES"; + GCC_INLINES_ARE_PRIVATE_EXTERN = "NO"; + CODE_SIGNING_ALLOWED = "NO"; + }; + AlwaysPerformSeparateStrip = "YES"; + PackageTypes = [ + "com.apple.package-type.wrapper.framework.static" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle.unit-test"; + BasedOn = "com.apple.product-type.bundle"; + Class = "PBXXCTestBundleProductType"; + Name = "Unit Test Bundle"; + Description = "Unit Test Bundle"; + DefaultBuildProperties = { + WRAPPER_EXTENSION = "xctest"; + PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; + PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; + TEST_FRAMEWORK_SEARCH_PATHS = [ + "$(inherited)" + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ]; + }; + PackageTypes = [ + "com.apple.package-type.bundle.unit-test" + ]; + } + { + Type = "ProductType"; + Identifier = "com.apple.product-type.bundle.ui-testing"; + BasedOn = "com.apple.product-type.bundle.unit-test"; + Class = "PBXXCTestBundleProductType"; + Name = "UI Testing Bundle"; + Description = "UI Testing Bundle"; + DefaultBuildProperties = { + WRAPPER_EXTENSION = "xctest"; + USES_XCTRUNNER = "YES"; + PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; + PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; + TEST_FRAMEWORK_SEARCH_PATHS = [ + "$(inherited)" + "$(PLATFORM_DIR)/Developer/Library/Frameworks" + ]; + }; + PackageTypes = [ + "com.apple.package-type.bundle.unit-test" + ]; + } + ]; + +in + +stdenv.mkDerivation { + name = "nixpkgs.platform"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/ + cd $out/ + + /usr/bin/plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} + /usr/bin/plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} + + mkdir -p $out/Developer/Library/Xcode/Specifications/ + /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} + /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + + mkdir -p $out/Developer/SDKs/ + cd $out/Developer/SDKs/ + ln -s ${sdk} + ''; +} diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix new file mode 100644 index 000000000000..11131fcd9cfa --- /dev/null +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -0,0 +1,31 @@ +{ stdenv, writeText, toolchainName, sdkName, xcbuild }: + +let + + SDKSettings = { + CanonicalName = sdkName; + DisplayName = sdkName; + Toolchains = [ toolchainName ]; + Version = "10.10"; + MaximumDeploymentTarget = "10.10"; + isBaseSDK = "YES"; + }; + + SystemVersion = { + ProductName = "Mac OS X"; + ProductVersion = "10.10"; + }; + +in + +stdenv.mkDerivation { + name = "nix.nixpkgs.sdk"; + buildInputs = [ xcbuild ]; + buildCommand = '' + mkdir -p $out/ + /usr/bin/plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} + + mkdir -p $out/System/Library/CoreServices/ + /usr/bin/plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} + ''; +} diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh new file mode 100644 index 000000000000..4a0f74b0e6df --- /dev/null +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -0,0 +1,17 @@ +xcbuildPhase() { + runHook preConfigure + + echo "running xcodebuild" + + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" + + runHook postConfigure +} + +if [ -z "$dontUseXcbuild" -a -z "$configurePhase" ]; then + configurePhase=xcbuildPhase +fi + +# if [ -d "*.xcodeproj" ]; then +# buildPhase=xcbuildPhase +# fi diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix new file mode 100644 index 000000000000..05fcd60c5873 --- /dev/null +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -0,0 +1,100 @@ +{stdenv, writeText, toolchainName, xcbuild +, cc, cctools, llvm, yacc, flex, m4, unifdef, bootstrap_cmds}: + +let + + ToolchainInfo = { + Identifier = toolchainName; + }; + +in + +stdenv.mkDerivation { + name = "nixpkgs.xctoolchain"; + buildInputs = [ xcbuild ]; + propagatedBuildInputs = [ cc cctools llvm ]; + buildCommand = '' + mkdir -p $out + /usr/bin/plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} + + mkdir -p $out/usr/include + mkdir -p $out/usr/lib + mkdir -p $out/usr/libexec + mkdir -p $out/usr/share + + mkdir -p $out/usr/bin + cd $out/usr/bin + ln -s ${cc}/bin/cpp + ln -s ${cc}/bin/c++ + ln -s ${cc}/bin/cc + ln -s cc clang + ln -s c++ clang++ + ln -s cc c89 + ln -s cc c99 + + ln -s ${cctools}/bin/ar + ln -s ${cctools}/bin/as + ln -s ${cctools}/bin/nm + ln -s ${cctools}/bin/nmedit + ln -s ${cctools}/bin/ld + ln -s ${cctools}/bin/libtool + ln -s ${cctools}/bin/strings + ln -s ${cctools}/bin/strip + ln -s ${cctools}/bin/install_name_tool + ln -s ${cctools}/bin/bitcode_strip + ln -s ${cctools}/bin/codesign_allocate + ln -s ${cctools}/bin/dsymutil + ln -s ${cctools}/bin/dyldinfo + ln -s ${cctools}/bin/otool + ln -s ${cctools}/bin/unwinddump + ln -s ${cctools}/bin/size + ln -s ${cctools}/bin/segedit + ln -s ${cctools}/bin/pagestuff + ln -s ${cctools}/bin/ranlib + ln -s ${cctools}/bin/redo_prebinding + + ln -s ${llvm}/bin/llvm-cov + ln -s ${llvm}/bin/llvm-dsymutil + ln -s ${llvm}/bin/llvm-dwarfdump + ln -s ${llvm}/bin/llvm-nm + ln -s ${llvm}/bin/llvm-objdump + ln -s ${llvm}/bin/llvm-otool + ln -s ${llvm}/bin/llvm-profdata + ln -s ${llvm}/bin/llvm-size + + ln -s ${yacc}/bin/yacc + ln -s ${yacc}/bin/bison + ln -s ${flex}/bin/flex + ln -s ${flex}/bin/flex++ + ln -s flex lex + ln -s ${m4}/bin/m4 + ln -s m4 gm4 + + ln -s ${unifdef}/bin/unifdef + ln -s ${unifdef}/bin/unifdefall + + ln -s ${bootstrap_cmds}/bin/mig + ''; +} + +# other commands in /bin/ +# asa +# cmpdylib +# ctags +# ctf_insert +# dwarfdump +# gcov +# gperf +# indent +# lipo +# lorder +# mkdep +# rebase +# rpcgen +# swift +# swift-compress +# swift-demangle +# swift-stdlib-tool +# swift-update +# swiftc +# what diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix new file mode 100644 index 000000000000..1b38c85ceb95 --- /dev/null +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -0,0 +1,64 @@ +{ stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics +, cctools, bootstrap_cmds}: + +let + + toolchainName = "com.apple.dt.toolchain.XcodeDefault"; + platformName = "com.apple.platform.macosx"; + sdkName = "macosx10.9"; + + xcbuild = callPackage ./default.nix { + inherit CoreServices ImageIO CoreGraphics; + }; + + toolchain = callPackage ./toolchain.nix { + inherit cctools bootstrap_cmds toolchainName xcbuild; + cc = stdenv.cc; + }; + + sdk = callPackage ./sdk.nix { + inherit toolchainName sdkName xcbuild; + }; + + platform = callPackage ./platform.nix { + inherit sdk platformName xcbuild; + }; + + developer = callPackage ./developer.nix { + inherit platform toolchain xcbuild; + }; + + xcconfig = writeText "nix.xcconfig" '' +SDKROOT=${sdkName} + ''; + +in + +stdenv.mkDerivation { + name = "xcbuild-wrapper"; + + buildInputs = [ xcbuild makeWrapper ]; + + setupHook = ./setup-hook.sh; + + phases = [ "installPhase" "fixupPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cd $out/bin/ + + for file in ${xcbuild}/bin/*; do + ln -s $file + done + + wrapProgram $out/bin/xcodebuild \ + --add-flags "-xcconfig ${xcconfig}" \ + --add-flags "DERIVED_DATA_DIR=." \ + --set DEVELOPER_DIR "${developer}" + wrapProgram $out/bin/xcrun \ + --add-flags "-sdk ${sdkName}" \ + --set DEVELOPER_DIR "${developer}" + ''; + + preferLocalBuild = true; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bbf962a45fd..11153d889d7e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6430,7 +6430,10 @@ in xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; - xcbuild = callPackage ../development/tools/xcbuild { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { + inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; + inherit (darwin) cctools bootstrap_cmds; + }; xmlindent = callPackage ../development/web/xmlindent {}; From 8e301fab5021a0b9d93934ea36183fd249b21f76 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 20 Oct 2016 03:17:24 -0500 Subject: [PATCH 047/107] adv_cmds: add xcode derivation --- .../apple-source-releases/adv_cmds/xcode.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix new file mode 100644 index 000000000000..ca041dfa4003 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, xcbuild, xpc }: + +stdenv.mkDerivation { + name = "adv_cmds"; + + src = fetchurl { + url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-163.tar.gz"; + sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; + }; + + patchPhase = '' + substituteInPlace pkill/pkill.c \ + --replace '#include ' "" + ''; + + buildInputs = [ xcbuild xpc ]; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11153d889d7e..5775d9c33b30 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17377,4 +17377,6 @@ in xulrunner = firefox-unwrapped; nitrokey-app = callPackage ../tools/security/nitrokey-app { }; + + adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; } From 44ad052c4329a6404ad7622b32797059d1db2819 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 2 Nov 2016 00:17:58 -0500 Subject: [PATCH 048/107] xcbuild: Make "xcbuild.raw" for original unwrapped --- pkgs/development/tools/xcbuild/wrapper.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 1b38c85ceb95..b8e270ea1fff 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -60,5 +60,9 @@ stdenv.mkDerivation { --set DEVELOPER_DIR "${developer}" ''; + passthru = { + raw = xcbuild; + }; + preferLocalBuild = true; } From ebf963ac6cf7b5661cbca21631787211f2bc828f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 5 Nov 2016 19:51:15 -0500 Subject: [PATCH 049/107] xcbuild: Update toolchain - Rework spec files. - Add more tool specs. - Add ctags. --- pkgs/development/tools/xcbuild/developer.nix | 145 ++++- pkgs/development/tools/xcbuild/platform.nix | 578 +------------------ pkgs/development/tools/xcbuild/sdk.nix | 4 +- pkgs/development/tools/xcbuild/toolchain.nix | 39 +- pkgs/development/tools/xcbuild/wrapper.nix | 9 +- pkgs/top-level/all-packages.nix | 6 +- 6 files changed, 170 insertions(+), 611 deletions(-) diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix index 993a5fb861a2..05e05def2ac2 100644 --- a/pkgs/development/tools/xcbuild/developer.nix +++ b/pkgs/development/tools/xcbuild/developer.nix @@ -1,15 +1,138 @@ -{stdenv, platform, toolchain, xcbuild, writeText}: +{ stdenv, platform, toolchain, xcbuild, writeText }: let -AbstractAssetCatalog = { - Type = "FileType"; - Identifier = "folder.abstractassetcatalog"; - BasedOn = "wrapper"; + Tools = [ + { + Identifier = "com.apple.build-tools.nmedit"; + Type = "Tool"; + Name = "Nmedit"; + } + { + Identifier = "com.apple.compilers.resource-copier"; + Type = "Tool"; + Name = "Resource Copier"; + } + { + Identifier = "com.apple.compilers.yacc"; + Type = "Tool"; + Name = "Yacc"; + InputFileTypes = [ "sourcecode.yacc" ]; + ExecDescription = "Yacc $(InputFile)"; + } + { + Identifier = "com.apple.compilers.lex"; + Type = "Tool"; + Name = "Lex"; + ExecDescription = "Lex $(InputFile)"; + InputFileTypes = [ "sourcecode.lex" ]; + } + ]; - UTI = "com.apple.dt.abstractassetcatalog"; - IsTransparent = "NO"; -}; + Architectures = [ + { + Identifier = "Standard"; + Type = "Architecture"; + Name = "Standard Architectures (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD"; + } + { + Identifier = "Universal"; + Type = "Architecture"; + Name = "Universal (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; + } + { + Identifier = "Native"; + Type = "Architecture"; + Name = "Native Architecture of Build Machine"; + ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; + } + { + Identifier = "Standard64bit"; + Type = "Architecture"; + Name = "64-bit Intel"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; + } + { + Identifier = "x86_64"; + Type = "Architecture"; + Name = "Intel 64-bit"; + } + { + Identifier = "Standard_Including_64_bit"; + Type = "Architecture"; + Name = "Standard Architectures (including 64-bit)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; + } + ]; + + PackageTypes = [ + { + Identifier = "com.apple.package-type.mach-o-executable"; + Type = "PackageType"; + Name = "Mach-O Executable"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-objfile"; + Type = "PackageType"; + Name = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-dylib"; + Type = "PackageType"; + Name = "Mach-O Dynamic Library"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + ]; + + ProductTypes = [ + { + Identifier = "com.apple.product-type.tool"; + Type = "ProductType"; + Name = "Command-line Tool"; + PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; + } + { + Identifier = "com.apple.product-type.objfile"; + Type = "ProductType"; + Name = "Object File"; + PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; + } + { + Identifier = "com.apple.product-type.library.dynamic"; + Type = "ProductType"; + Name = "Dynamic Library"; + PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + } + ]; in @@ -20,7 +143,11 @@ stdenv.mkDerivation { mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ - plutil -convert xml1 ${writeText "folder.abstractassetcatalog" (builtins.toJSON AbstractAssetCatalog)} -o $out/Contents/Developer/Library/Xcode/Specifications/folder.abstractassetcatalog.xcspec + cd $out/Contents/Developer/Library/Xcode/Specifications/ + plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} + plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} + plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} mkdir -p $out/Contents/Developer/Platforms/ cd $out/Contents/Developer/Platforms/ diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 692a673e5c9d..491f1d6309f8 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -11,576 +11,6 @@ let ProjectName = "OSXPlatformSupport"; }; - PackageTypes = [ - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-executable"; - Name = "Mach-O Executable"; - Description = "Mach-O executable"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.executable"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "YES"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-objfile"; - Name = "Mach-O Object File"; - Description = "Mach-O Object File"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.objfile"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-dylib"; - Name = "Mach-O Dynamic Library"; - Description = "Mach-O dynamic library"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.dylib"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.static-library"; - Name = "Mach-O Static Library"; - Description = "Mach-O static library"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = "lib"; - EXECUTABLE_SUFFIX = ".a"; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "archive.ar"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.mach-o-bundle"; - Name = "Mach-O Loadable"; - Description = "Mach-O loadable"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ".dylib"; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.bundle"; - Name = "$(EXECUTABLE_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper"; - Name = "Wrapper"; - Description = "Wrapper"; - DefaultBuildSettings = { - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".bundle"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)/Contents"; - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/MacOS"; - EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; - INFOPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/Info.plist"; - INFOSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; - PKGINFO_PATH = "$(CONTENTS_FOLDER_PATH)/PkgInfo"; - PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; - VERSIONPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/version.plist"; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; - EXECUTABLES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Executables"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; - SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; - SHARED_SUPPORT_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedSupport"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; - LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; - DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; - PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; - SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; - JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; - }; - ProductReference = { - FileType = "wrapper.cfbundle"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.shallow"; - BasedOn = "com.apple.package-type.wrapper"; - Name = "Wrapper (Shallow)"; - Description = "Shallow Wrapper"; - DefaultBuildSettings = { - CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; - EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - SHALLOW_BUNDLE = "YES"; - }; - ProductReference = { - FileType = "wrapper.cfbundle"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.application"; - BasedOn = "com.apple.package-type.wrapper"; - Name = "Application Wrapper"; - Description = "Application Wrapper"; - DefaultBuildSettings = { - GENERATE_PKGINFO_FILE = "YES"; - }; - ProductReference = { - FileType = "wrapper.application"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "YES"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.application.shallow"; - BasedOn = "com.apple.package-type.wrapper.shallow"; - Name = "Application Wrapper (Shallow)"; - Description = "Shallow Application Wrapper"; - DefaultBuildSettings = { - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - GENERATE_PKGINFO_FILE = "YES"; - SHALLOW_BUNDLE = "YES"; - }; - ProductReference = { - FileType = "wrapper.application"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "YES"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.framework"; - Name = "Framework Wrapper"; - Description = "Framework wrapper"; - DefaultBuildSettings = { - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".framework"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)/Versions"; - CONTENTS_FOLDER_PATH = "$(VERSIONS_FOLDER_PATH)/$(FRAMEWORK_VERSION)"; - CURRENT_VERSION = "Current"; - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - EXECUTABLE_PATH = "$(EXECUTABLE_FOLDER_PATH)/$(EXECUTABLE_NAME)"; - INFOPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Info.plist"; - INFOPLISTSTRINGS_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/InfoPlist.strings"; - PKGINFO_PATH = "$(WRAPPER_NAME)/PkgInfo"; - PBDEVELOPMENTPLIST_PATH = "$(CONTENTS_FOLDER_PATH)/pbdevelopment.plist"; - VERSIONPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/version.plist"; - PUBLIC_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Headers"; - PRIVATE_HEADERS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PrivateHeaders"; - EXECUTABLES_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)"; FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Frameworks"; - SHARED_FRAMEWORKS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/SharedFrameworks"; - SHARED_SUPPORT_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/Resources"; - LOCALIZED_RESOURCES_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/$(DEVELOPMENT_LANGUAGE).lproj"; - DOCUMENTATION_FOLDER_PATH = "$(LOCALIZED_RESOURCES_FOLDER_PATH)/Documentation"; - PLUGINS_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)/PlugIns"; - SCRIPTS_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Scripts"; - JAVA_FOLDER_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Java"; - CODESIGNING_FOLDER_PATH = "$(TARGET_BUILD_DIR)/$(CONTENTS_FOLDER_PATH)"; - }; - ProductReference = { - FileType = "wrapper.framework"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.framework.static"; - Name = "Mach-O Static Framework"; - Description = "Mach-O static framework"; - BasedOn = "com.apple.package-type.wrapper.framework"; - DefaultBuildSettings = { - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - }; - ProductReference = { - FileType = "wrapper.framework.static"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.wrapper.framework.shallow"; - Name = "Shallow Framework Wrapper"; - Description = "Shallow framework wrapper"; - BasedOn = "com.apple.package-type.wrapper.framework"; - DefaultBuildSettings = { - CONTENTS_FOLDER_PATH = "$(WRAPPER_NAME)"; - VERSIONS_FOLDER_PATH = "$(WRAPPER_NAME)"; - UNLOCALIZED_RESOURCES_FOLDER_PATH = "$(CONTENTS_FOLDER_PATH)"; - SHALLOW_BUNDLE = "YES"; - }; - ProductReference = { - FileType = "wrapper.framework"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - { - Type = "PackageType"; - Identifier = "com.apple.package-type.bundle.unit-test"; - BasedOn = "com.apple.package-type.wrapper"; - Name = "Unit Test Bundle"; - Description = "Unit Test Bundle"; - DefaultBuildSettings = { - WRAPPER_SUFFIX = "xctest"; - }; - ProductReference = { - FileType = "wrapper.cfbundle"; - Name = "$(WRAPPER_NAME)"; - IsLaunchable = "NO"; - }; - } - ]; - - ProductTypes = [ - { - Type = "ProductType"; - Identifier = "com.apple.product-type.tool"; - Class = "PBXToolProductType"; - Name = "Command-line Tool"; - Description = "Standalone command-line tool"; - IconNamePrefix = "TargetExecutable"; - DefaultTargetName = "Command-line Tool"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - EXECUTABLE_PREFIX = ""; - EXECUTABLE_SUFFIX = ""; - REZ_EXECUTABLE = "YES"; - INSTALL_PATH = "/homeless-shelter"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - GCC_DYNAMIC_NO_PIC = "NO"; - GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - STRIP_STYLE = "all"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.mach-o-executable" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.objfile"; - Class = "XCStandaloneExecutableProductType"; - Name = "Object File"; - Description = "Object File"; - IconNamePrefix = "TargetPlugin"; - DefaultTargetName = "Object File"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "mh_object"; - LINK_WITH_STANDARD_LIBRARIES = "NO"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "o"; - PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; - PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; - INSTALL_PATH = "/homeless-shelter"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - SKIP_INSTALL = "YES"; - STRIP_STYLE = "debugging"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - KEEP_PRIVATE_EXTERNS = "YES"; - DEAD_CODE_STRIPPING = "NO"; - }; - PackageTypes = [ - "com.apple.package-type.mach-o-objfile" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.library.dynamic"; - Class = "PBXDynamicLibraryProductType"; - Name = "Dynamic Library"; - Description = "Dynamic library"; - IconNamePrefix = "TargetLibrary"; - DefaultTargetName = "Dynamic Library"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "mh_dylib"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "dylib"; - PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; - PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; - INSTALL_PATH = "/homeless-shelter"; - DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; - LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; - DYLIB_COMPATIBILITY_VERSION = "1"; - DYLIB_CURRENT_VERSION = "1"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "debugging"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.mach-o-dylib" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.library.static"; - Class = "PBXStaticLibraryProductType"; - Name = "Static Library"; - Description = "Static library"; - IconNamePrefix = "TargetLibrary"; - DefaultTargetName = "Static Library"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(EXECUTABLE_NAME)"; - MACH_O_TYPE = "staticlib"; - REZ_EXECUTABLE = "YES"; - EXECUTABLE_PREFIX = "lib"; - EXECUTABLE_SUFFIX = ".$(EXECUTABLE_EXTENSION)"; - EXECUTABLE_EXTENSION = "a"; - PUBLIC_HEADERS_FOLDER_PATH = "/homeless-shelter"; - PRIVATE_HEADERS_FOLDER_PATH = "/homeless-shelter"; - INSTALL_PATH = "/homeless-shelter"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "debugging"; - SEPARATE_STRIP = "YES"; - }; - AlwaysPerformSeparateStrip = "YES"; - PackageTypes = [ - "com.apple.package-type.static-library" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle"; - Class = "PBXBundleProductType"; - Name = "Bundle"; - Description = "Generic bundle"; - IconNamePrefix = "TargetPlugin"; - DefaultTargetName = "Bundle"; - DefaultBuildProperties = { - FULL_PRODUCT_NAME = "$(WRAPPER_NAME)"; - MACH_O_TYPE = "mh_bundle"; - WRAPPER_PREFIX = ""; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "bundle"; - WRAPPER_NAME = "$(WRAPPER_PREFIX)$(PRODUCT_NAME)$(WRAPPER_SUFFIX)"; - FRAMEWORK_FLAG_PREFIX = "-framework"; - LIBRARY_FLAG_PREFIX = "-l"; - LIBRARY_FLAG_NOSPACE = "YES"; - STRIP_STYLE = "non-global"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.wrapper" - "com.apple.package-type.wrapper.shallow" - ]; - IsWrapper = "YES"; - HasInfoPlist = "YES"; - HasInfoPlistStrings = "YES"; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle.shallow"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXBundleProductType"; - Name = "Bundle (Shallow)"; - Description = "Bundle (Shallow)"; - PackageTypes = [ - "com.apple.package-type.wrapper.shallow" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.application"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXApplicationProductType"; - Name = "Application"; - Description = "Application"; - IconNamePrefix = "TargetApp"; - DefaultTargetName = "Application"; - DefaultBuildProperties = { - MACH_O_TYPE = "mh_execute"; - GCC_DYNAMIC_NO_PIC = "NO"; - GCC_SYMBOLS_PRIVATE_EXTERN = "YES"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "YES"; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "app"; - INSTALL_PATH = "$(LOCAL_APPS_DIR)"; - STRIP_STYLE = "all"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.wrapper.application" - ]; - CanEmbedAddressSanitizerLibraries = "YES"; - RunpathSearchPathForEmbeddedFrameworks = "@executable_path/../Frameworks"; - ValidateEmbeddedBinaries = "YES"; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.application.shallow"; - BasedOn = "com.apple.product-type.application"; - Class = "PBXApplicationProductType"; - Name = "Application (Shallow Bundle)"; - Description = "Application (Shallow Bundle)"; - PackageTypes = [ - "com.apple.package-type.wrapper.application.shallow" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.framework"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXFrameworkProductType"; - Name = "Framework"; - Description = "Framework"; - IconNamePrefix = "TargetFramework"; - DefaultTargetName = "Framework"; - DefaultBuildProperties = { - MACH_O_TYPE = "mh_dylib"; - FRAMEWORK_VERSION = "A"; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "framework"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - DYLIB_INSTALL_NAME_BASE = "$(INSTALL_PATH)"; - LD_DYLIB_INSTALL_NAME = "$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)"; - STRIP_STYLE = "debugging"; - CODE_SIGNING_ALLOWED = "YES"; - }; - PackageTypes = [ - "com.apple.package-type.wrapper.framework" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.framework.shallow"; - BasedOn = "com.apple.product-type.framework"; - Class = "PBXFrameworkProductType"; - Name = "Framework (Shallow Bundle)"; - Description = "Framework (Shallow Bundle)"; - PackageTypes = [ - "com.apple.package-type.wrapper.framework.shallow" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.framework.static"; - BasedOn = "com.apple.product-type.framework"; - Class = "XCStaticFrameworkProductType"; - Name = "Static Framework"; - Description = "Static Framework"; - IconNamePrefix = "TargetFramework"; - DefaultTargetName = "Static Framework"; - DefaultBuildProperties = { - MACH_O_TYPE = "staticlib"; - FRAMEWORK_VERSION = "A"; - WRAPPER_SUFFIX = ".$(WRAPPER_EXTENSION)"; - WRAPPER_EXTENSION = "framework"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - DYLIB_INSTALL_NAME_BASE = ""; - LD_DYLIB_INSTALL_NAME = ""; - SEPARATE_STRIP = "YES"; - GCC_INLINES_ARE_PRIVATE_EXTERN = "NO"; - CODE_SIGNING_ALLOWED = "NO"; - }; - AlwaysPerformSeparateStrip = "YES"; - PackageTypes = [ - "com.apple.package-type.wrapper.framework.static" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle.unit-test"; - BasedOn = "com.apple.product-type.bundle"; - Class = "PBXXCTestBundleProductType"; - Name = "Unit Test Bundle"; - Description = "Unit Test Bundle"; - DefaultBuildProperties = { - WRAPPER_EXTENSION = "xctest"; - PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; - PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; - TEST_FRAMEWORK_SEARCH_PATHS = [ - "$(inherited)" - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ]; - }; - PackageTypes = [ - "com.apple.package-type.bundle.unit-test" - ]; - } - { - Type = "ProductType"; - Identifier = "com.apple.product-type.bundle.ui-testing"; - BasedOn = "com.apple.product-type.bundle.unit-test"; - Class = "PBXXCTestBundleProductType"; - Name = "UI Testing Bundle"; - Description = "UI Testing Bundle"; - DefaultBuildProperties = { - WRAPPER_EXTENSION = "xctest"; - USES_XCTRUNNER = "YES"; - PRODUCT_SPECIFIC_LDFLAGS = "-framework XCTest"; - PRODUCT_TYPE_FRAMEWORK_SEARCH_PATHS = "$(TEST_FRAMEWORK_SEARCH_PATHS)"; - TEST_FRAMEWORK_SEARCH_PATHS = [ - "$(inherited)" - "$(PLATFORM_DIR)/Developer/Library/Frameworks" - ]; - }; - PackageTypes = [ - "com.apple.package-type.bundle.unit-test" - ]; - } - ]; - in stdenv.mkDerivation { @@ -590,12 +20,8 @@ stdenv.mkDerivation { mkdir -p $out/ cd $out/ - /usr/bin/plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} - /usr/bin/plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} - - mkdir -p $out/Developer/Library/Xcode/Specifications/ - /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} - /usr/bin/plutil -convert xml1 -o $out/Developer/Library/Xcode/Specifications/PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} + plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} mkdir -p $out/Developer/SDKs/ cd $out/Developer/SDKs/ diff --git a/pkgs/development/tools/xcbuild/sdk.nix b/pkgs/development/tools/xcbuild/sdk.nix index 11131fcd9cfa..7d587249bf8e 100644 --- a/pkgs/development/tools/xcbuild/sdk.nix +++ b/pkgs/development/tools/xcbuild/sdk.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation { buildInputs = [ xcbuild ]; buildCommand = '' mkdir -p $out/ - /usr/bin/plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} + plutil -convert xml1 -o $out/SDKSettings.plist ${writeText "SDKSettings.json" (builtins.toJSON SDKSettings)} mkdir -p $out/System/Library/CoreServices/ - /usr/bin/plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} + plutil -convert xml1 -o $out/System/Library/CoreServices/SystemVersion.plist ${writeText "SystemVersion.plist" (builtins.toJSON SystemVersion)} ''; } diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index 05fcd60c5873..e86536c45983 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,5 +1,6 @@ {stdenv, writeText, toolchainName, xcbuild -, cc, cctools, llvm, yacc, flex, m4, unifdef, bootstrap_cmds}: +, cc, llvm, cctools, gcc, bootstrap_cmds, binutils +, yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: let @@ -11,11 +12,11 @@ in stdenv.mkDerivation { name = "nixpkgs.xctoolchain"; - buildInputs = [ xcbuild ]; - propagatedBuildInputs = [ cc cctools llvm ]; + buildInputs = [ xcbuild makeWrapper ]; + propagatedBuildInputs = [ cc cctools llvm gcc bootstrap_cmds binutils yacc flex m4 unifdef gperf indent ]; buildCommand = '' mkdir -p $out - /usr/bin/plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} + plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} mkdir -p $out/usr/include mkdir -p $out/usr/lib @@ -27,10 +28,8 @@ stdenv.mkDerivation { ln -s ${cc}/bin/cpp ln -s ${cc}/bin/c++ ln -s ${cc}/bin/cc - ln -s cc clang ln -s c++ clang++ - ln -s cc c89 - ln -s cc c99 + ln -s cc clang ln -s ${cctools}/bin/ar ln -s ${cctools}/bin/as @@ -66,7 +65,9 @@ stdenv.mkDerivation { ln -s ${yacc}/bin/bison ln -s ${flex}/bin/flex ln -s ${flex}/bin/flex++ + ln -s flex lex + ln -s ${m4}/bin/m4 ln -s m4 gm4 @@ -74,27 +75,31 @@ stdenv.mkDerivation { ln -s ${unifdef}/bin/unifdefall ln -s ${bootstrap_cmds}/bin/mig + + ln -s ${gperf}/bin/gperf + ln -s ${gcc}/bin/gcov + ln -s ${gcc}/bin/mkdep + ln -s ${indent}/bin/indent + ln -s ${binutils}/bin/lipo + ln -s ${ctags}/bin/ctags ''; } # other commands in /bin/ # asa -# cmpdylib -# ctags -# ctf_insert +# cmpdylib (in cctools) +# ctf_insert (in cctools) # dwarfdump -# gcov -# gperf -# indent -# lipo # lorder -# mkdep # rebase -# rpcgen +# rpcgen (in developer_cmds) +# what + + +# swift: see #11463 # swift # swift-compress # swift-demangle # swift-stdlib-tool # swift-update # swiftc -# what diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index b8e270ea1fff..ef4ab245ec0c 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -1,19 +1,18 @@ { stdenv, callPackage, makeWrapper, writeText, CoreServices, ImageIO, CoreGraphics -, cctools, bootstrap_cmds}: +, cctools, bootstrap_cmds, binutils}: let toolchainName = "com.apple.dt.toolchain.XcodeDefault"; platformName = "com.apple.platform.macosx"; - sdkName = "macosx10.9"; + sdkName = "macosx10.10"; xcbuild = callPackage ./default.nix { inherit CoreServices ImageIO CoreGraphics; }; toolchain = callPackage ./toolchain.nix { - inherit cctools bootstrap_cmds toolchainName xcbuild; - cc = stdenv.cc; + inherit cctools bootstrap_cmds toolchainName xcbuild binutils; }; sdk = callPackage ./sdk.nix { @@ -29,7 +28,7 @@ let }; xcconfig = writeText "nix.xcconfig" '' -SDKROOT=${sdkName} + SDKROOT=${sdkName} ''; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5775d9c33b30..bf91489c8927 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6432,7 +6432,7 @@ in xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; - inherit (darwin) cctools bootstrap_cmds; + inherit (darwin) cctools bootstrap_cmds binutils; }; xmlindent = callPackage ../development/web/xmlindent {}; @@ -17378,5 +17378,7 @@ in nitrokey-app = callPackage ../tools/security/nitrokey-app { }; - adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; + adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix { + inherit (darwin.apple_sdk.libs) xpc; + }; } From 6c1858a93dee8c28f5f7f804f4153d8f9c6c7bb8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 16:09:10 -0600 Subject: [PATCH 050/107] adv_cmds: Disable pkill. pkill isn't building because of some missing headers: - xpc/xpc.h - os/base_private.h - _simple.h They are all available somewhere but not set up correctly in the Darwin stdenv. TODO: add pkill back in! --- .../darwin/apple-source-releases/adv_cmds/xcode.nix | 9 +++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index ca041dfa4003..f9e8207d8bfa 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xcbuild, xpc }: +{ stdenv, fetchurl, xcbuild, libcxx }: stdenv.mkDerivation { name = "adv_cmds"; @@ -9,11 +9,12 @@ stdenv.mkDerivation { }; patchPhase = '' - substituteInPlace pkill/pkill.c \ - --replace '#include ' "" + substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ + --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" ''; - buildInputs = [ xcbuild xpc ]; + buildInputs = [ xcbuild libcxx ]; + #NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = { platforms = stdenv.lib.platforms.darwin; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf91489c8927..ddee4d24e2b9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17378,7 +17378,5 @@ in nitrokey-app = callPackage ../tools/security/nitrokey-app { }; - adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix { - inherit (darwin.apple_sdk.libs) xpc; - }; + adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; } From f1897116d04d99a4491ef3a8db6acf54dd0035c6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 17:43:20 -0600 Subject: [PATCH 051/107] xcbuild: temporarily fix cflags/ldflags This gets everything to build. adv_cmds: remove NIX_LDFLAGS - unneeded --- pkgs/development/tools/xcbuild/setup-hook.sh | 2 +- .../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 4a0f74b0e6df..72ffb7b128c5 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -3,7 +3,7 @@ xcbuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" + xcodebuild runHook postConfigure } diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index f9e8207d8bfa..e5600f3962da 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { ''; buildInputs = [ xcbuild libcxx ]; - #NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = { platforms = stdenv.lib.platforms.darwin; From 78c3acc2eee5510dfdebcab4e62b32a7f43930c4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 19:57:42 -0600 Subject: [PATCH 052/107] xcbuild: Add install phase This phase is disabled for now but we can use it later. --- pkgs/development/tools/xcbuild/setup-hook.sh | 24 +++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 72ffb7b128c5..0d38e2466b0d 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -1,15 +1,27 @@ -xcbuildPhase() { - runHook preConfigure +xcbuildBuildPhase() { + export DSTROOT=$out + + runHook preBuild echo "running xcodebuild" - xcodebuild + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build - runHook postConfigure + runHook postBuild } -if [ -z "$dontUseXcbuild" -a -z "$configurePhase" ]; then - configurePhase=xcbuildPhase +xcbuildInstallPhase () { + runHook preInstall + + # not implemented + # xcodebuild install + + runHook postInstall +} + +if [ -z "$dontUseXcbuild" ]; then + buildPhase=xcbuildBuildPhase + installPhase=xcbuildInstallPhase fi # if [ -d "*.xcodeproj" ]; then From 1ee8685ee73b8867810e9a309d106019f11be0f7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 7 Nov 2016 21:55:31 -0600 Subject: [PATCH 053/107] adv_cmds: add custom install phase --- pkgs/development/tools/xcbuild/setup-hook.sh | 4 +++- .../darwin/apple-source-releases/adv_cmds/xcode.nix | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index 0d38e2466b0d..b0ae8dd6e8e2 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -21,7 +21,9 @@ xcbuildInstallPhase () { if [ -z "$dontUseXcbuild" ]; then buildPhase=xcbuildBuildPhase - installPhase=xcbuildInstallPhase + if [ -z "$installPhase" ]; then + installPhase=xcbuildInstallPhase + fi fi # if [ -d "*.xcodeproj" ]; then diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index e5600f3962da..7857a59161c0 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -8,12 +8,25 @@ stdenv.mkDerivation { sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; }; + # remove pkill from build patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" ''; + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + + for cmd in cap_mkdb finger fingerd gencat last locale lsvfs ps stty tabs tty whois + do + install adv_cmds-*/Build/Products/Release-*/$cmd $out/bin/$cmd + done + ''; + buildInputs = [ xcbuild libcxx ]; + + # temporary fix for iostream issue NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; meta = { From a35b330f30d0138ff5e4a86c7afdcc7c7e311fea Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:24:59 -0600 Subject: [PATCH 054/107] adv_cmds: move from all-packages Use the old way with pkgs/os-specific/darwin/apple-source-releases/defuault.nix. --- .../apple-source-releases/adv_cmds/xcode.nix | 27 ++++++++++--------- .../darwin/apple-source-releases/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 7857a59161c0..15160e02e149 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,14 +1,7 @@ -{ stdenv, fetchurl, xcbuild, libcxx }: +{ stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: -stdenv.mkDerivation { - name = "adv_cmds"; - - src = fetchurl { - url = "https://opensource.apple.com/tarballs/adv_cmds/adv_cmds-163.tar.gz"; - sha256 = "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q"; - }; - - # remove pkill from build +appleDerivation { + # disable pkill from build patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" @@ -17,11 +10,19 @@ stdenv.mkDerivation { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ + install adv_cmds-*/Build/Products/Release-*/* $out/bin/ - for cmd in cap_mkdb finger fingerd gencat last locale lsvfs ps stty tabs tty whois - do - install adv_cmds-*/Build/Products/Release-*/$cmd $out/bin/$cmd + for n in 1 8; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n done + + mkdir -p $out/System/Library/LaunchDaemons + install fingerd/finger.plist $out/System/Library/LaunchDaemons + + # from variant_links.sh + # ln -s $out/bin/pkill $out/bin/pgrep + # ln -s $out/share/man/man1/pkill.1 $out/share/man/man1/pgrep.1 ''; buildInputs = [ xcbuild libcxx ]; diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 2ebb8868a2ea..2f49330ed595 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -33,6 +33,7 @@ let libutil = "43"; libunwind = "35.3"; + adv_cmds = "163"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ @@ -213,6 +214,7 @@ let removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddee4d24e2b9..b1273fc469b6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17377,6 +17377,4 @@ in xulrunner = firefox-unwrapped; nitrokey-app = callPackage ../tools/security/nitrokey-app { }; - - adv_cmds = callPackage ../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix {}; } From ec409c8e9698e5be7c1d3635bc0a547e6564bc36 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 12:01:49 -0600 Subject: [PATCH 055/107] contacts: use xcbuild instead of xcodebuild --- pkgs/tools/misc/contacts/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 2bfe0eb42665..bd52f1bc0a49 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, xcbuild, Foundation, AddressBook }: stdenv.mkDerivation rec { version = "1.1a-3"; @@ -9,15 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0wdqc1ndgrdhqapvvgx5xihc750szv08lp91x4l6n0gh59cpxpg3"; }; - preBuild = '' - substituteInPlace Makefile --replace "xcodebuild" "/usr/bin/xcodebuild" - ''; + buildInputs = [ xcbuild Foundation AddressBook ]; installPhase = '' mkdir -p $out/bin - cp ./build/Deployment/contacts $out/bin + cp ./contacts-*/Build/Products/Default-*/contacts $out/bin ''; + NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; + meta = with stdenv.lib; { description = "Access contacts from the Mac address book from command-line"; homepage = http://www.gnufoo.org/contacts/contacts.html; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1273fc469b6..4f2a1d837952 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -760,7 +760,9 @@ in cpulimit = callPackage ../tools/misc/cpulimit { }; - contacts = callPackage ../tools/misc/contacts { }; + contacts = callPackage ../tools/misc/contacts { + inherit (darwin.apple_sdk.frameworks) Foundation AddressBook; + }; coturn = callPackage ../servers/coturn { }; From 4a01a370514796936929d65f6497fdc0326de496 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 13:08:09 -0600 Subject: [PATCH 056/107] basic_cmds: init at 55 --- .../basic_cmds/default.nix | 22 +++++++++++++++++++ .../darwin/apple-source-releases/default.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix new file mode 100644 index 000000000000..6f0ea955cf0a --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -0,0 +1,22 @@ +{ stdenv, appleDerivation, fetchurl, xcbuild }: + +appleDerivation rec { + buildInputs = [ xcbuild ]; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install basic_cmds-*/Build/Products/Release-*/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 2f49330ed595..8aa0a6d675f7 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -33,6 +33,7 @@ let libutil = "43"; libunwind = "35.3"; + basic_cmds = "55"; adv_cmds = "163"; }; "osx-10.11.5" = { @@ -215,6 +216,7 @@ let Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; + basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; From 823772b0569681284957177f4a442aef5f7e737a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:28:37 -0600 Subject: [PATCH 057/107] Librpcsvc: init at 26 --- .../Librpcsvc/default.nix | 25 +++++++++++++++++++ .../darwin/apple-source-releases/default.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix new file mode 100644 index 000000000000..b20687b41593 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, appleDerivation, developer_cmds }: + +appleDerivation rec { + phases = [ "unpackPhase" "installPhase" ]; + + buildInputs = [ developer_cmds ]; + + installPhase = '' + export DSTROOT=$out + export SRCROOT=$PWD + export OBJROOT=$PWD + + . ./xcodescripts/install_rpcsvc.sh + + mv $out/usr/* $out + rmdir $out/usr/ + ''; + + meta = with stdenv.lib; { + description = ""; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.darwin; + license = licenses.apsl20; + }; +} diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 8aa0a6d675f7..180a6f90283e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -33,6 +33,7 @@ let libutil = "43"; libunwind = "35.3"; + Librpcsvc = "26"; basic_cmds = "55"; adv_cmds = "163"; }; @@ -215,6 +216,7 @@ let removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; + Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; From 3b17d9e35e04885859d27024c75954d212a40b8a Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:29:57 -0600 Subject: [PATCH 058/107] developer_cmds: init at 62 --- .../darwin/apple-source-releases/default.nix | 2 ++ .../developer_cmds/default.nix | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 180a6f90283e..232c473ecb07 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -34,6 +34,7 @@ let libutil = "43"; libunwind = "35.3"; Librpcsvc = "26"; + developer_cmds= "62"; basic_cmds = "55"; adv_cmds = "163"; }; @@ -219,6 +220,7 @@ let Librpcsvc = applePackage "Librpcsvc" "osx-10.11.6" "1zwfwcl9irxl1dlnf2b4v30vdybp0p0r6n6g1pd14zbdci1jcg2k" {}; adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; + developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix new file mode 100644 index 000000000000..b58951423fec --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, appleDerivation, xcbuild }: + +appleDerivation rec { + buildInputs = [ xcbuild ]; + + patchPhase = '' + substituteInPlace rpcgen/rpc_main.c \ + --replace "/usr/bin/cpp" "${stdenv.cc}/bin/cpp" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install developer_cmds-*/Build/Products/Release-*/* $out/bin/ + + for n in 1; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From 9f46587841448decbb1ec8e46076e36838f82c93 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 22:30:32 -0600 Subject: [PATCH 059/107] network_cmds: init at 481.20.1 Fixes #16764 --- .../darwin/apple-source-releases/default.nix | 2 + .../network_cmds/default.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index 232c473ecb07..af17babac56a 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -35,6 +35,7 @@ let libunwind = "35.3"; Librpcsvc = "26"; developer_cmds= "62"; + network_cmds = "481.20.1"; basic_cmds = "55"; adv_cmds = "163"; }; @@ -221,6 +222,7 @@ let adv_cmds = applePackage "adv_cmds/xcode.nix" "osx-10.11.6" "12gbv35i09aij9g90p6b3x2f3ramw43qcb2gjrg8lzkzmwvcyw9q" {}; basic_cmds = applePackage "basic_cmds" "osx-10.11.6" "0hvab4b1v5q2x134hdkal0rmz5gsdqyki1vb0dbw4py1bqf0yaw9" {}; developer_cmds = applePackage "developer_cmds" "osx-10.11.6" "1r9c2b6dcl22diqf90x58psvz797d3lxh4r2wppr7lldgbgn24di" {}; + network_cmds = applePackage "network_cmds" "osx-10.11.6" "0lhi9wz84qr1r2ab3fb4nvmdg9gxn817n5ldg7zw9gnf3wwn42kw" {}; libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix new file mode 100644 index 000000000000..fe4d60e7ebe9 --- /dev/null +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -0,0 +1,39 @@ +{ stdenv, appleDerivation, xcbuild, openssl, Librpcsvc, xnu, libpcap, developer_cmds }: + +appleDerivation rec { + buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ]; + + NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6"; + + patchPhase = '' + # disable spray, rtadvd + substituteInPlace network_cmds.xcodeproj/project.pbxproj \ + --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \ + --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" + ''; + + # temporary install phase until xcodebuild has "install" support + installPhase = '' + mkdir -p $out/bin/ + install network_cmds-*/Build/Products/Release-*/* $out/bin/ + + for n in 1 5; do + mkdir -p $out/share/man/man$n + install */*.$n $out/share/man/man$n + done + + mkdir -p $out/etc/ + install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/ + + mkdir -p $out/local/OpenSourceVersions/ + install network_cmds.plist $out/local/OpenSourceVersions/ + + mkdir -p $out/System/Library/LaunchDaemons + install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons + ''; + + meta = { + platforms = stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ matthewbauer ]; + }; +} From 25485ece2a3568fd84291ce4d600199c53754619 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 9 Nov 2016 23:07:24 -0600 Subject: [PATCH 060/107] xcbuild: add name to platform.nix --- pkgs/development/tools/xcbuild/platform.nix | 1 + .../os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix | 2 +- .../darwin/apple-source-releases/basic_cmds/default.nix | 2 +- .../darwin/apple-source-releases/developer_cmds/default.nix | 2 +- .../darwin/apple-source-releases/network_cmds/default.nix | 2 +- pkgs/tools/misc/contacts/default.nix | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index 491f1d6309f8..eea8ea5f9ebd 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -5,6 +5,7 @@ let Info = { CFBundleIdentifier = platformName; Type = "Platform"; + Name = "macosx"; }; Version = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 15160e02e149..7a8fdde69feb 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -10,7 +10,7 @@ appleDerivation { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install adv_cmds-*/Build/Products/Release-*/* $out/bin/ + install adv_cmds-*/Build/Products/Release/* $out/bin/ for n in 1 8; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 6f0ea955cf0a..07a13966efe6 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -6,7 +6,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install basic_cmds-*/Build/Products/Release-*/* $out/bin/ + install basic_cmds-*/Build/Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix index b58951423fec..67fbf83496ed 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/developer_cmds/default.nix @@ -11,7 +11,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install developer_cmds-*/Build/Products/Release-*/* $out/bin/ + install developer_cmds-*/Build/Products/Release/* $out/bin/ for n in 1; do mkdir -p $out/share/man/man$n diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index fe4d60e7ebe9..090a9d05fb87 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -15,7 +15,7 @@ appleDerivation rec { # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ - install network_cmds-*/Build/Products/Release-*/* $out/bin/ + install network_cmds-*/Build/Products/Release/* $out/bin/ for n in 1 5; do mkdir -p $out/share/man/man$n diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index bd52f1bc0a49..5c91332463f0 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp ./contacts-*/Build/Products/Default-*/contacts $out/bin + cp ./contacts-*/Build/Products/Default/contacts $out/bin ''; NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; From 0b6bfa49d5b6c70ee2844c292044c35a39fabf96 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Nov 2016 02:20:12 -0600 Subject: [PATCH 061/107] xcbuild: Move extra specs to platform --- pkgs/development/tools/xcbuild/developer.nix | 142 ------------------- pkgs/development/tools/xcbuild/platform.nix | 139 ++++++++++++++++++ 2 files changed, 139 insertions(+), 142 deletions(-) diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix index 05e05def2ac2..826571238de4 100644 --- a/pkgs/development/tools/xcbuild/developer.nix +++ b/pkgs/development/tools/xcbuild/developer.nix @@ -1,141 +1,5 @@ { stdenv, platform, toolchain, xcbuild, writeText }: -let - - Tools = [ - { - Identifier = "com.apple.build-tools.nmedit"; - Type = "Tool"; - Name = "Nmedit"; - } - { - Identifier = "com.apple.compilers.resource-copier"; - Type = "Tool"; - Name = "Resource Copier"; - } - { - Identifier = "com.apple.compilers.yacc"; - Type = "Tool"; - Name = "Yacc"; - InputFileTypes = [ "sourcecode.yacc" ]; - ExecDescription = "Yacc $(InputFile)"; - } - { - Identifier = "com.apple.compilers.lex"; - Type = "Tool"; - Name = "Lex"; - ExecDescription = "Lex $(InputFile)"; - InputFileTypes = [ "sourcecode.lex" ]; - } - ]; - - Architectures = [ - { - Identifier = "Standard"; - Type = "Architecture"; - Name = "Standard Architectures (64-bit Intel)"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD"; - } - { - Identifier = "Universal"; - Type = "Architecture"; - Name = "Universal (64-bit Intel)"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; - } - { - Identifier = "Native"; - Type = "Architecture"; - Name = "Native Architecture of Build Machine"; - ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; - } - { - Identifier = "Standard64bit"; - Type = "Architecture"; - Name = "64-bit Intel"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; - } - { - Identifier = "x86_64"; - Type = "Architecture"; - Name = "Intel 64-bit"; - } - { - Identifier = "Standard_Including_64_bit"; - Type = "Architecture"; - Name = "Standard Architectures (including 64-bit)"; - RealArchitectures = [ "x86_64" ]; - ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; - } - ]; - - PackageTypes = [ - { - Identifier = "com.apple.package-type.mach-o-executable"; - Type = "PackageType"; - Name = "Mach-O Executable"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.executable"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - { - Identifier = "com.apple.package-type.mach-o-objfile"; - Type = "PackageType"; - Name = "Mach-O Object File"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.objfile"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - { - Identifier = "com.apple.package-type.mach-o-dylib"; - Type = "PackageType"; - Name = "Mach-O Dynamic Library"; - DefaultBuildSettings = { - EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; - EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; - }; - ProductReference = { - FileType = "compiled.mach-o.dylib"; - Name = "$(EXECUTABLE_NAME)"; - }; - } - ]; - - ProductTypes = [ - { - Identifier = "com.apple.product-type.tool"; - Type = "ProductType"; - Name = "Command-line Tool"; - PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; - } - { - Identifier = "com.apple.product-type.objfile"; - Type = "ProductType"; - Name = "Object File"; - PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; - } - { - Identifier = "com.apple.product-type.library.dynamic"; - Type = "ProductType"; - Name = "Dynamic Library"; - PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; - } - ]; - -in - stdenv.mkDerivation { name = "Xcode.app"; buildInputs = [ xcbuild ]; @@ -143,12 +7,6 @@ stdenv.mkDerivation { mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ - cd $out/Contents/Developer/Library/Xcode/Specifications/ - plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} - plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} - plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} - plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} - mkdir -p $out/Contents/Developer/Platforms/ cd $out/Contents/Developer/Platforms/ ln -s ${platform} diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index eea8ea5f9ebd..c54f7f83e0ee 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -12,6 +12,138 @@ let ProjectName = "OSXPlatformSupport"; }; + Tools = [ + { + Identifier = "com.apple.build-tools.nmedit"; + Type = "Tool"; + Name = "Nmedit"; + } + { + Identifier = "com.apple.compilers.resource-copier"; + Type = "Tool"; + Name = "Resource Copier"; + } + { + Identifier = "com.apple.compilers.yacc"; + Type = "Tool"; + Name = "Yacc"; + InputFileTypes = [ "sourcecode.yacc" ]; + ExecDescription = "Yacc $(InputFile)"; + } + { + Identifier = "com.apple.compilers.lex"; + Type = "Tool"; + Name = "Lex"; + ExecDescription = "Lex $(InputFile)"; + InputFileTypes = [ "sourcecode.lex" ]; + } + ]; + + Architectures = [ + { + Identifier = "Standard"; + Type = "Architecture"; + Name = "Standard Architectures (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD"; + } + { + Identifier = "Universal"; + Type = "Architecture"; + Name = "Universal (64-bit Intel)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; + } + { + Identifier = "Native"; + Type = "Architecture"; + Name = "Native Architecture of Build Machine"; + ArchitectureSetting = "NATIVE_ARCH_ACTUAL"; + } + { + Identifier = "Standard64bit"; + Type = "Architecture"; + Name = "64-bit Intel"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; + } + { + Identifier = "x86_64"; + Type = "Architecture"; + Name = "Intel 64-bit"; + } + { + Identifier = "Standard_Including_64_bit"; + Type = "Architecture"; + Name = "Standard Architectures (including 64-bit)"; + RealArchitectures = [ "x86_64" ]; + ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; + } + ]; + + PackageTypes = [ + { + Identifier = "com.apple.package-type.mach-o-executable"; + Type = "PackageType"; + Name = "Mach-O Executable"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.executable"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-objfile"; + Type = "PackageType"; + Name = "Mach-O Object File"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.objfile"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + { + Identifier = "com.apple.package-type.mach-o-dylib"; + Type = "PackageType"; + Name = "Mach-O Dynamic Library"; + DefaultBuildSettings = { + EXECUTABLE_NAME = "$(EXECUTABLE_PREFIX)$(PRODUCT_NAME)$(EXECUTABLE_VARIANT_SUFFIX)$(EXECUTABLE_SUFFIX)"; + EXECUTABLE_PATH = "$(EXECUTABLE_NAME)"; + }; + ProductReference = { + FileType = "compiled.mach-o.dylib"; + Name = "$(EXECUTABLE_NAME)"; + }; + } + ]; + + ProductTypes = [ + { + Identifier = "com.apple.product-type.tool"; + Type = "ProductType"; + Name = "Command-line Tool"; + PackageTypes = [ "com.apple.package-type.mach-o-executable" ]; + } + { + Identifier = "com.apple.product-type.objfile"; + Type = "ProductType"; + Name = "Object File"; + PackageTypes = [ "com.apple.package-type.mach-o-objfile" ]; + } + { + Identifier = "com.apple.product-type.library.dynamic"; + Type = "ProductType"; + Name = "Dynamic Library"; + PackageTypes = [ "com.apple.package-type.mach-o-dylib" ]; + } + ]; + in stdenv.mkDerivation { @@ -24,6 +156,13 @@ stdenv.mkDerivation { plutil -convert xml1 -o Info.plist ${writeText "Info.plist" (builtins.toJSON Info)} plutil -convert xml1 -o version.plist ${writeText "version.plist" (builtins.toJSON Version)} + mkdir -p $out/Developer/Library/Xcode/Specifications/ + cd $out/Developer/Library/Xcode/Specifications/ + plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} + plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} + plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} + plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} + mkdir -p $out/Developer/SDKs/ cd $out/Developer/SDKs/ ln -s ${sdk} From 437bdc5e4bc29baaaa3991e260e5ee40de8f3fa0 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Nov 2016 14:53:28 -0600 Subject: [PATCH 062/107] xcbuild: fix toolchain on Linux --- pkgs/development/tools/xcbuild/toolchain.nix | 62 +++++++++++--------- pkgs/development/tools/xcbuild/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 1 + 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/pkgs/development/tools/xcbuild/toolchain.nix b/pkgs/development/tools/xcbuild/toolchain.nix index e86536c45983..386f67a9d631 100644 --- a/pkgs/development/tools/xcbuild/toolchain.nix +++ b/pkgs/development/tools/xcbuild/toolchain.nix @@ -1,5 +1,5 @@ {stdenv, writeText, toolchainName, xcbuild -, cc, llvm, cctools, gcc, bootstrap_cmds, binutils +, llvm, cctools, gcc, bootstrap_cmds, binutils , yacc, flex, m4, unifdef, gperf, indent, ctags, makeWrapper}: let @@ -13,7 +13,11 @@ in stdenv.mkDerivation { name = "nixpkgs.xctoolchain"; buildInputs = [ xcbuild makeWrapper ]; - propagatedBuildInputs = [ cc cctools llvm gcc bootstrap_cmds binutils yacc flex m4 unifdef gperf indent ]; + + propagatedBuildInputs = [ llvm gcc yacc flex m4 unifdef gperf indent ] + ++ stdenv.lib.optionals stdenv.isDarwin [ cctools bootstrap_cmds binutils ]; + ## cctools should build on Linux but it doesn't currentl + buildCommand = '' mkdir -p $out plutil -convert xml1 -o $out/ToolchainInfo.plist ${writeText "ToolchainInfo.plist" (builtins.toJSON ToolchainInfo)} @@ -25,33 +29,12 @@ stdenv.mkDerivation { mkdir -p $out/usr/bin cd $out/usr/bin - ln -s ${cc}/bin/cpp - ln -s ${cc}/bin/c++ - ln -s ${cc}/bin/cc + ln -s ${stdenv.cc}/bin/cpp + ln -s ${stdenv.cc}/bin/c++ + ln -s ${stdenv.cc}/bin/cc ln -s c++ clang++ ln -s cc clang - ln -s ${cctools}/bin/ar - ln -s ${cctools}/bin/as - ln -s ${cctools}/bin/nm - ln -s ${cctools}/bin/nmedit - ln -s ${cctools}/bin/ld - ln -s ${cctools}/bin/libtool - ln -s ${cctools}/bin/strings - ln -s ${cctools}/bin/strip - ln -s ${cctools}/bin/install_name_tool - ln -s ${cctools}/bin/bitcode_strip - ln -s ${cctools}/bin/codesign_allocate - ln -s ${cctools}/bin/dsymutil - ln -s ${cctools}/bin/dyldinfo - ln -s ${cctools}/bin/otool - ln -s ${cctools}/bin/unwinddump - ln -s ${cctools}/bin/size - ln -s ${cctools}/bin/segedit - ln -s ${cctools}/bin/pagestuff - ln -s ${cctools}/bin/ranlib - ln -s ${cctools}/bin/redo_prebinding - ln -s ${llvm}/bin/llvm-cov ln -s ${llvm}/bin/llvm-dsymutil ln -s ${llvm}/bin/llvm-dwarfdump @@ -74,14 +57,35 @@ stdenv.mkDerivation { ln -s ${unifdef}/bin/unifdef ln -s ${unifdef}/bin/unifdefall - ln -s ${bootstrap_cmds}/bin/mig - ln -s ${gperf}/bin/gperf ln -s ${gcc}/bin/gcov ln -s ${gcc}/bin/mkdep ln -s ${indent}/bin/indent - ln -s ${binutils}/bin/lipo ln -s ${ctags}/bin/ctags + '' + stdenv.lib.optionalString stdenv.isDarwin '' + ln -s ${bootstrap_cmds}/bin/mig + ln -s ${binutils}/bin/lipo + + ln -s ${cctools}/bin/ar + ln -s ${cctools}/bin/as + ln -s ${cctools}/bin/nm + ln -s ${cctools}/bin/nmedit + ln -s ${cctools}/bin/ld + ln -s ${cctools}/bin/libtool + ln -s ${cctools}/bin/strings + ln -s ${cctools}/bin/strip + ln -s ${cctools}/bin/install_name_tool + ln -s ${cctools}/bin/bitcode_strip + ln -s ${cctools}/bin/codesign_allocate + ln -s ${cctools}/bin/dsymutil + ln -s ${cctools}/bin/dyldinfo + ln -s ${cctools}/bin/otool + ln -s ${cctools}/bin/unwinddump + ln -s ${cctools}/bin/size + ln -s ${cctools}/bin/segedit + ln -s ${cctools}/bin/pagestuff + ln -s ${cctools}/bin/ranlib + ln -s ${cctools}/bin/redo_prebinding ''; } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index ef4ab245ec0c..2b01bdbb52b2 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -12,7 +12,7 @@ let }; toolchain = callPackage ./toolchain.nix { - inherit cctools bootstrap_cmds toolchainName xcbuild binutils; + inherit cctools bootstrap_cmds toolchainName xcbuild binutils stdenv; }; sdk = callPackage ./sdk.nix { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f2a1d837952..2def672e6ad3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6435,6 +6435,7 @@ in xcbuild = callPackage ../development/tools/xcbuild/wrapper.nix { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; inherit (darwin) cctools bootstrap_cmds binutils; + stdenv = clangStdenv; }; xmlindent = callPackage ../development/web/xmlindent {}; From 4685bd7853c40ec970eaf722fcae993c10bb1b5d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 10 Nov 2016 14:56:58 -0600 Subject: [PATCH 063/107] xcbuild: update meta and comments --- .../Librpcsvc/default.nix | 1 - .../apple-source-releases/adv_cmds/xcode.nix | 8 +++++++- .../network_cmds/default.nix | 18 +++++++++++------- pkgs/tools/misc/contacts/default.nix | 1 + 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix index b20687b41593..512ec6253c78 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Librpcsvc/default.nix @@ -17,7 +17,6 @@ appleDerivation rec { ''; meta = with stdenv.lib; { - description = ""; maintainers = with maintainers; [ matthewbauer ]; platforms = platforms.darwin; license = licenses.apsl20; diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index 7a8fdde69feb..fedd49022380 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -1,7 +1,13 @@ { stdenv, appleDerivation, fetchurl, xcbuild, libcxx }: appleDerivation { - # disable pkill from build + + # pkill requires special private headers that are unavailable in + # NixPkgs. These ones are needed: + # - xpc/xpxc.h + # - os/base_private.h + # - _simple.h + # We disable it here for now. TODO: build pkill inside adv_cmds patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 090a9d05fb87..71acb833cc3f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -5,8 +5,10 @@ appleDerivation rec { NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6"; + # "spray" requires some files that aren't compiling correctly in xcbuild. + # "rtadvd" seems to fail with some missing constants. + # We disable spray and rtadvd here for now. patchPhase = '' - # disable spray, rtadvd substituteInPlace network_cmds.xcodeproj/project.pbxproj \ --replace "7294F0EA0EE8BAC80052EC88 /* PBXTargetDependency */," "" \ --replace "7216D34D0EE89FEC00AE70E4 /* PBXTargetDependency */," "" @@ -22,14 +24,16 @@ appleDerivation rec { install */*.$n $out/share/man/man$n done - mkdir -p $out/etc/ - install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/ + # TODO: patch files to load from $out/ instead of /usr/ - mkdir -p $out/local/OpenSourceVersions/ - install network_cmds.plist $out/local/OpenSourceVersions/ + # mkdir -p $out/etc/ + # install rtadvd.tproj/rtadvd.conf ip6addrctl.tproj/ip6addrctl.conf $out/etc/ - mkdir -p $out/System/Library/LaunchDaemons - install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons + # mkdir -p $out/local/OpenSourceVersions/ + # install network_cmds.plist $out/local/OpenSourceVersions/ + + # mkdir -p $out/System/Library/LaunchDaemons + # install kdumpd.tproj/com.apple.kdumpd.plist $out/System/Library/LaunchDaemons ''; meta = { diff --git a/pkgs/tools/misc/contacts/default.nix b/pkgs/tools/misc/contacts/default.nix index 5c91332463f0..d146cd93343e 100644 --- a/pkgs/tools/misc/contacts/default.nix +++ b/pkgs/tools/misc/contacts/default.nix @@ -16,6 +16,7 @@ stdenv.mkDerivation rec { cp ./contacts-*/Build/Products/Default/contacts $out/bin ''; + ## FIXME: the framework setup hook isn't adding these correctly NIX_LDFLAGS = " -F${Foundation}/Library/Frameworks/ -F${AddressBook}/Library/Frameworks/"; meta = with stdenv.lib; { From fc1f6f55ea6c7eb1f98027db532683755fb7d4b9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 12 Nov 2016 15:51:25 -0600 Subject: [PATCH 064/107] xcbuild: Get rid of developer.nix, move to wrapper also: - add custom outputs "specs" for xcbuild - get rid of unneeded tools - update xcbuild - add more comments - fixup xcbuild derivations Affected xcbuild derivations include: - adv_cmds - network_cmds - basic_cmds --- pkgs/development/tools/xcbuild/developer.nix | 18 ---------- pkgs/development/tools/xcbuild/platform.nix | 36 +++++-------------- pkgs/development/tools/xcbuild/setup-hook.sh | 2 +- pkgs/development/tools/xcbuild/wrapper.nix | 17 +++++---- .../apple-source-releases/adv_cmds/xcode.nix | 6 +++- .../basic_cmds/default.nix | 9 ++++- .../network_cmds/default.nix | 2 +- 7 files changed, 35 insertions(+), 55 deletions(-) delete mode 100644 pkgs/development/tools/xcbuild/developer.nix diff --git a/pkgs/development/tools/xcbuild/developer.nix b/pkgs/development/tools/xcbuild/developer.nix deleted file mode 100644 index 826571238de4..000000000000 --- a/pkgs/development/tools/xcbuild/developer.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, platform, toolchain, xcbuild, writeText }: - -stdenv.mkDerivation { - name = "Xcode.app"; - buildInputs = [ xcbuild ]; - buildCommand = '' - mkdir -p $out/Contents/Developer/Library/Xcode/Specifications/ - cp ${xcbuild}/Library/Xcode/Specifications/* $out/Contents/Developer/Library/Xcode/Specifications/ - - mkdir -p $out/Contents/Developer/Platforms/ - cd $out/Contents/Developer/Platforms/ - ln -s ${platform} - - mkdir -p $out/Contents/Developer/Toolchains/ - cd $out/Contents/Developer/Toolchains/ - ln -s ${toolchain} - ''; -} diff --git a/pkgs/development/tools/xcbuild/platform.nix b/pkgs/development/tools/xcbuild/platform.nix index c54f7f83e0ee..0b03d4120e85 100644 --- a/pkgs/development/tools/xcbuild/platform.nix +++ b/pkgs/development/tools/xcbuild/platform.nix @@ -12,33 +12,11 @@ let ProjectName = "OSXPlatformSupport"; }; - Tools = [ - { - Identifier = "com.apple.build-tools.nmedit"; - Type = "Tool"; - Name = "Nmedit"; - } - { - Identifier = "com.apple.compilers.resource-copier"; - Type = "Tool"; - Name = "Resource Copier"; - } - { - Identifier = "com.apple.compilers.yacc"; - Type = "Tool"; - Name = "Yacc"; - InputFileTypes = [ "sourcecode.yacc" ]; - ExecDescription = "Yacc $(InputFile)"; - } - { - Identifier = "com.apple.compilers.lex"; - Type = "Tool"; - Name = "Lex"; - ExecDescription = "Lex $(InputFile)"; - InputFileTypes = [ "sourcecode.lex" ]; - } - ]; + # These files are all based off of Xcode spec fies found in + # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/Speciications/. + # Based off of the MacOSX Architectures.xcpsec file. All i386 stuff + # is removed because NixPkgs only supports darwin-x86_64. Architectures = [ { Identifier = "Standard"; @@ -81,6 +59,8 @@ let } ]; + # Based off of the MacOSX Package Types.xcpsec file. Only keep the + # bare minimum needed. PackageTypes = [ { Identifier = "com.apple.package-type.mach-o-executable"; @@ -123,6 +103,9 @@ let } ]; + # Based off of the MacOSX Product Types.xcpsec file. All + # bundles/wrapper are removed, because we prefer dynamic products in + # NixPkgs. ProductTypes = [ { Identifier = "com.apple.product-type.tool"; @@ -158,7 +141,6 @@ stdenv.mkDerivation { mkdir -p $out/Developer/Library/Xcode/Specifications/ cd $out/Developer/Library/Xcode/Specifications/ - plutil -convert xml1 -o Tools.xcspec ${writeText "Tools.xcspec" (builtins.toJSON Tools)} plutil -convert xml1 -o Architectures.xcspec ${writeText "Architectures.xcspec" (builtins.toJSON Architectures)} plutil -convert xml1 -o PackageTypes.xcspec ${writeText "PackageTypes.xcspec" (builtins.toJSON PackageTypes)} plutil -convert xml1 -o ProductTypes.xcspec ${writeText "ProductTypes.xcspec" (builtins.toJSON ProductTypes)} diff --git a/pkgs/development/tools/xcbuild/setup-hook.sh b/pkgs/development/tools/xcbuild/setup-hook.sh index b0ae8dd6e8e2..c3b26a6ac796 100644 --- a/pkgs/development/tools/xcbuild/setup-hook.sh +++ b/pkgs/development/tools/xcbuild/setup-hook.sh @@ -5,7 +5,7 @@ xcbuildBuildPhase() { echo "running xcodebuild" - xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build + xcodebuild OTHER_CFLAGS="$NIX_CFLAGS_COMPILE" OTHER_CPLUSPLUSFLAGS="$NIX_CFLAGS_COMPILE" OTHER_LDFLAGS="$NIX_LDFLAGS" build runHook postBuild } diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index 2b01bdbb52b2..fc03c273fc58 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -23,10 +23,6 @@ let inherit sdk platformName xcbuild; }; - developer = callPackage ./developer.nix { - inherit platform toolchain xcbuild; - }; - xcconfig = writeText "nix.xcconfig" '' SDKROOT=${sdkName} ''; @@ -50,13 +46,22 @@ stdenv.mkDerivation { ln -s $file done + mkdir -p $out/Library/Xcode/ + ln -s ${xcbuild}/Library/Xcode/Specifications $out/Library/Xcode/Specifications + + mkdir -p $out/Platforms/ + ln -s ${platform} $out/Platforms/ + + mkdir -p $out/Toolchains/ + ln -s ${toolchain} $out/Toolchains/ + wrapProgram $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ - --set DEVELOPER_DIR "${developer}" + --set DEVELOPER_DIR "$out" wrapProgram $out/bin/xcrun \ --add-flags "-sdk ${sdkName}" \ - --set DEVELOPER_DIR "${developer}" + --set DEVELOPER_DIR "$out" ''; passthru = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix index fedd49022380..254b4a231c22 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/xcode.nix @@ -8,9 +8,13 @@ appleDerivation { # - os/base_private.h # - _simple.h # We disable it here for now. TODO: build pkill inside adv_cmds + + # We also disable locale here because of some issues with a missing + # "lstdc++". patchPhase = '' substituteInPlace adv_cmds.xcodeproj/project.pbxproj \ - --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" + --replace "FD201DC214369B4200906237 /* pkill.c in Sources */," "" \ + --replace "FDF278D60FC6204E00D7A3C6 /* locale.cc in Sources */," "" ''; # temporary install phase until xcodebuild has "install" support diff --git a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix index 07a13966efe6..9e8b78e57d6c 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/basic_cmds/default.nix @@ -3,6 +3,14 @@ appleDerivation rec { buildInputs = [ xcbuild ]; + # These PBXcp calls should be patched in xcbuild to allow them to + # automatically be prefixed. + patchPhase = '' + substituteInPlace basic_cmds.xcodeproj/project.pbxproj \ + --replace "dstPath = /usr/share/man/man1;" "dstPath = $out/share/man/man1;" \ + --replace "dstPath = /usr/share/man/man5;" "dstPath = $out/share/man/man5;" + ''; + # temporary install phase until xcodebuild has "install" support installPhase = '' mkdir -p $out/bin/ @@ -12,7 +20,6 @@ appleDerivation rec { mkdir -p $out/share/man/man$n install */*.$n $out/share/man/man$n done - ''; meta = { diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 71acb833cc3f..357a87689a03 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -3,7 +3,7 @@ appleDerivation rec { buildInputs = [ xcbuild openssl xnu Librpcsvc libpcap developer_cmds ]; - NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/ -D__APPLE_USE_RFC_2292 -DIPV6_DONTFRAG=14 -DINET6"; + NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; # "spray" requires some files that aren't compiling correctly in xcbuild. # "rtadvd" seems to fail with some missing constants. From fb62bc90a14021e70be2ec00f33f951186b55784 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 10:46:52 +0100 Subject: [PATCH 065/107] pythonPackages.numexpr: 2.5.2 -> 2.6.1 --- pkgs/top-level/python-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 96c412551d26..9f28194d95ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15729,17 +15729,14 @@ in { numba = callPackage ../development/python-modules/numba { }; numexpr = buildPythonPackage rec { - version = "2.5.2"; + version = "2.6.1"; name = "numexpr-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/numexpr/${name}.tar.gz"; - sha256 = "0kb6549fwfxpc4qy3l5liad2mx99dys77c6w1y2rm32wyrf5k1by"; + sha256 = "db2ee72f277b23c82d204189290ea4b792f9bd5b9d67744b045f8c2a8e929a06"; }; - # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177 - # doCheck = !isPy3k; - propagatedBuildInputs = with self; [ numpy ]; # Run the test suite. From 734bd22f1b019e545b7d7fe2b76c6cf3f9de5ac6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 Nov 2016 10:05:07 +0100 Subject: [PATCH 066/107] LTS Haskell 7.9 --- .../configuration-hackage2nix.yaml | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 37b050d05d4d..1ccdbecc8d81 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,7 +32,7 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # LTS Haskell 7.8 + # LTS Haskell 7.9 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -146,7 +146,7 @@ default-package-overrides: - array-memoize ==0.6.0 - arrow-list ==0.7 - ascii-progress ==0.3.3.0 - - asciidiagram ==1.3.2 + - asciidiagram ==1.3.3 - asn1-encoding ==0.9.4 - asn1-parse ==0.9.4 - asn1-types ==0.3.2 @@ -214,7 +214,7 @@ default-package-overrides: - bitx-bitcoin ==0.10.0.0 - blake2 ==0.2.0 - blank-canvas ==0.6 - - BlastHTTP ==1.2.0 + - BlastHTTP ==1.2.1 - blastxml ==0.3.2 - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.0.2 @@ -272,12 +272,12 @@ default-package-overrides: - case-insensitive ==1.2.0.7 - cased ==0.1.0.0 - cases ==0.1.3.1 - - cassava ==0.4.5.0 + - cassava ==0.4.5.1 - cassava-conduit ==0.3.2 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - cayley-client ==0.2.1.0 - - cereal ==0.5.3.0 + - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 - cereal-vector ==0.2.0.1 @@ -347,7 +347,7 @@ default-package-overrides: - concurrent-supply ==0.1.8 - conduit ==1.2.8 - conduit-combinators ==1.0.8.1 - - conduit-extra ==1.1.13.3 + - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 - ConfigFile ==1.1.4 @@ -462,10 +462,10 @@ default-package-overrides: - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 - - dns ==2.0.8 + - dns ==2.0.9 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - - docopt ==0.7.0.4 + - docopt ==0.7.0.5 - doctest ==0.11.0 - doctest-discover ==0.1.0.7 - doctest-prop ==0.2.0.1 @@ -616,7 +616,7 @@ default-package-overrides: - ghc-typelits-extra ==0.2.1 - ghc-typelits-knownnat ==0.2.2 - ghc-typelits-natnormalise ==0.5.1 - - ghcid ==0.6.5 + - ghcid ==0.6.6 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - ghcjs-perch ==0.3.3 @@ -649,7 +649,7 @@ default-package-overrides: - glib ==0.13.4.1 - Glob ==0.7.12 - gloss ==1.10.2.3 - - gloss-rendering ==1.10.3.3 + - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.2 - GLUT ==2.7.0.10 - gogol ==0.1.0 @@ -878,7 +878,7 @@ default-package-overrides: - HPDF ==1.4.10 - hpio ==0.8.0.4 - hprotoc ==2.4.0 - - hquantlib ==0.0.3.2 + - hquantlib ==0.0.3.3 - hreader ==1.0.2 - hruby ==0.3.4.2 - hs-bibutils ==5.5 @@ -917,7 +917,7 @@ default-package-overrides: - hspec-wai ==0.6.6 - hspec-wai-json ==0.6.1 - hspec-webdriver ==1.2.0 - - hstatistics ==0.2.5.3 + - hstatistics ==0.2.5.4 - hstatsd ==0.1 - HStringTemplate ==0.8.5 - hsx-jmacro ==7.3.8 @@ -927,7 +927,7 @@ default-package-overrides: - HTF ==0.13.1.0 - html ==1.0.1.2 - html-conduit ==1.2.1.1 - - htoml ==1.0.0.1 + - htoml ==1.0.0.3 - HTTP ==4000.3.3 - http-api-data ==0.2.4 - http-client ==0.4.31.1 @@ -971,7 +971,7 @@ default-package-overrides: - iconv ==0.4.1.3 - identicon ==0.1.0 - idris ==0.12.3 - - ieee754 ==0.7.8 + - ieee754 ==0.7.9 - IfElse ==0.85 - ignore ==0.1.1.0 - ilist ==0.2.0.0 @@ -1006,7 +1006,7 @@ default-package-overrides: - io-streams-haproxy ==1.0.0.1 - ip6addr ==0.5.1.4 - iproute ==1.7.1 - - IPv6Addr ==0.6.1.0 + - IPv6Addr ==0.6.2.0 - irc ==0.6.1.0 - irc-client ==0.4.4.1 - irc-conduit ==0.2.1.1 @@ -1056,7 +1056,7 @@ default-package-overrides: - language-glsl ==0.2.0 - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - - language-javascript ==0.6.0.8 + - language-javascript ==0.6.0.9 - language-lua2 ==0.1.0.5 - language-nix ==2.1.0.1 - language-puppet ==1.3.1.1 @@ -1105,7 +1105,7 @@ default-package-overrides: - lrucache ==1.2.0.0 - lrucaching ==0.3.0 - ltext ==0.1.2.1 - - lucid ==2.9.6 + - lucid ==2.9.7 - lucid-svg ==0.7.0.0 - machines ==0.6.1 - magic ==1.1 @@ -1156,7 +1156,7 @@ default-package-overrides: - monad-extras ==0.5.11 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - - monad-logger ==0.3.20 + - monad-logger ==0.3.20.1 - monad-logger-json ==0.1.0.0 - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.2.0 @@ -1198,7 +1198,7 @@ default-package-overrides: - murmur-hash ==0.1.0.9 - murmur3 ==1.0.3 - MusicBrainz ==0.2.4 - - mustache ==2.1 + - mustache ==2.1.2 - mutable-containers ==0.3.3 - mwc-probability ==1.2.2 - mwc-random ==0.13.4.0 @@ -1253,7 +1253,7 @@ default-package-overrides: - once ==0.2 - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.1.1 + - opaleye ==0.5.2.1 - opaleye-trans ==0.3.3 - open-browser ==0.2.1.0 - OpenGL ==3.0.1.0 @@ -1437,7 +1437,7 @@ default-package-overrides: - readable ==0.3.1 - ReadArgs ==1.2.2 - readline ==1.0.3.0 - - rebase ==1.0.2.1 + - rebase ==1.0.3 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 @@ -1473,7 +1473,7 @@ default-package-overrides: - reroute ==0.4.0.1 - resolve-trivial-conflicts ==0.3.2.3 - resource-pool ==0.2.3.2 - - resourcet ==1.1.8 + - resourcet ==1.1.8.1 - rest-client ==0.5.1.1 - rest-core ==0.39 - rest-gen ==0.19.0.3 @@ -1496,7 +1496,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.9 + - safe ==0.3.10 - safe-exceptions ==0.1.4.0 - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 @@ -1582,8 +1582,8 @@ default-package-overrides: - smsaero ==0.6.1 - smtLib ==1.0.8 - smtp-mail ==0.1.4.5 - - snap-core ==1.0.0.0 - - snap-server ==1.0.1.0 + - snap-core ==1.0.1.0 + - snap-server ==1.0.1.1 - snowflake ==0.1.1.1 - soap ==0.2.3.1 - soap-openssl ==0.1.0.2 @@ -1591,7 +1591,7 @@ default-package-overrides: - socket ==0.6.1.0 - socks ==0.5.5 - solga ==0.1.0.1 - - solga-swagger ==0.1.0.1 + - solga-swagger ==0.1.0.2 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 - spdx ==0.2.1.0 @@ -1730,11 +1730,11 @@ default-package-overrides: - tf-random ==0.5 - th-data-compat ==0.0.2.2 - th-desugar ==1.6 - - th-expand-syns ==0.4.0.0 + - th-expand-syns ==0.4.1.0 - th-extras ==0.0.0.4 - th-lift ==0.7.6 - th-lift-instances ==0.1.10 - - th-orphans ==0.13.2 + - th-orphans ==0.13.3 - th-printf ==0.3.1 - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 @@ -1764,7 +1764,7 @@ default-package-overrides: - transformers-base ==0.4.4 - transformers-compat ==0.5.1.4 - transformers-lift ==0.1.0.1 - - transient ==0.4.4 + - transient ==0.4.4.1 - transient-universe ==0.3.5 - traverse-with-class ==0.2.0.4 - tree-fun ==0.8.1.0 @@ -1846,7 +1846,7 @@ default-package-overrides: - vcswrapper ==0.1.3 - vector ==0.11.0.0 - vector-algorithms ==0.7.0.1 - - vector-binary-instances ==0.2.3.2 + - vector-binary-instances ==0.2.3.3 - vector-buffer ==0.4.1 - vector-fftw ==0.1.3.7 - vector-instances ==3.3.1 @@ -1885,7 +1885,7 @@ default-package-overrides: - wai-transformers ==0.0.7 - wai-websockets ==3.0.1.1 - waitra ==0.0.4.0 - - warp ==3.2.8 + - warp ==3.2.9 - warp-tls ==3.2.2 - web-plugins ==0.2.9 - web-routes ==0.27.11 @@ -1918,7 +1918,7 @@ default-package-overrides: - wl-pprint-text ==1.1.0.4 - word-trie ==0.3.0 - word8 ==0.1.2 - - wordpass ==1.0.0.6 + - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 - wreq ==0.4.1.0 @@ -1957,14 +1957,14 @@ default-package-overrides: - YampaSynth ==0.2 - yarr ==1.4.0.2 - yes-precure5-command ==5.5.3 - - yesod ==1.4.3 + - yesod ==1.4.3.1 - yesod-auth ==1.4.13.5 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.5.1.3 - yesod-auth-oauth2 ==0.2.2 - yesod-bin ==1.4.18.7 - - yesod-core ==1.4.25 + - yesod-core ==1.4.26 - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - yesod-fb ==0.3.4 From 1e43c159e2d1459cdd8b9a62e88b11b3c71039b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 14 Nov 2016 10:34:42 +0100 Subject: [PATCH 067/107] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.0.3-3-g5c816fd from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4196e3bc37e6ac42fa51525bf7855bb447b46caf. --- .../haskell-modules/hackage-packages.nix | 1145 +++++------------ 1 file changed, 296 insertions(+), 849 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c835d85b97e4..56c84c2a7c53 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1650,25 +1650,6 @@ self: { }) {}; "BlastHTTP" = callPackage - ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring - , conduit, HTTP, http-conduit, hxt, mtl, network, transformers - }: - mkDerivation { - pname = "BlastHTTP"; - version = "1.2.0"; - sha256 = "65a58d1e7f5731feabef05480032c674fc55d559d2d4c391cf3fb0aa9ee4166e"; - revision = "1"; - editedCabalFile = "7076650ad04d2c5945b96ec1a8d5db8ee680314d4dc4cff54f264316e7f69bba"; - libraryHaskellDepends = [ - base biocore biofasta blastxml bytestring conduit HTTP http-conduit - hxt mtl network transformers - ]; - homepage = "https://github.com/eggzilla/BlastHTTP"; - description = "Libary to interface with the NCBI blast REST interface"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "BlastHTTP_1_2_1" = callPackage ({ mkDerivation, base, biocore, biofasta, blastxml, bytestring , conduit, HTTP, http-conduit, hxt, mtl, network, transformers }: @@ -1683,7 +1664,6 @@ self: { homepage = "https://github.com/eggzilla/BlastHTTP"; description = "Libary to interface with the NCBI blast REST interface"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Blobs" = callPackage @@ -5690,8 +5670,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.1.0"; - sha256 = "7f66dcdd5cdaa85d9ee14cbabb856e545b97f05ceeb55ce52ba1ef79ea33d3a9"; + version = "0.9.1.1"; + sha256 = "be780905be2f45683bb7ea702ac87f7c9b30d7cfeadc0fce9d5a9d989533a38c"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -9582,25 +9562,6 @@ self: { }) {}; "IPv6Addr" = callPackage - ({ mkDerivation, attoparsec, base, HUnit, iproute, network - , network-info, random, test-framework, test-framework-hunit, text - }: - mkDerivation { - pname = "IPv6Addr"; - version = "0.6.1.0"; - sha256 = "dea0eb0a534e1df647487f120428ac7cfc54ab9c8ca75f63fe47a4020d4888c6"; - libraryHaskellDepends = [ - attoparsec base iproute network network-info random text - ]; - testHaskellDepends = [ - base HUnit test-framework test-framework-hunit text - ]; - homepage = "https://github.com/MichelBoucey/IPv6Addr"; - description = "Library to deal with IPv6 address text representations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "IPv6Addr_0_6_2_0" = callPackage ({ mkDerivation, attoparsec, base, HUnit, iproute, network , network-info, random, test-framework, test-framework-hunit, text }: @@ -9617,7 +9578,6 @@ self: { homepage = "https://github.com/MichelBoucey/IPv6Addr"; description = "Library to deal with IPv6 address text representations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IcoGrid" = callPackage @@ -12096,8 +12056,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit, net_snmp, process }: mkDerivation { pname = "NetSNMP"; - version = "0.3.2.2"; - sha256 = "7f29640168103c6a6194b37737a62057e7bb8cff3e8503e9dd1e46bb60552c9b"; + version = "0.3.2.4"; + sha256 = "45ee5a82f1cecc381299d1998ae194ee05348a30cfa827cd5aea277310bf5c5b"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ net_snmp ]; testHaskellDepends = [ base bytestring HUnit process ]; @@ -26743,29 +26703,6 @@ self: { }) {}; "asciidiagram" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative - , rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; - version = "1.3.2"; - sha256 = "11eb37084513a6b510f88f043a10c2cdc9b039041b6e5d3ae0decd7c40de4784"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers FontyFruity JuicyPixels lens linear mtl - rasterific-svg svg-tree text vector - ]; - executableHaskellDepends = [ - base bytestring directory filepath FontyFruity JuicyPixels - optparse-applicative rasterific-svg svg-tree text - ]; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "asciidiagram_1_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative , rasterific-svg, svg-tree, text, vector @@ -26786,7 +26723,6 @@ self: { ]; description = "Pretty rendering of Ascii diagram into svg or png"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asic" = callPackage @@ -33839,8 +33775,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.6.0.0"; - sha256 = "1b6437cda224d2c1250ff83fa9af1c4e9b7890613a6de7b658672f9dc35cee0a"; + version = "0.7.0.0"; + sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -34682,12 +34618,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "btrfs_0_1_2_1" = callPackage + "btrfs_0_1_2_2" = callPackage ({ mkDerivation, base, bytestring, time, unix }: mkDerivation { pname = "btrfs"; - version = "0.1.2.1"; - sha256 = "85b28c30a369958cd86ab2d822aa874846950e2720d0b9cda5ef8cd225cf3ee0"; + version = "0.1.2.2"; + sha256 = "0a362bd0aef9c11212c095a3da17279a5c1ac490eee49822a04138503212e7b5"; libraryHaskellDepends = [ base bytestring time unix ]; homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; @@ -37991,30 +37927,6 @@ self: { }) {}; "cassava" = callPackage - ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring - , containers, deepseq, hashable, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , unordered-containers, vector - }: - mkDerivation { - pname = "cassava"; - version = "0.4.5.0"; - sha256 = "7320a1c764efd3baae6944b31f7fdb438ae307876dce283a242e8f1deeb371c9"; - libraryHaskellDepends = [ - array attoparsec base blaze-builder bytestring containers deepseq - hashable text unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hashable HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector - ]; - homepage = "https://github.com/hvr/cassava"; - description = "A CSV parsing and encoding library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava_0_4_5_1" = callPackage ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring , containers, deepseq, hashable, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, text @@ -38036,7 +37948,6 @@ self: { homepage = "https://github.com/hvr/cassava"; description = "A CSV parsing and encoding library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-conduit" = callPackage @@ -38057,19 +37968,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cassava-conduit_0_3_4" = callPackage + "cassava-conduit_0_3_5" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text }: mkDerivation { pname = "cassava-conduit"; - version = "0.3.4"; - sha256 = "cebd36d3b7cd575f2ccf38860d3f89ba0872cd196d25f5f5d1cefb579a111849"; + version = "0.3.5"; + sha256 = "0162887a9ca16d8828ac31f7c5aa409129de4e1cd3e199cd158302d3775f9e89"; libraryHaskellDepends = [ array base bifunctors bytestring cassava conduit conduit-extra containers mtl text ]; - testHaskellDepends = [ base QuickCheck ]; + testHaskellDepends = [ + base bytestring cassava conduit conduit-extra QuickCheck text + ]; homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; @@ -38519,26 +38432,6 @@ self: { }) {}; "cereal" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; - version = "0.5.3.0"; - sha256 = "c316e07cde7559684b71d345890e8f16eb5f6cc1cdd29f96e8c4296bcf8a8af4"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - homepage = "https://github.com/GaloisInc/cereal"; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cereal_0_5_4_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 }: @@ -38556,7 +38449,6 @@ self: { homepage = "https://github.com/GaloisInc/cereal"; description = "A binary serialization library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-conduit" = callPackage @@ -38857,6 +38749,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cgi_3001_3_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, doctest, exceptions + , mtl, multipart, network, network-uri, parsec, QuickCheck, time + , xhtml + }: + mkDerivation { + pname = "cgi"; + version = "3001.3.0.2"; + sha256 = "92111387216c4941271a833a1214d61ad21aaf3337ae48ea6d99d4a035bd77c1"; + libraryHaskellDepends = [ + base bytestring containers exceptions mtl multipart network + network-uri parsec time xhtml + ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/cheecheeo/haskell-cgi"; + description = "A library for writing CGI programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cgi-undecidable" = callPackage ({ mkDerivation, base, cgi, mtl }: mkDerivation { @@ -40163,8 +40075,8 @@ self: { }: mkDerivation { pname = "clang-pure"; - version = "0.2.0.1"; - sha256 = "27c81214e72d9a4c6e701fc05d2adc5cb0732cc07c4fb715a6bf2f9d904058ee"; + version = "0.2.0.2"; + sha256 = "fad48f3ba3fad6a99d73923a6034a3d2a6610812404b39c05e6dc3dd20e0604c"; libraryHaskellDepends = [ base bytestring containers contravariant inline-c microlens microlens-contra singletons stm template-haskell vector @@ -43548,32 +43460,6 @@ self: { }) {}; "conduit-extra" = callPackage - ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring - , bytestring-builder, conduit, directory, exceptions, filepath - , hspec, monad-control, network, primitive, process, QuickCheck - , resourcet, stm, streaming-commons, text, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit-extra"; - version = "1.1.13.3"; - sha256 = "c2efc890925ca9adcff7006b6155804b4a3712940f70b3e3be8b1e9be7c56c48"; - libraryHaskellDepends = [ - async attoparsec base blaze-builder bytestring conduit directory - exceptions filepath monad-control network primitive process - resourcet stm streaming-commons text transformers transformers-base - ]; - testHaskellDepends = [ - async attoparsec base blaze-builder bytestring bytestring-builder - conduit exceptions hspec process QuickCheck resourcet stm - streaming-commons text transformers transformers-base - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Batteries included conduit: adapters for common libraries"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-extra_1_1_15" = callPackage ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring , bytestring-builder, conduit, directory, exceptions, filepath , hspec, monad-control, network, primitive, process, QuickCheck @@ -43597,7 +43483,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Batteries included conduit: adapters for common libraries"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-find" = callPackage @@ -47899,8 +47784,8 @@ self: { }: mkDerivation { pname = "d-bus"; - version = "0.1.4"; - sha256 = "e194ab6f0447adf7954b1b94b1533ded8c79af99a7c8976e316934a22452f5b3"; + version = "0.1.5"; + sha256 = "79a28c075e0eac6f3bb50fedd88d8454ed5f8b6737cd484e2f26fd13361b7d06"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54626,6 +54511,30 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "diversity_0_8_0_2" = callPackage + ({ mkDerivation, base, containers, data-ordlist, fasta + , math-functions, MonadRandom, optparse-applicative, parsec, pipes + , random-shuffle, scientific, semigroups, split + }: + mkDerivation { + pname = "diversity"; + version = "0.8.0.2"; + sha256 = "f8bea710958aff9169f150efc112ec871230eccf464315b956dccdd8460c7324"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-ordlist fasta math-functions MonadRandom + parsec random-shuffle scientific split + ]; + executableHaskellDepends = [ + base containers fasta optparse-applicative pipes semigroups + ]; + homepage = "https://github.com/GregorySchwartz/diversity"; + description = "Quantify the diversity of a population"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dixi" = callPackage ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base , base-orphans, blaze-html, blaze-markup, bytestring @@ -54767,29 +54676,6 @@ self: { }) {}; "dns" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring - , bytestring-builder, conduit, conduit-extra, containers, doctest - , hspec, iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.8"; - sha256 = "ca9ba04f3fdc277033a9b16bf39d290e2b2fdc4d79c9c0c9b9aa5b8cf21bd5c9"; - libraryHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary bytestring bytestring-builder conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "dns_2_0_9" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest , hspec, iproute, mtl, network, random, resourcet, safe, word8 @@ -54810,7 +54696,6 @@ self: { testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dnscache" = callPackage @@ -55011,26 +54896,6 @@ self: { }) {}; "docopt" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers - , HUnit, parsec, split, template-haskell, th-lift - }: - mkDerivation { - pname = "docopt"; - version = "0.7.0.4"; - sha256 = "3470cd9de7b1731a0b2c0a3fe8b9ea1bfdcfbebeffa5ed77831572f50f01e480"; - libraryHaskellDepends = [ - base containers parsec template-haskell th-lift - ]; - testHaskellDepends = [ - aeson ansi-terminal base bytestring containers HUnit parsec split - template-haskell th-lift - ]; - homepage = "https://github.com/docopt/docopt.hs"; - description = "A command-line interface parser that will make you smile"; - license = stdenv.lib.licenses.mit; - }) {}; - - "docopt_0_7_0_5" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers , HUnit, parsec, split, template-haskell, text, th-lift }: @@ -55048,7 +54913,6 @@ self: { homepage = "https://github.com/docopt/docopt.hs"; description = "A command-line interface parser that will make you smile"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "doctemplates" = callPackage @@ -57293,8 +57157,8 @@ self: { }: mkDerivation { pname = "egison"; - version = "3.6.1"; - sha256 = "937ab976c09bf6c4b4376d9cb30504055814ad4079f15319c9126abf74cdbac9"; + version = "3.6.3"; + sha256 = "178eebc1798fb6d1c2fceeb8f68c2b7cd87a25ff35db9274c2115e6b5100e6d5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57338,8 +57202,8 @@ self: { }: mkDerivation { pname = "egison-tutorial"; - version = "3.5.9"; - sha256 = "9540ca3bcf92594a9b203df1f1b862264ebfe0e36eb49bb04fe10bbae2a9c9ab"; + version = "3.6.2"; + sha256 = "b1dc21a80daacb240ad339bfcd895ee7e10f41560b14566766e168ab4606a2c0"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -62569,12 +62433,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filepath_1_4_1_0" = callPackage + "filepath_1_4_1_1" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "filepath"; - version = "1.4.1.0"; - sha256 = "bd6dbfd1ecba2322ef166b4805d4276cbde1e551bd5c61fbee396782b9923d00"; + version = "1.4.1.1"; + sha256 = "52fdbde3bc3a44d920544b8d184bd7241bac3f92d1fc6e299d716e06e99f12b4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; homepage = "https://github.com/haskell/filepath#readme"; @@ -64741,8 +64605,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.1"; - sha256 = "d2db56431c37247352d2497e1a782197434f02269767584cfebbb740fde69730"; + version = "0.0.2"; + sha256 = "d879240154104273197249b4fbd2bd6d6ad9739166a8a75e9484bf87b6d9388f"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -67375,8 +67239,8 @@ self: { ({ mkDerivation, base, containers, mtl, template-haskell }: mkDerivation { pname = "genifunctors"; - version = "0.3"; - sha256 = "2520632580921ea35be3f5bfb94562abb935f8cc577e0bc8b41886eb5bf15a9a"; + version = "0.4"; + sha256 = "2df0f1cfa6861afa3eb5ecb1c87c405e30c07a843f588474902fa1531b848045"; libraryHaskellDepends = [ base containers mtl template-haskell ]; testHaskellDepends = [ base containers mtl template-haskell ]; homepage = "https://github.com/danr/genifunctors"; @@ -68700,34 +68564,6 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.6.5"; - sha256 = "67f9f5c89d35f0d56d4d26bf72f25dd2f8794a67949449ef61739e84a316923c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cmdargs directory extra filepath process terminal-size time - unix - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - homepage = "https://github.com/ndmitchell/ghcid#readme"; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghcid_0_6_6" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -68753,7 +68589,6 @@ self: { homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-ajax" = callPackage @@ -71151,6 +70986,8 @@ self: { pname = "glirc"; version = "2.20.1.1"; sha256 = "63f0f8d82ea8d2f90103faf9ccd9fa301275b9400bbf1c3db62f8c51cbfa40fe"; + revision = "1"; + editedCabalFile = "883328945d2ac7c7e02b70aaeb3afbe1a23032d3ba073227a56411966d3afb0b"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal filepath ]; @@ -71466,19 +71303,6 @@ self: { }) {}; "gloss-rendering" = callPackage - ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: - mkDerivation { - pname = "gloss-rendering"; - version = "1.10.3.3"; - sha256 = "ca559268107524c8ac73f7bd4ea164e26fe5426bff49b457276ff04fce872567"; - libraryHaskellDepends = [ - base bmp bytestring containers GLUT OpenGL - ]; - description = "Gloss picture data types and rendering functions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "gloss-rendering_1_10_3_5" = callPackage ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }: mkDerivation { pname = "gloss-rendering"; @@ -71489,7 +71313,6 @@ self: { ]; description = "Gloss picture data types and rendering functions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gloss-sodium" = callPackage @@ -71749,8 +71572,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.1.18"; - sha256 = "4c86a04bef399c6d73217b6ea4953d8c90224d844b65453b8a18e3749ee1f86a"; + version = "0.1.19"; + sha256 = "4cf869138bb7a748ccfb0d084ed53ddb19930793da39c0a45065d14e5251013b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -76295,6 +76118,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gssapi" = callPackage + ({ mkDerivation, base, bytestring, gssapi_krb5, krb5, resourcet + , transformers + }: + mkDerivation { + pname = "gssapi"; + version = "0.1.0.0"; + sha256 = "72b7c687414bb370ff6a857ddbcfe00a804d3f2e4ca563c0783a68f6f875b0fd"; + libraryHaskellDepends = [ base bytestring resourcet transformers ]; + librarySystemDepends = [ gssapi_krb5 krb5 ]; + homepage = "https://github.com/ondrap/gssapi"; + description = "libgssapi and libkrb5 bindings for haskell"; + license = stdenv.lib.licenses.bsd3; + }) {gssapi_krb5 = null; krb5 = null;}; + + "gssapi-wai" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring + , case-insensitive, gssapi, http-types, vault, wai, wai-extra + }: + mkDerivation { + pname = "gssapi-wai"; + version = "0.1.0.0"; + sha256 = "1a2b844a611f4615d948baa7253099f5acab01529005d522b46db839833f371f"; + libraryHaskellDepends = [ + base base64-bytestring bytestring case-insensitive gssapi + http-types vault wai wai-extra + ]; + homepage = "https://github.com/ondrap/gssapi-wai"; + description = "WAI Middleware for SPNEGO authentiaction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gstreamer" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, directory, glib , gst_plugins_base, gstreamer, gtk2hs-buildtools, mtl @@ -83747,8 +83602,8 @@ self: { }: mkDerivation { pname = "hasql-optparse-applicative"; - version = "0.1.1"; - sha256 = "8d0e6601a5353d4cd5bd6fd7f713d79ecf8bfbe3458163c0b0e0f10a90ed80fd"; + version = "0.2"; + sha256 = "c006e033547c82b4986e8bbc09997f73bb5bb75a7e08e10fb29ba06117aaa42b"; libraryHaskellDepends = [ base-prelude hasql hasql-pool optparse-applicative ]; @@ -85977,10 +85832,8 @@ self: { }: mkDerivation { pname = "heredocs"; - version = "0.1.3.1"; - sha256 = "51c7b375ef2e5d34da7533a2b919e7908e94c89fcbc087fb559fa89dd5e0ddb6"; - revision = "2"; - editedCabalFile = "f46b25d4890df9e9da69c0a491580c32d2b9519903e795efe6385b0d11c3a796"; + version = "0.1.4"; + sha256 = "3f879b0e2f34d98f670e6a210f1bc61d9c4a9505c147c7ec93576f54fe69c56f"; libraryHaskellDepends = [ base bytestring doctest parsec template-haskell text ]; @@ -86218,6 +86071,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heterocephalus" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, containers + , doctest, Glob, parsec, shakespeare, template-haskell, text + }: + mkDerivation { + pname = "heterocephalus"; + version = "0.1.0.0"; + sha256 = "fd9a5caaea40092400f6952e53cd0cda701e963732f434e14025daf683b8c4fd"; + libraryHaskellDepends = [ + base blaze-html blaze-markup containers parsec shakespeare + template-haskell text + ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/arowM/heterocephalus#readme"; + description = "A flexible and type safe template engine for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "hetris" = callPackage ({ mkDerivation, array, base, hscurses, ncurses, old-time, random }: @@ -91285,15 +91156,18 @@ self: { }) {}; "hpp" = callPackage - ({ mkDerivation, base, directory, filepath, time, transformers }: + ({ mkDerivation, base, bytestring, bytestring-trie, directory + , filepath, ghc-prim, time, transformers + }: mkDerivation { pname = "hpp"; - version = "0.3.1.0"; - sha256 = "1ec268eee4adc227768a22e601fe8ca1f90170705b44186e9522f791172842ee"; + version = "0.4.0"; + sha256 = "05923e6dacc0549f50ff342a3eb2b6782fe3cdc4c6190eea0e4cabc17f429f5d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory filepath time transformers + base bytestring bytestring-trie directory filepath ghc-prim time + transformers ]; executableHaskellDepends = [ base directory filepath time ]; homepage = "https://github.com/acowley/hpp"; @@ -91511,35 +91385,6 @@ self: { }) {}; "hquantlib" = callPackage - ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl - , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck - , statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, vector, vector-algorithms - }: - mkDerivation { - pname = "hquantlib"; - version = "0.0.3.2"; - sha256 = "b26666d1d95a4895ff3e0773d8234e67c692c7f2fe740466b653face4bfb9af3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers hmatrix hmatrix-gsl hmatrix-special mersenne-random - parallel statistics time vector vector-algorithms - ]; - executableHaskellDepends = [ - base containers mersenne-random parallel - ]; - testHaskellDepends = [ - base HUnit QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 - ]; - homepage = "http://github.com/paulrzcz/hquantlib.git"; - description = "HQuantLib is a port of essencial parts of QuantLib to Haskell"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hquantlib_0_0_3_3" = callPackage ({ mkDerivation, base, containers, hmatrix, hmatrix-gsl , hmatrix-special, HUnit, mersenne-random, parallel, QuickCheck , statistics, test-framework, test-framework-hunit @@ -92817,8 +92662,8 @@ self: { }: mkDerivation { pname = "hscaffold"; - version = "0.4.4.0"; - sha256 = "f56776610c0a64fe5bf396a3d0d1fff5e2e22ad8996f1f95fa1336d7d25285df"; + version = "0.4.5.0"; + sha256 = "8f94525878efbe2f6c8ce80717027596d9e004a5b3ca86f1c3db8bcb2cbd365e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95098,22 +94943,6 @@ self: { }) {}; "hstatistics" = callPackage - ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random - , vector - }: - mkDerivation { - pname = "hstatistics"; - version = "0.2.5.3"; - sha256 = "d8a8bf9dcf6bd25ac5ca695ec1c4fc198310411cc87ab2a23ffe1d9116812a2d"; - libraryHaskellDepends = [ - array base hmatrix hmatrix-gsl-stats random vector - ]; - homepage = "http://code.haskell.org/hstatistics"; - description = "Statistics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hstatistics_0_2_5_4" = callPackage ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random , vector }: @@ -95127,7 +94956,6 @@ self: { homepage = "http://code.haskell.org/hstatistics"; description = "Statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstats" = callPackage @@ -95805,34 +95633,6 @@ self: { }) {}; "htoml" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, file-embed - , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "htoml"; - version = "1.0.0.1"; - sha256 = "11145f645768abaa51c6ffda70f1c6fe7bb99163877efb13058a16d2d0bd592b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers old-locale parsec text time - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring containers file-embed parsec tasty - tasty-hspec tasty-hunit text time unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed parsec tasty - tasty-hspec tasty-hunit text time unordered-containers vector - ]; - homepage = "https://github.com/cies/htoml"; - description = "Parser for TOML files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "htoml_1_0_0_3" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, file-embed , old-locale, parsec, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector @@ -95852,7 +95652,6 @@ self: { homepage = "https://github.com/cies/htoml"; description = "Parser for TOML files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "htrace" = callPackage @@ -95977,7 +95776,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3_2" = callPackage + "http-api-data_0_3_3" = callPackage ({ mkDerivation, base, bytestring, containers, directory, doctest , filepath, hashable, hspec, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat @@ -95985,8 +95784,8 @@ self: { }: mkDerivation { pname = "http-api-data"; - version = "0.3.2"; - sha256 = "015fb4167f807c31af465cd8991454c3ed72ad5935ff0839993f4fcb038958f2"; + version = "0.3.3"; + sha256 = "cb3d7ef8a924a6b03481b7c5e26a580df72cbf89f2e8247e825f43f4b3ba8449"; libraryHaskellDepends = [ base bytestring containers hashable text time time-locale-compat unordered-containers uri-bytestring uuid-types @@ -96515,6 +96314,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "http-link-header_1_0_3" = callPackage + ({ mkDerivation, attoparsec, base, bytestring + , bytestring-conversion, errors, hspec, hspec-attoparsec + , http-api-data, network-uri, QuickCheck, text + }: + mkDerivation { + pname = "http-link-header"; + version = "1.0.3"; + sha256 = "59bd2db4e7d14b6f7ce86848af5e38b4bd2e9963e9ffe5068c7b1a710dbdd7fe"; + libraryHaskellDepends = [ + attoparsec base bytestring bytestring-conversion errors + http-api-data network-uri text + ]; + testHaskellDepends = [ + base hspec hspec-attoparsec QuickCheck text + ]; + homepage = "https://github.com/myfreeweb/http-link-header"; + description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -99636,18 +99457,6 @@ self: { }) {}; "ieee754" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "ieee754"; - version = "0.7.8"; - sha256 = "de4aefce42d903a3016cba4c7ebfc70d4fa0a76f8c04014c7eb3545b9ab56eff"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/patperry/hs-ieee754"; - description = "Utilities for dealing with IEEE floating point numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ieee754_0_7_9" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ieee754"; @@ -99657,7 +99466,6 @@ self: { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ieee754-parser" = callPackage @@ -108324,28 +108132,6 @@ self: { }) {}; "language-javascript" = callPackage - ({ mkDerivation, alex, array, base, blaze-builder, bytestring - , Cabal, containers, happy, hspec, mtl, QuickCheck, text - , utf8-light, utf8-string - }: - mkDerivation { - pname = "language-javascript"; - version = "0.6.0.8"; - sha256 = "98a48760012d7b9eb7625532ea1d18ee0127a18dc11ccd679717ea53151c2ab9"; - libraryHaskellDepends = [ - array base blaze-builder bytestring containers mtl text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - array base blaze-builder bytestring Cabal containers hspec mtl - QuickCheck utf8-light utf8-string - ]; - homepage = "http://github.com/erikd/language-javascript"; - description = "Parser for JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-javascript_0_6_0_9" = callPackage ({ mkDerivation, alex, array, base, blaze-builder, bytestring , Cabal, containers, happy, hspec, mtl, QuickCheck, text , utf8-light, utf8-string @@ -108365,7 +108151,6 @@ self: { homepage = "https://github.com/erikd/language-javascript"; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-kort" = callPackage @@ -113159,8 +112944,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.5.4"; - sha256 = "54dbe118a7bb4cc54b9a894859bb9b0e411f9b8f5f5205fe8bd2c0d079ef1962"; + version = "0.5.5"; + sha256 = "9a1b6443e83b249bb20feed413f47fe8b33b1d36b3e6982cae70cdcf158137fc"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bloodhound bytestring cond deepseq exceptions hpqtypes http-client lifted-base @@ -114206,27 +113991,6 @@ self: { }) {}; "lucid" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.6"; - sha256 = "a8435c73bacc3dc60efd89c21b29c9fbca9a10676ec158d4e810ab751849a8c9"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lucid_2_9_7" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text , transformers, unordered-containers @@ -114245,7 +114009,6 @@ self: { homepage = "https://github.com/chrisdone/lucid"; description = "Clear to write, read and edit DSL for HTML"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lucid-foundation" = callPackage @@ -118725,13 +118488,15 @@ self: { }) {}; "modbus-tcp" = callPackage - ({ mkDerivation, base, bytestring, cereal, network, transformers }: + ({ mkDerivation, base, bytestring, cereal, mtl, network + , transformers + }: mkDerivation { pname = "modbus-tcp"; - version = "0.2.1.1"; - sha256 = "60cf7f9956387abd5b24e760d281b7a3423432d271502745df59b398d499de86"; + version = "0.3"; + sha256 = "539d030348f403431f763bcc822bc5e8dd946ed28e353e2a877427409b3d7737"; libraryHaskellDepends = [ - base bytestring cereal network transformers + base bytestring cereal mtl network transformers ]; homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; @@ -119385,28 +119150,6 @@ self: { }) {}; "monad-logger" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, conduit - , conduit-extra, exceptions, fast-logger, lifted-base - , monad-control, monad-loops, mtl, resourcet, stm, stm-chans - , template-haskell, text, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "monad-logger"; - version = "0.3.20"; - sha256 = "58be0b1e04d1cce4a40e9502448de8ae2c72eff98a6c173539653bacbb3c9fe9"; - libraryHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra exceptions - fast-logger lifted-base monad-control monad-loops mtl resourcet stm - stm-chans template-haskell text transformers transformers-base - transformers-compat - ]; - homepage = "https://github.com/kazu-yamamoto/logger"; - description = "A class of monads which can log messages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "monad-logger_0_3_20_1" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, conduit , conduit-extra, exceptions, fast-logger, lifted-base , monad-control, monad-loops, mtl, resourcet, stm, stm-chans @@ -119426,7 +119169,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/logger"; description = "A class of monads which can log messages"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-logger-json" = callPackage @@ -122300,37 +122042,6 @@ self: { }) {}; "mustache" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , cmdargs, containers, directory, either, filepath, hspec, lens - , mtl, parsec, process, scientific, tar, template-haskell - , temporary, text, th-lift, unordered-containers, vector, wreq - , yaml, zlib - }: - mkDerivation { - pname = "mustache"; - version = "2.1"; - sha256 = "159241066d7e78bb40436391113f319ccb9753e6e00a72c604ccba493e7d42d6"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory either filepath mtl - parsec scientific template-haskell text th-lift - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs filepath text yaml - ]; - testHaskellDepends = [ - aeson base base-unicode-symbols bytestring directory filepath hspec - lens process tar temporary text unordered-containers wreq yaml zlib - ]; - homepage = "https://github.com/JustusAdam/mustache"; - description = "A mustache template parser library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "mustache_2_1_2" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, lens , mtl, parsec, process, scientific, tar, template-haskell @@ -123340,6 +123051,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "natural-transformation_0_4" = callPackage + ({ mkDerivation, base, containers, quickcheck-instances, tasty + , tasty-quickcheck + }: + mkDerivation { + pname = "natural-transformation"; + version = "0.4"; + sha256 = "aac28e2c1147ed77c1ec0f0eb607a577fa26d0fd67474293ba860ec124efc8af"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base containers quickcheck-instances tasty tasty-quickcheck + ]; + homepage = "https://github.com/ku-fpg/natural-transformation"; + description = "A natural transformation package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "naturalcomp" = callPackage ({ mkDerivation, base, text, utf8-string }: mkDerivation { @@ -126585,6 +126314,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oauth10a" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , cryptohash, entropy, http-types, time, transformers + }: + mkDerivation { + pname = "oauth10a"; + version = "0.1.0.0"; + sha256 = "a923cb04195ed275990623b821933bc52e00a7311ee485e803d272185c11aacc"; + revision = "1"; + editedCabalFile = "5ee8aca8d824721a86d2ecb7cc094baffa6591059e49e6f7da5682851c30b7a1"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cryptohash entropy + http-types time transformers + ]; + testHaskellDepends = [ base bytestring ]; + homepage = "https://github.com/gatlin/oauth10a#readme"; + description = "Fully Automatic Luxury OAuth 1.0a headers"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "oauthenticated" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, case-insensitive, crypto-random, cryptohash, either @@ -127314,34 +127063,6 @@ self: { }) {}; "opaleye" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.5.1.1"; - sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e"; - revision = "1"; - editedCabalFile = "134244b5b0a2b0d253dfd9021e6522938a138ed68631af787c0d7f3d673e6e39"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - aeson base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups text time - ]; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "opaleye_0_5_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset , postgresql-simple, pretty, product-profunctors, profunctors @@ -127365,7 +127086,6 @@ self: { homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-classy" = callPackage @@ -128111,6 +127831,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "opentype" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, ghc + , pretty-hex, time, vector + }: + mkDerivation { + pname = "opentype"; + version = "0.0.1"; + sha256 = "21c574b4af3c99607e1e647b52bd32a2ae644135ab55e3dc3041f6dd6f4f1340"; + libraryHaskellDepends = [ + base binary bytestring containers ghc pretty-hex time vector + ]; + description = "Opentype loading and writing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "operate-do" = callPackage ({ mkDerivation, base, charset, doctest, filemanip , haskell-src-meta, hspec, QuickCheck, template-haskell @@ -130857,8 +130592,8 @@ self: { }: mkDerivation { pname = "patat"; - version = "0.3.3.0"; - sha256 = "63e9aa04425cada935fa4959b7e474c2d9c8b857a3ca84e6499e376c69729132"; + version = "0.4.0.0"; + sha256 = "1368b963c500cd2945ef7de890d337066ed99efab8565b1f8825febf4b5ee1b4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -142663,28 +142398,6 @@ self: { }) {}; "rebase" = callPackage - ({ mkDerivation, base, base-prelude, bifunctors, bytestring - , containers, contravariant, contravariant-extras, deepseq, dlist - , either, fail, hashable, mtl, profunctors, scientific - , semigroupoids, semigroups, text, time, transformers - , unordered-containers, uuid, vector, void - }: - mkDerivation { - pname = "rebase"; - version = "1.0.2.1"; - sha256 = "beae3eb88c71e817ebfde0b16ce17875f33cefc1371c3e4c72f5a5feb1c2a69e"; - libraryHaskellDepends = [ - base base-prelude bifunctors bytestring containers contravariant - contravariant-extras deepseq dlist either fail hashable mtl - profunctors scientific semigroupoids semigroups text time - transformers unordered-containers uuid vector void - ]; - homepage = "https://github.com/nikita-volkov/rebase"; - description = "A more progressive alternative to the \"base\" package"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rebase_1_0_3" = callPackage ({ mkDerivation, base, base-prelude, bifunctors, bytestring , containers, contravariant, contravariant-extras, deepseq, dlist , either, fail, hashable, mtl, profunctors, scientific @@ -142704,7 +142417,6 @@ self: { homepage = "https://github.com/nikita-volkov/rebase"; description = "A more progressive alternative to the \"base\" package"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "recaptcha" = callPackage @@ -143715,18 +143427,18 @@ self: { }) {}; "regex-do" = callPackage - ({ mkDerivation, array, base, bytestring, hspec, QuickCheck + ({ mkDerivation, array, base, bytestring, hspec, mtl, QuickCheck , regex-base, regex-pcre, stringsearch, text }: mkDerivation { pname = "regex-do"; - version = "2.6.1"; - sha256 = "bb10301f247b92037562e7fe263e0f443c7076ca03044fe7e938e20136d6533e"; + version = "2.6.2"; + sha256 = "041396ec83639de987378825bf576dce7c52beded82801cc49af43b0a54dc76a"; libraryHaskellDepends = [ - array base bytestring regex-base regex-pcre stringsearch text + array base bytestring mtl regex-base regex-pcre stringsearch text ]; testHaskellDepends = [ - array base bytestring hspec QuickCheck regex-base regex-pcre + array base bytestring hspec mtl QuickCheck regex-base regex-pcre stringsearch text ]; homepage = "https://github.com/ciez/regex-do"; @@ -145516,25 +145228,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "resourcet"; - version = "1.1.8"; - sha256 = "b36c9900ef4d330281b413684bcf13b53036303187dc3ca0f0d83b56152c5c4b"; - libraryHaskellDepends = [ - base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base hspec lifted-base transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_1_8_1" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base , transformers-compat @@ -145551,7 +145244,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -147867,18 +147559,6 @@ self: { }) {}; "safe" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "safe"; - version = "0.3.9"; - sha256 = "d0319ea7b55947e70092f0256aa9f9d2496a93b0e2a0887c0f8eaa0d7fb9b6c9"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/safe#readme"; - description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "safe_0_3_10" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "safe"; @@ -147888,7 +147568,6 @@ self: { homepage = "https://github.com/ndmitchell/safe#readme"; description = "Library of safe (exception free) functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-access" = callPackage @@ -148689,8 +148368,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.2.8"; - sha256 = "b7e68ecae34b6437ece2f340f1260123fa384828e362371a1035620ab8c1ae09"; + version = "2.0.0"; + sha256 = "7babbe1f9716ee17874f2c661285d5a384b8399e279288c6d1237b5f26d061b1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151320,27 +150999,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_4" = callPackage + "servant-auth-cookie_0_4_1" = callPackage ({ mkDerivation, base, base-compat, base64-bytestring - , blaze-builder, blaze-html, blaze-markup, bytestring, cereal - , cookie, cryptonite, data-default, deepseq, exceptions, hspec - , http-api-data, http-media, http-types, memory, mtl, QuickCheck - , servant, servant-blaze, servant-server, tagged, text, time - , transformers, wai, warp + , blaze-builder, blaze-html, blaze-markup, bytestring + , bytestring-conversion, cereal, cookie, cryptonite, data-default + , deepseq, exceptions, hspec, http-media, http-types, memory, mtl + , QuickCheck, servant, servant-blaze, servant-server, tagged, text + , time, transformers, wai, warp }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.4"; - sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1"; + version = "0.4.1"; + sha256 = "d9d59d1204c372068e2de7ccf352982ba17f2dc610f9b1f0bb21048dcf346222"; libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring cereal cookie - cryptonite data-default exceptions http-api-data http-types memory - mtl servant servant-server tagged time transformers wai + base base64-bytestring blaze-builder bytestring + bytestring-conversion cereal cookie cryptonite data-default + exceptions http-types memory mtl servant servant-server tagged time + transformers wai ]; testHaskellDepends = [ - base base-compat blaze-html blaze-markup bytestring cereal - cryptonite data-default deepseq hspec http-api-data http-media mtl - QuickCheck servant servant-blaze servant-server text time wai warp + base base-compat blaze-html blaze-markup bytestring + bytestring-conversion cereal cryptonite data-default deepseq hspec + http-media mtl QuickCheck servant servant-blaze servant-server text + time wai warp ]; description = "Authentication via encrypted cookies"; license = stdenv.lib.licenses.bsd3; @@ -153884,8 +153565,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, doctest, trifecta }: mkDerivation { pname = "show-prettyprint"; - version = "0.1.0.2"; - sha256 = "212012543071bd0d983b003c107dbf551f44331d94ff3429cd53a51815c58c22"; + version = "0.1.2"; + sha256 = "5b9e93c48e91f1c91d3b2fcf214ea085f08292ee36916c324709532a7446e7a6"; libraryHaskellDepends = [ ansi-wl-pprint base trifecta ]; testHaskellDepends = [ base doctest ]; homepage = "https://github.com/quchen/show-prettyprint#readme"; @@ -156294,39 +155975,6 @@ self: { }) {}; "snap-core" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder - , case-insensitive, containers, deepseq, directory, filepath - , hashable, HUnit, io-streams, lifted-base, monad-control, mtl - , old-locale, parallel, QuickCheck, random, readable, regex-posix - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, time, transformers, transformers-base, unix-compat - , unordered-containers, vector, zlib - }: - mkDerivation { - pname = "snap-core"; - version = "1.0.0.0"; - sha256 = "9c35a657fc0debbe9df605d7528ce4645c0b4bc4b94b0134116f6746fe980adb"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers directory filepath HUnit io-streams lifted-base - monad-control mtl old-locale random readable regex-posix text time - transformers transformers-base unix-compat unordered-containers - vector - ]; - testHaskellDepends = [ - attoparsec base bytestring bytestring-builder case-insensitive - containers deepseq directory filepath hashable HUnit io-streams - lifted-base monad-control mtl old-locale parallel QuickCheck random - readable regex-posix test-framework test-framework-hunit - test-framework-quickcheck2 text time transformers transformers-base - unix-compat unordered-containers vector zlib - ]; - homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-core_1_0_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, bytestring-builder , case-insensitive, containers, deepseq, directory, filepath , hashable, HUnit, io-streams, lifted-base, monad-control, mtl @@ -156357,7 +156005,6 @@ self: { homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-cors" = callPackage @@ -156532,42 +156179,6 @@ self: { }) {}; "snap-server" = callPackage - ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder - , bytestring, bytestring-builder, case-insensitive, clock - , containers, deepseq, directory, filepath, HsOpenSSL, http-common - , http-streams, HUnit, io-streams, io-streams-haproxy, lifted-base - , monad-control, mtl, network, old-locale, openssl-streams - , parallel, QuickCheck, random, snap-core, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, threads - , time, transformers, unix, unix-compat, vector - }: - mkDerivation { - pname = "snap-server"; - version = "1.0.1.0"; - sha256 = "a398b15e90d2d6bc77af3edf6f5926df7863073a4774c71a46c0adb43c837488"; - configureFlags = [ "-fopenssl" ]; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring bytestring-builder - case-insensitive clock containers filepath HsOpenSSL io-streams - io-streams-haproxy lifted-base mtl network old-locale - openssl-streams snap-core text time unix unix-compat vector - ]; - testHaskellDepends = [ - attoparsec base base16-bytestring blaze-builder bytestring - bytestring-builder case-insensitive clock containers deepseq - directory filepath HsOpenSSL http-common http-streams HUnit - io-streams io-streams-haproxy lifted-base monad-control mtl network - old-locale openssl-streams parallel QuickCheck random snap-core - test-framework test-framework-hunit test-framework-quickcheck2 text - threads time transformers unix unix-compat vector - ]; - homepage = "http://snapframework.com/"; - description = "A web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "snap-server_1_0_1_1" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock , containers, deepseq, directory, filepath, HsOpenSSL, http-common @@ -158032,25 +157643,6 @@ self: { }) {}; "solga-swagger" = callPackage - ({ mkDerivation, base, bytestring, dlist, http-types - , insert-ordered-containers, lens, mtl, solga, swagger2, text - , unordered-containers - }: - mkDerivation { - pname = "solga-swagger"; - version = "0.1.0.1"; - sha256 = "ceac56b2de41102e739301b5edf60af546e6178f139313681cb46bfb693f765f"; - libraryHaskellDepends = [ - base bytestring dlist http-types insert-ordered-containers lens mtl - solga swagger2 text unordered-containers - ]; - homepage = "https://github.com/chpatrick/solga"; - description = "Swagger generation for Solga"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "solga-swagger_0_1_0_2" = callPackage ({ mkDerivation, base, bytestring, dlist, http-types , insert-ordered-containers, lens, mtl, solga, swagger2, text , unordered-containers @@ -158496,8 +158088,8 @@ self: { }: mkDerivation { pname = "sparse-linear-algebra"; - version = "0.2.1.1"; - sha256 = "7a5c11c8cf52b79e141388583731ec35b74958c681eef57300e82ef507278253"; + version = "0.2.2.0"; + sha256 = "7ef54d3351bd03dadd73797a48aaa629d71deff5a47f2c0e4ea780cdf47b3568"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166822,6 +166414,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-fixture_0_4_2_0" = callPackage + ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl + , template-haskell, th-to-exp, transformers + }: + mkDerivation { + pname = "test-fixture"; + version = "0.4.2.0"; + sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a"; + libraryHaskellDepends = [ base data-default mtl template-haskell ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell th-to-exp + transformers + ]; + homepage = "http://github.com/cjdev/test-fixture#readme"; + description = "Test monadic side-effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -167185,6 +166796,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-simple_0_1_9" = callPackage + ({ mkDerivation, base, executable-path, mtl, process, QuickCheck + , state-plus, template-haskell + }: + mkDerivation { + pname = "test-simple"; + version = "0.1.9"; + sha256 = "eaee79bf997272fe0c97a0cfb80347c760ca5de8ffb0d639ddbf00ba6f6ef51d"; + libraryHaskellDepends = [ + base mtl QuickCheck state-plus template-haskell + ]; + testHaskellDepends = [ + base executable-path mtl process QuickCheck + ]; + description = "Simple Perl inspired testing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "testPkg" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -168302,18 +167932,6 @@ self: { }) {}; "th-expand-syns" = callPackage - ({ mkDerivation, base, containers, syb, template-haskell }: - mkDerivation { - pname = "th-expand-syns"; - version = "0.4.0.0"; - sha256 = "59349f1999d72e4d0158de95c1ede5e8787d4c8c743ec4e6a2dbf37f823a5eea"; - libraryHaskellDepends = [ base containers syb template-haskell ]; - testHaskellDepends = [ base template-haskell ]; - description = "Expands type synonyms in Template Haskell ASTs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-expand-syns_0_4_1_0" = callPackage ({ mkDerivation, base, containers, syb, template-haskell }: mkDerivation { pname = "th-expand-syns"; @@ -168323,7 +167941,6 @@ self: { testHaskellDepends = [ base template-haskell ]; description = "Expands type synonyms in Template Haskell ASTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-extras" = callPackage @@ -168470,22 +168087,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.2"; - sha256 = "ac863234791b0860f7a33adc8656f0026698e1247c5fa4bd13d7befbfddc0204"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_3" = callPackage ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift , th-lift-instances, th-reify-many }: @@ -168499,7 +168100,6 @@ self: { testHaskellDepends = [ base hspec template-haskell ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-printf" = callPackage @@ -169149,8 +168749,8 @@ self: { }: mkDerivation { pname = "tianbar"; - version = "1.2.1.0"; - sha256 = "0ac03b869479eb576caa20bcfd76e2cf61a2cf9fbec61bc2cccbd4f4507e6c61"; + version = "1.2.3.0"; + sha256 = "d6f81bb178bf6a0f836269b13659b068c60c912f5a4d76e86be3228ca15168b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171259,22 +170859,6 @@ self: { }) {}; "transient" = callPackage - ({ mkDerivation, base, containers, directory, mtl, random, stm - , time, transformers - }: - mkDerivation { - pname = "transient"; - version = "0.4.4"; - sha256 = "da8d580e5fab1d43d791dbcc193fbe028925efdfb1b4bbcd017bccddff4dc382"; - libraryHaskellDepends = [ - base containers directory mtl random stm time transformers - ]; - homepage = "http://www.fpcomplete.com/user/agocorona"; - description = "Making composable programs with multithreading, events and distributed computing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "transient_0_4_4_1" = callPackage ({ mkDerivation, base, containers, directory, mtl, random, stm , time, transformers }: @@ -171288,7 +170872,6 @@ self: { homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Making composable programs with multithreading, events and distributed computing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transient-universe" = callPackage @@ -177186,19 +176769,6 @@ self: { }) {}; "vector-binary-instances" = callPackage - ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: - mkDerivation { - pname = "vector-binary-instances"; - version = "0.2.3.2"; - sha256 = "e42cf4c80a69c6d661c6be152d43b39291fe22e7e55f4694709266692b50e049"; - libraryHaskellDepends = [ base binary vector ]; - testHaskellDepends = [ base binary tasty tasty-quickcheck vector ]; - homepage = "https://github.com/bos/vector-binary-instances"; - description = "Instances of Data.Binary and Data.Serialize for vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-binary-instances_0_2_3_3" = callPackage ({ mkDerivation, base, binary, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "vector-binary-instances"; @@ -177209,7 +176779,6 @@ self: { homepage = "https://github.com/bos/vector-binary-instances"; description = "Instances of Data.Binary and Data.Serialize for vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-buffer" = callPackage @@ -179925,37 +179494,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.8"; - sha256 = "09de2d19cf0d1af8afe9f96e916aa7dafda82ddab3258fdec31963db81c2cf3c"; - libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers ghc-prim hashable - http-date http-types http2 iproute network simple-sendfile stm - streaming-commons text unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck silently - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_2_9" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder , bytestring, bytestring-builder, case-insensitive, containers , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date @@ -179984,7 +179522,6 @@ self: { homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -181883,29 +181420,6 @@ self: { }) {}; "wordpass" = callPackage - ({ mkDerivation, base, containers, deepseq, directory, filepath - , hflags, random-fu, random-source, text, unix-compat, vector - }: - mkDerivation { - pname = "wordpass"; - version = "1.0.0.6"; - sha256 = "ef8888709fe0f0146b6cf3739191b4ca1c5df10f77a70da15d88deed1e925a37"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers deepseq directory filepath random-fu random-source - text unix-compat vector - ]; - executableHaskellDepends = [ - base containers deepseq directory filepath hflags random-fu - random-source text unix-compat vector - ]; - homepage = "https://github.com/mgajda/wordpass"; - description = "Dictionary-based password generator"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wordpass_1_0_0_7" = callPackage ({ mkDerivation, base, containers, deepseq, directory, filepath , hflags, random-fu, random-source, text, unix-compat, vector }: @@ -181926,7 +181440,6 @@ self: { homepage = "https://github.com/mgajda/wordpass"; description = "Dictionary-based password generator"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "words" = callPackage @@ -185222,30 +184735,6 @@ self: { }) {}; "yesod" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , conduit-extra, data-default, directory, fast-logger - , monad-control, monad-logger, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, transformers, unix - , unordered-containers, wai, wai-extra, wai-logger, warp, yaml - , yesod-auth, yesod-core, yesod-form, yesod-persistent - }: - mkDerivation { - pname = "yesod"; - version = "1.4.3"; - sha256 = "13655ed28102b30f32a34fb1b30cf20c1d9bbd9f6f1c89f96643ea6d7bba74a3"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring conduit-extra - data-default directory fast-logger monad-control monad-logger safe - semigroups shakespeare streaming-commons template-haskell text - transformers unix unordered-containers wai wai-extra wai-logger - warp yaml yesod-auth yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod_1_4_3_1" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , conduit, conduit-extra, data-default, directory, fast-logger , monad-control, monad-logger, resourcet, safe, semigroups @@ -185269,7 +184758,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-angular" = callPackage @@ -185808,46 +185296,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , data-default, deepseq, deepseq-generics, directory, exceptions - , fast-logger, hspec, hspec-expectations, http-types, HUnit - , lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.25"; - sha256 = "929b881c3bddf7f868ba44d8aed72e36163affb6f455dd0f4669c8451fe6c46b"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_26" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -185885,7 +185333,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage From fcb6a18f374387498e7f892ade444527ae93e5ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 15 Nov 2016 09:50:43 +0100 Subject: [PATCH 068/107] haskell-http-api-data: fix reference in configuration-common.nix --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 37bc19a2b21e..095555bfec40 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1018,14 +1018,14 @@ self: super: { # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version # is hard because of transitive dependencies, so we just disable tests. - http-api-data_0_3_2 = dontCheck super.http-api-data_0_3_2; + http-api-data_0_3_3 = dontCheck super.http-api-data_0_3_3; # Fix build for latest versions of servant and servant-client. servant_0_9_1_1 = super.servant_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_2; + http-api-data = self.http-api-data_0_3_3; }); servant-client_0_9_1_1 = super.servant-client_0_9_1_1.overrideScope (self: super: { - http-api-data = self.http-api-data_0_3_2; + http-api-data = self.http-api-data_0_3_3; servant-server = self.servant-server_0_9_1_1; servant = self.servant_0_9_1_1; }); From 0f51eb58ee53c25f469ffa37532e943b67ff91b5 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:25:19 +0200 Subject: [PATCH 069/107] rustc, cargo: 1.12.1 -> 1.13.0, 0.13.0 -> 0.14.0 --- pkgs/development/compilers/rust/bootstrap.nix | 12 ++++++------ pkgs/development/compilers/rust/default.nix | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index 454b67b8151b..b912a9d7933c 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -14,16 +14,16 @@ let then "x86_64-apple-darwin" else abort "missing boostrap url for platform ${stdenv.system}"; - # fetch hashes by running `print-hashes.sh 1.9.0` + # fetch hashes by running `print-hashes.sh 1.12.1` bootstrapHash = if stdenv.system == "i686-linux" - then "f5a3f5d53defe827a71447b1a0e7a656394b87ee23e009d7bf73a0277c1b5ac2" + then "ede9b9d14d1ddbc29975d1ead73fcf2758719b4b371363afe1c32eb8d6e96bb3" else if stdenv.system == "x86_64-linux" - then "f4ebbd6d9494cb8fa6c410cb58954e1913546c2bca8963faebc424591547d83f" + then "9e546aec13e389429ba2d86c8f4e67eba5af146c979e4faa16ffb40ddaf9984c" else if stdenv.system == "i686-darwin" - then "bf07182bc362985fcdd48af905cdb559e20c68518cd71dabec3c30b78ca8a94a" + then "2648645c4fe1ecf36beb7de63501dd99e9547a7a6d5683acf2693b919a550b69" else if stdenv.system == "x86_64-darwin" - then "2cdbc47438dc86ecaf35298317b77d735956eb160862e3f6d0fda0da656ecc35" + then "0ac5e58dba3d24bf09dcc90eaac02d2df053122b0def945ec4cfe36ac6d4d011" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.11.0"; + version = "1.12.1"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index 7e29435b7d59..dd2d47e940d1 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.12.1"; + shortVersion = "1.13"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "d4f39402a0c2c2b94ec0375cd7f7f6d7918113cd"; - srcSha = "1lpykjy96rwz4jy28rf7ijca0q9lvckgnbzvcdsrspd5rs2ywfwr"; + srcRev = "2c6933acc05c61e041be764cb1331f6281993f3f"; + srcSha = "1w0alyyc29cy2lczrqvg1kfycjxy0xg8fpzdac80m88fxpv23glp"; patches = [ ./patches/disable-lockfile-check.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.13.0"; - srcRev = "109cb7c33d426044d141457049bd0fffaca1327c"; - srcSha = "0p79m7hpzjh36l4fc6a59h6r8yz6qafjcdg5v1yb7bac9m2wi7vs"; - depsSha256 = "1cwp4p8b985fj8j2qmgsi2mpp51rdpwzm9qa60760nrry1fy624z"; + version = "0.14.0"; + srcRev = "eca9e159b6b0d484788ac757cf23052eba75af55"; + srcSha = "1zm5rzw1mvixnkzr4775pcxx6k235qqxbysyp179cbxsw3dm045s"; + depsSha256 = "0gpn0cpwgpzwhc359qn6qplx371ag9pqbwayhqrsydk1zm5bm3zr"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo From 24065c91c01c843cabb45401e8b0e5fcba2f53fe Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:26:36 +0200 Subject: [PATCH 070/107] rustRegistry: 2016-10-29 -> 2016-11-15 --- 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 332fe71f64fa..bea2cb41a69f 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-10-29"; - rev = "623cc0d9328bfb949b54209443f2b4f06c41961e"; - sha256 = "1jyb0ixnrxb7m0c18p6yfi6x8rsy3yz5yc3nyz9f462fr4g6azcs"; + version = "2016-11-15"; + rev = "4ed749b5a45d596e59c454e6ffc27177bd93a221"; + sha256 = "09vw8lbwm34qp9amxzb4a2nvxzz0aaw4sas0qkay7gh4ryy5wflk"; src = fetchFromGitHub { inherit rev; From 535f26a9e9e9854c9f1502acc770b0d3dd73a133 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:26:59 +0200 Subject: [PATCH 071/107] rustfmt: 0.6.0 -> 0.6.2 --- pkgs/development/tools/rust/rustfmt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 32a4eafc02c7..335c469e0c1d 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -4,20 +4,20 @@ with rustPlatform; buildRustPackage rec { name = "rustfmt-${version}"; - version = "0.6"; + version = "0.6.2"; src = fetchFromGitHub { owner = "rust-lang-nursery"; repo = "rustfmt"; - rev = "d022f05f340b9aa4956ca315f5e424a6d3ab3248"; - sha256 = "1w6ll3802061wbggqhk31pmzws423qm7jc4hyxk8a6pf9ksp0nk5"; + rev = "4418fab4f24e6497aa2a1f71bb4cf963c2971a28"; + sha256 = "0x2kg2sqpj4lsqqskcy5p0w3264f0by1irkjj369ch89xax7l52l"; }; - depsSha256 = "13rrhgzxxx5gwpwvyxw03m5xng9c1xyaycmqpi123ma3ps5822jf"; + depsSha256 = "022mwggmy6p9n8dh22y6m3sadrwvwlbpj9w9ki9avmgsm3cj2mhs"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; - homepage = https://github.com/nrc/rustfmt; + homepage = https://github.com/rust-lang-nursery/rustfmt; license = with licenses; [ mit asl20 ]; maintainers = [ maintainers.globin ]; platforms = platforms.all; From e2eec8f43608e88403558f48ad650b3def11ac94 Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:27:12 +0200 Subject: [PATCH 072/107] exa: mark as broken --- pkgs/tools/misc/exa/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 0e3922d2928a..d26eb8f45aea 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -36,5 +36,6 @@ buildRustPackage rec { homepage = http://bsago.me/exa; license = licenses.mit; maintainer = [ maintainers.ehegnes ]; + broken = true; }; } From 87e07a3098e90730e6e1267d3da735c517c0f1aa Mon Sep 17 00:00:00 2001 From: Tadas Barzdzius Date: Wed, 16 Nov 2016 13:27:24 +0200 Subject: [PATCH 073/107] tokei: mark as broken --- pkgs/development/tools/misc/tokei/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 212ebd9c967d..9059d4ba718a 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -23,5 +23,6 @@ buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ gebner ]; platforms = platforms.all; + broken = true; }; } From 2034ffdc07ca93549a38cfba2e8cbd79c30d511c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Nov 2016 13:02:37 +0100 Subject: [PATCH 074/107] dpkg: 1.18.14 -> 1.18.15 --- pkgs/tools/package-management/dpkg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix index c1d4cd319b8f..103ef8d77765 100644 --- a/pkgs/tools/package-management/dpkg/default.nix +++ b/pkgs/tools/package-management/dpkg/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "dpkg-${version}"; - version = "1.18.14"; + version = "1.18.15"; src = fetchurl { url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz"; - sha256 = "0njd8pdq1vx70sjlgymi79lijg05fmd8vxnqndzhjjb0a8cf920p"; + sha256 = "0wd3rl1wi2d22jyavxg1ljzkymilg7p338y0c0ql0fcw7djkdsdf"; }; configureFlags = [ From e3a7fc3905bc7c9596b4d866f58684cdeb6e92ce Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Nov 2016 13:32:25 +0100 Subject: [PATCH 075/107] eid-mw: 4.1.18 -> 4.1.19 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 5ee630539b69..f26b2d3308b7 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "eid-mw-${version}"; - version = "4.1.18"; + version = "4.1.19"; src = fetchFromGitHub { - sha256 = "049rxrlcwcb9yir8q2inmqlslp49alpgm4pccl138xl34cg1hyhl"; + sha256 = "191c74kxfrfb894v8y4vi2iygyffjy9jjq5fj7cnnddgwai5n3c5"; rev = "v${version}"; repo = "eid-mw"; owner = "Fedict"; From 77cdbb9e3af9fcdd6edafa74695f6b00bdd89748 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 14:18:21 +0100 Subject: [PATCH 076/107] pythonPackages.cryptography: 1.5.1 -> 1.5.3 --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f28194d95ed..93913bbf54d4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4307,11 +4307,11 @@ in { cryptography = buildPythonPackage rec { # also bump cryptography_vectors name = "cryptography-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "1d8da8xbx51m4dqpy51crvcmjakmfcxpx14hh2izppifrh1fs35d"; + sha256 = "cf82ddac919b587f5e44247579b433224cc2e03332d2ea4d89aa70d7e6b64ae5"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -4328,11 +4328,11 @@ in { cryptography_vectors = buildPythonPackage rec { # also bump cryptography name = "cryptography_vectors-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "1z74mqwlvxlxz6b1xlflphqhgby1k77shl94zw5ncw3x3cqwbccl"; + sha256 = "e513fecd146a844da19022abd1b4dfbf3335c1941464988f501d7a16f30acdae"; }; }; From a45315500e7a1897d24767581184d448d54d1f83 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 16 Nov 2016 14:56:09 +0100 Subject: [PATCH 077/107] pythonPackages.slixmpp: 1.1 -> 1.2.1 --- pkgs/top-level/python-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9f28194d95ed..c86e554b3597 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15197,15 +15197,20 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.1"; + version = "1.2.1"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "030ca7e71cbb7e17fb48f83db97779fdbac0b4424cef01245f3276a110b30a6c"; + sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9"; }; + patchPhase = '' + substituteInPlace slixmpp/thirdparty/gnupg.py \ + --replace "gpgbinary='gpg'" "gpgbinary='${pkgs.gnupg1}/bin/gpg'" + ''; + propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules]; meta = { From f7558d07dfaf1fe9f89126902a1fcbba27383b58 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 16 Nov 2016 14:57:15 +0100 Subject: [PATCH 078/107] poezio: 0.9 -> 0.10 --- .../poezio/fix_gnupg_import.patch | 12 +++ .../poezio/fix_plugins_imports.patch | 80 +++++++++++++++++++ .../poezio/make_default_config_writable.patch | 25 ------ pkgs/top-level/python-packages.nix | 28 +++---- 4 files changed, 106 insertions(+), 39 deletions(-) create mode 100644 pkgs/development/python-modules/poezio/fix_gnupg_import.patch create mode 100644 pkgs/development/python-modules/poezio/fix_plugins_imports.patch delete mode 100644 pkgs/development/python-modules/poezio/make_default_config_writable.patch diff --git a/pkgs/development/python-modules/poezio/fix_gnupg_import.patch b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch new file mode 100644 index 000000000000..d75e09b722bf --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_gnupg_import.patch @@ -0,0 +1,12 @@ +diff -Nur poezio-0.10.orig/plugins/gpg/__init__.py poezio-0.10/plugins/gpg/__init__.py +--- poezio-0.10.orig/plugins/gpg/__init__.py 2016-07-27 19:02:41.000000000 +0200 ++++ poezio-0.10/plugins/gpg/__init__.py 2016-11-16 14:17:06.011128631 +0100 +@@ -105,7 +105,7 @@ + .. _XEP-0027: http://xmpp.org/extensions/xep-0027.html + + """ +-from gpg import gnupg ++import slixmpp.thirdparty.gnupg as gnupg + from slixmpp.xmlstream.stanzabase import JID + + from xml.etree import cElementTree as ET diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch new file mode 100644 index 000000000000..821b9c41588a --- /dev/null +++ b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch @@ -0,0 +1,80 @@ +diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py +--- poezio-0.10.orig/plugins/canat.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/canat.py 2016-11-16 14:32:21.565445266 +0100 +@@ -34,9 +34,9 @@ + + + """ +-from plugin import BasePlugin +-import tabs +-from decorators import command_args_parser ++from poezio.plugin import BasePlugin ++import poezio.tabs ++from poezio.decorators import command_args_parser + + def move(text, step, spacing): + new_text = text + (" " * spacing) +diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py +--- poezio-0.10.orig/plugins/corrections_diff.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/corrections_diff.py 2016-11-16 14:30:53.992684959 +0100 +@@ -22,11 +22,11 @@ + + + """ +-from plugin import BasePlugin ++from poezio.plugin import BasePlugin + import difflib ++import collections + from functools import wraps +-import tabs +-from config import config ++from poezio.config import config + + shim_message_fields = ('txt nick_color time str_time nickname user identifier' + ' highlight me old_message revisions jid ack') +@@ -61,10 +61,6 @@ + rev -= 1 + return ''.join(acc) + +-Message.__repr__ = repr_message +-Message.__str__ = repr_message +- +- + + def corrections_enabled(func): + @wraps(func) +diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py +--- poezio-0.10.orig/plugins/coucou.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/coucou.py 2016-11-16 14:25:37.101337668 +0100 +@@ -1,4 +1,4 @@ +-from plugin import BasePlugin ++from poezio.plugin import BasePlugin + import tracemalloc + import cProfile, pstats, io + +diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py +--- poezio-0.10.orig/plugins/flood.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/flood.py 2016-11-16 14:32:56.452155220 +0100 +@@ -1,6 +1,6 @@ +-from plugin import BasePlugin +-import tabs +-import multiuserchat as muc ++from poezio.plugin import BasePlugin ++import poezio.tabs ++import poezio.multiuserchat as muc + + class Plugin(BasePlugin): + def init(self): +diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py +--- poezio-0.10.orig/plugins/invisible.py 2016-08-21 14:56:35.000000000 +0200 ++++ poezio-0.10/plugins/invisible.py 2016-11-16 14:31:31.743288152 +0100 +@@ -20,8 +20,7 @@ + .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html + """ + +-from plugin import BasePlugin +-import tabs ++from poezio.plugin import BasePlugin + + class Plugin(BasePlugin): + def init(self): diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch deleted file mode 100644 index 03d732e256c4..000000000000 --- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN a/src/config.py b/src/config.py ---- a/src/config.py 2015-07-31 19:35:37.000000000 +0000 -+++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000 -@@ -14,6 +14,7 @@ - - import logging.config - import os -+import stat - import sys - import pkg_resources - -@@ -563,6 +564,13 @@ - copy2(default, options.filename) - elif path.isfile(other): - copy2(other, options.filename) -+ -+ # Inside the nixstore, the reference file is readonly, so is the copy. -+ # Make it writable by the user who just created it. -+ if os.path.exists(options.filename): -+ os.chmod(options.filename, -+ os.stat(options.filename).st_mode | stat.S_IWUSR) -+ - global firstrun - firstrun = True - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c86e554b3597..bb2188508645 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29371,29 +29371,29 @@ in { }; }; - poezio = buildPythonPackage rec { + poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.9"; + version = "0.10"; - namePrefix = ""; disabled = pythonOlder "3.4"; buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ]; - - checkPhase = '' - PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}/poezio" make test - ''; - - patches = - let patch_base = ../development/python-modules/poezio; - in [ "${patch_base}/make_default_config_writable.patch" ]; + propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/91/${name}.tar.xz"; - sha256 = "1vc7zn4rp0ds0cdh1xcmbwx6w2qh4pnpzi5mdnj3rpl7xdr6jqzi"; + url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz"; + sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn"; }; + patches = [ + ../development/python-modules/poezio/fix_gnupg_import.patch + ../development/python-modules/poezio/fix_plugins_imports.patch + ]; + + checkPhase = '' + py.test + ''; + meta = { description = "Free console XMPP client"; homepage = http://poez.io; From 45f579b9e71a9e0b0ec9f1e0fba52d9d3e0c0f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 16 Nov 2016 15:14:08 +0100 Subject: [PATCH 079/107] allowUnfree: mention the solution that works for nix-shell as well --- pkgs/stdenv/generic/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index edd5c2785dcf..bd35970e0d12 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -139,7 +139,7 @@ let { nixpkgs.config.allow${up reason} = true; } in configuration.nix to override this. - b) For `nix-env`, `nix-build` or any other Nix command you can add + b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allow${up reason} = true; } to ~/.nixpkgs/config.nix. '')); From 2a3d552c55bff401625ff30c521c1221182db5a8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 16:15:59 +0100 Subject: [PATCH 080/107] pythonPackages.ipykernel: 4.5.0 -> 4.5.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93913bbf54d4..16cf17d6b625 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12731,12 +12731,12 @@ in { }; ipykernel = buildPythonPackage rec { - version = "4.5.0"; + version = "4.5.1"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "245a798edb8fd751b95750d8645d736dd739a020e7fc7d5627dac4d1c35d8295"; + sha256 = "520c855c6652651c6796a3dd8bc89d533023ac65c5ccf812908187d6f0e461da"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; From efaf3358dbf1e7baf9737ba1c90054dfb349c9e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 16:16:15 +0100 Subject: [PATCH 081/107] pythonPackages.traitlets: 4.2.2 -> 4.3.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16cf17d6b625..5962bba407f3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24935,12 +24935,12 @@ in { }; traitlets = buildPythonPackage rec { - version = "4.2.2"; + version = "4.3.1"; name = "traitlets-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/traitlets/${name}.tar.gz"; - sha256 = "7d7e3070484b2fe490fa55e0acf7023afc5ed9ddabec57405f25c355158e152a"; + sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; }; buildInputs = with self; [ nose mock ]; From e237791fd498779ffbe28ff54ddf83c2506db9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:23:54 +0100 Subject: [PATCH 082/107] pythonPackages.qrcode: 5.1 -> 5.3 works with python3 now --- pkgs/top-level/python-packages.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4537e1222a8..0494df1989e1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25126,17 +25126,13 @@ in { qrcode = buildPythonPackage rec { name = "qrcode-${version}"; - version = "5.1"; + version = "5.3"; src = pkgs.fetchurl { url = "mirror://pypi/q/qrcode/${name}.tar.gz"; - sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k"; + sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; }; - # Errors in several tests: - # TypeError: must be str, not bytes - disabled = isPy3k; - propagatedBuildInputs = with self; [ six pillow ]; meta = { From 67f3e2853b9ea07d6a0cc98344b98d0dc0fcec47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 16 Nov 2016 16:49:24 +0100 Subject: [PATCH 083/107] create-amis.sh: use nix-shell for convenience --- nixos/maintainers/scripts/ec2/create-amis.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index e26caa191643..8b7db7b30a64 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -1,4 +1,8 @@ -#! /bin/sh -e +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p qemu awscli ec2_ami_tools jq + +# To start with do: nix-shell -p awscli --run "aws configure" + set -o pipefail #set -x From a60a584cb6ebcc9da2ae74e672dd537117849f10 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 16 Nov 2016 15:37:57 +0000 Subject: [PATCH 084/107] terraform: 0.7.10 -> 0.7.11 --- pkgs/applications/networking/cluster/terraform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 1c5f13ad8973..1c481adcf1ea 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.10"; + version = "0.7.11"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "187hcnrjdysqzjlkj73fpvhi90zmkfkz1fy7g4fx78i1zxqiabz8"; + sha256 = "0rmzhf2rwxci57ll5nv2vvmic9cn64dbbg1fb5g78njljzpsc5qw"; }; postInstall = '' From 3d2e46e7ad093ae62a89852a17f8946e0810b00f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:55:36 +0100 Subject: [PATCH 085/107] pythonPackages.pymaging: init at 2016-11-16 --- pkgs/top-level/python-packages.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0494df1989e1..454d9448c480 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1067,7 +1067,7 @@ in { license = licenses.free; }; } else null; - + funcsigs = buildPythonPackage rec { name = "funcsigs-1.0.2"; @@ -14410,7 +14410,7 @@ in { broken = true; }; }; - + mock = buildPythonPackage (rec { name = "mock-2.0.0"; @@ -20953,6 +20953,24 @@ in { }; }; + pymaging = buildPythonPackage rec { + name = "pymaging-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging"; + rev = "596a08fce5664e58d6e8c96847393fbe987783f2"; + sha256 = "18g3n7kfrark30l4vzykh0gdbnfv5wb1zvvjbs17sj6yampypn38"; + }; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = http://pymaging.rtfd.org; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + pyPdf = buildPythonPackage rec { name = "pyPdf-1.13"; From ac8b3165b6bfe10bf246efe2d1a4bb24e3f863b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:56:11 +0100 Subject: [PATCH 086/107] pythonPackages.pymaging_png: init at 2016-11-16 --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 454d9448c480..0728ed47b1ea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20971,6 +20971,26 @@ in { }; }; + pymaging_png = buildPythonPackage rec { + name = "pymaging-png-unstable-2016-11-16"; + + src = pkgs.fetchFromGitHub { + owner = "ojii"; + repo = "pymaging-png"; + rev = "83d85c44e4b2342818e6c068065e031a9f81bb9f"; + sha256 = "1mknxvsq0lr1ffm8amzm3w2prn043c6ghqgpxlkw83r988p5fn57"; + }; + + propagatedBuildInputs = with self; [ pymaging ]; + + meta = { + description = "Pure Python imaging library with Python 2.6, 2.7, 3.1+ support"; + homepage = https://github.com/ojii/pymaging-png/; + license = licenses.mit; + maintainers = with maintainers; [ mic92 ]; + }; + }; + pyPdf = buildPythonPackage rec { name = "pyPdf-1.13"; From 2b31fecfd8b8f5ac0747915acd2c6ff308f22750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 16 Nov 2016 16:56:50 +0100 Subject: [PATCH 087/107] pythonPackages.qrcode: fix dependencies this also fix tests for python3 --- 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 0728ed47b1ea..9837eecd737e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -25171,7 +25171,7 @@ in { sha256 = "0kljfrfq0c2rmxf8am57333ia41kd0snbm2rnqbdy816hgpcq5a1"; }; - propagatedBuildInputs = with self; [ six pillow ]; + propagatedBuildInputs = with self; [ six pillow pymaging_png ]; meta = { description = "Quick Response code generation for Python"; From 0bf515c97311a12251d1a33788d31c86cd338e96 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Nov 2016 08:53:45 -0800 Subject: [PATCH 088/107] emacs: Depend on libselinux only for Linux --- pkgs/applications/editors/emacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 4f62d0963c03..7ba52dd34c43 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { ++ lib.optionals srcRepo [ autoconf automake texinfo ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext libselinux ] - ++ lib.optional stdenv.isLinux dbus + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + ++ lib.optional stdenv.isLinux [ dbus libselinux ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] From c4d2d56f22ea4ada899cd26141b774112b6bfdf7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 16 Nov 2016 08:54:30 -0800 Subject: [PATCH 089/107] emacs: Missed a pluralization... --- pkgs/applications/editors/emacs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 7ba52dd34c43..aacc3f9e7927 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] - ++ lib.optional stdenv.isLinux [ dbus libselinux ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] From 0736bd2c539f4295bad38517ec389748a5635edd Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Nov 2016 12:04:41 -0500 Subject: [PATCH 090/107] mariadb: 10.1.18 -> 10.1.19 --- pkgs/servers/sql/mariadb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 422715925b88..f50a97afd20d 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -15,11 +15,11 @@ mariadb = everything // { }; common = rec { # attributes common to both builds - version = "10.1.18"; + version = "10.1.19"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "0wrvhyck95czhz553834i9im7ljvn8k2byakcinlji7zx43njcyp"; + sha256 = "108s4mimdbmgmmn5pcr9a405j70cyny9adzv49s75lg22krp74sv"; }; prePatch = '' From 9c3eae488ef6f70da8b2fcf6d2f800bdba7d2d11 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Nov 2016 12:14:27 -0500 Subject: [PATCH 091/107] opera: 40.0.2308.90 -> 41.0.2353.56 --- pkgs/applications/networking/browsers/opera/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 0c6d36b3818d..0edd982f0f75 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -36,7 +36,7 @@ let mirror = https://get.geo.opera.com/pub/opera/desktop; - version = "40.0.2308.90"; + version = "41.0.2353.56"; rpath = stdenv.lib.makeLibraryPath [ @@ -89,12 +89,12 @@ in stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_i386.deb"; - sha256 = "1fqbxbn4531yv9figgg8xxr63swimrgpamqrphcg8jq5q3smrk4k"; + sha256 = "0qjkhadlpn5c20wm66hm7rn12kdk4bh2plfgpfkzp85jmsjdxri5"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "${mirror}/${version}/linux/opera-stable_${version}_amd64.deb"; - sha256 = "12imzjxwip9r7bjyfnrpdsxyxb0cjn92s3b7ajdlbqccxxmc6k6g"; + sha256 = "1f3slbydxkk15banjbm7d8602l3vxy834ijsdqpyj0ckc5mw0g9y"; } else throw "Opera is not supported on ${stdenv.system} (only i686-linux and x86_64 linux are supported)"; From 6f2b2daccf2735a72b51c9ac46fab7008bbb3f1c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 16 Nov 2016 12:52:07 -0500 Subject: [PATCH 092/107] libgit2: 0.24.2 -> 0.24.3 --- pkgs/development/libraries/git2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index c4487dca5977..2bd500b9efbc 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, cmake, zlib, python, libssh2, openssl, curl, http-parser, libiconv }: stdenv.mkDerivation (rec { - version = "0.24.2"; + version = "0.24.3"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "0avijw83vfx64cn23vx2j1h14zmkx8silgjnq6q2qw2z3sh73hs1"; + sha256 = "01jdp0i0nxhx8w2gjd75mwfy1d4z2c5xzz7q5jfypa6pkdi86dmh"; }; # TODO: `cargo` (rust's package manager) surfaced a serious bug in From d3e54d71c1c4e73dfb2b767068d32c3f44717c7f Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 16 Nov 2016 18:42:33 +0100 Subject: [PATCH 093/107] debian_devscripts: 2.16.6 -> 2.16.8 --- pkgs/tools/misc/debian-devscripts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix index ece9c5ed3824..2fe9ec2fbe79 100644 --- a/pkgs/tools/misc/debian-devscripts/default.nix +++ b/pkgs/tools/misc/debian-devscripts/default.nix @@ -8,12 +8,12 @@ let inherit (python3Packages) python setuptools; in stdenv.mkDerivation rec { - version = "2.16.6"; + version = "2.16.8"; name = "debian-devscripts-${version}"; src = fetchurl { url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz"; - sha256 = "0lkhilwb1gsnk8q14wkrl78s0w3l8aghsaz00vprmkmcc3j1x14h"; + sha256 = "0xy1nvqrnifx46g8ch69pk31by0va6hn10wpi1fkrsrgncanjjh1"; }; buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile From 16e511fe2d7871efd56fd39e2d3e34355b61b629 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 16 Nov 2016 19:31:49 +0100 Subject: [PATCH 094/107] pythonPackages.traitlets: fix tests --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3dda442d206c..13b5f0a91053 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -24948,11 +24948,13 @@ in { sha256 = "ba8c94323ccbe8fd792e45d8efe8c95d3e0744cc8c085295b607552ab573724c"; }; - buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ipython_genutils decorator]; + LC_ALL = "en_US.UTF-8"; + + buildInputs = with self; [ pkgs.glibcLocales pytest mock ]; + propagatedBuildInputs = with self; [ipython_genutils decorator enum34]; checkPhase = '' - nosetests -v + py.test $out ''; meta = { From f3dbb0892c7f3bc4e9605e428b4292a451de0501 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 5 Nov 2016 20:13:04 +0100 Subject: [PATCH 095/107] freeglut: Use multiple outputs --- pkgs/development/libraries/freeglut/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 4135c451eebc..6737e059b212 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -9,16 +9,20 @@ in stdenv.mkDerivation { sha256 = "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra"; }; - buildInputs = [ libXi libXrandr libXxf86vm mesa xlibsWrapper cmake ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${mesa}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa}/lib/libGLU.dylib" + "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Create and manage windows containing OpenGL contexts"; longDescription = '' From f66271238eeaa740f02615579d33eab96073fe0a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 5 Nov 2016 20:17:42 +0100 Subject: [PATCH 096/107] libdevil: Use multiple outputs --- pkgs/development/libraries/libdevil/default.nix | 14 ++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 3b63ba98f572..68bd72f3e0f5 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,12 +1,10 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa -, libX11, pkgconfig - -, OpenGL +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu +, libX11, pkgconfig, OpenGL }: stdenv.mkDerivation rec { - name ="libdevil-${version}"; + name = "libdevil-${version}"; version = "1.7.8"; src = fetchurl { @@ -14,7 +12,9 @@ stdenv.mkDerivation rec { sha256 = "1zd850nn7nvkkhasrv7kn17kzgslr5ry933v6db62s4lr0zzlbv8"; }; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa libX11 ] + outputs = [ "out" "dev" ]; + + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; @@ -40,6 +40,8 @@ stdenv.mkDerivation rec { ./il_endian.h.patch ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = http://openil.sourceforge.net/; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c498628cb7b..35eee630c28a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7685,7 +7685,7 @@ in libdevil-nox = libdevil.override { libX11 = null; - mesa = null; + mesa_noglu = null; }; libdigidoc = callPackage ../development/libraries/libdigidoc { }; From 69bea26ea9a6ec97927f45bea78f2148325c2cd9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Nov 2016 23:34:51 +0100 Subject: [PATCH 097/107] sddm: Enable user switching It was lacking the dbus configuration to bind to org.freedesktop.DisplayManager, and it was passing fixed TTY/display numbers to the X server (see 9be012f0d4d9b6bca35416ec89d5a40be4556896). --- nixos/modules/services/x11/display-managers/sddm.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 36daf55a36a5..dda8d0f7629e 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -27,7 +27,6 @@ let ${cfg.stopScript} ''; - cfgFile = pkgs.writeText "sddm.conf" '' [General] HaltCommand=${pkgs.systemd}/bin/systemctl poweroff @@ -47,7 +46,7 @@ let HideShells=/run/current-system/sw/bin/nologin [X11] - MinimumVT=${toString xcfg.tty} + MinimumVT=${toString (if xcfg.tty != null then xcfg.tty else 7)} ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr SessionCommand=${dmcfg.session.script} @@ -254,5 +253,10 @@ in users.extraGroups.sddm.gid = config.ids.gids.sddm; + services.dbus.packages = [ sddm.unwrapped ]; + + # To enable user switching, allow sddm to allocate TTYs/displays dynamically. + services.xserver.tty = null; + services.xserver.display = null; }; } From 72d410fc74dd1d78af074a045859166c52dc8fad Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:15:50 +0100 Subject: [PATCH 098/107] pecita: 5.3 -> 5.4 --- pkgs/data/fonts/pecita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix index c8f7717103bc..7650c13961ee 100644 --- a/pkgs/data/fonts/pecita/default.nix +++ b/pkgs/data/fonts/pecita/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pecita-${version}"; - version = "5.3"; + version = "5.4"; src = fetchurl { url = "http://archive.rycee.net/pecita/${name}.tar.xz"; - sha256 = "1glr21gi1b9db17ln8qn4zk9gwpxs0frm76i4hp3anlpivbwiis8"; + sha256 = "1cqzj558ldzzsbfbvlwp5fjh2gxa03l16dki0n8z5lmrdq8hrkws"; }; phases = ["unpackPhase" "installPhase"]; From b25f9ff20eb9fc24716fdff15944ec289a0af9a4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:45:45 +0100 Subject: [PATCH 099/107] mimeo: 2016.2 -> 2016.11 --- pkgs/tools/misc/mimeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix index 66e91ed14240..aff329e04b69 100644 --- a/pkgs/tools/misc/mimeo/default.nix +++ b/pkgs/tools/misc/mimeo/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { name = "mimeo-${version}"; - version = "2016.2"; + version = "2016.11"; src = fetchurl { url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz"; - sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1"; + sha256 = "1yygdxqnkh506fknxsp9xa3rnxn0901dzqc7c7qjjj80lk6xnfxb"; }; buildInputs = [ file desktop_file_utils ]; From 38de6ed18e879c01324299f39c28b54725d0fb9c Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:50:44 +0100 Subject: [PATCH 100/107] gmic: 1.7.7 -> 1.7.8 --- pkgs/tools/graphics/gmic/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 606e049703df..ccee4f213141 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng }: +{ stdenv, fetchurl, fftw, zlib, libjpeg, libtiff, libpng, pkgconfig }: stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.7"; + version = "1.7.8"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "0shcxgq8nc391c0y0zh3l87g3p7fvsmgshi1x1jvvwwq1b9nf6vp"; + sha256 = "1921s0n2frj8q95l8lm8was64cypnychgcgcavx9q8qljzbk4brs"; }; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ fftw zlib libjpeg libtiff libpng ]; sourceRoot = "${name}/src"; From 4b6770d0c0bcf839747307b49258dc9e5f54653e Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:51:46 +0100 Subject: [PATCH 101/107] pythonPackages.PyICU: 1.9.3 -> 1.9.5 --- pkgs/top-level/python-packages.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b14463a5230e..bdc56bc65d4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20218,23 +20218,15 @@ in { }; PyICU = buildPythonPackage rec { - name = "PyICU-1.9.3"; + name = "PyICU-1.9.5"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyICU/${name}.tar.gz"; - sha256 = "0hps2314w7ddiwhqgw249m3hgqnny7qn542vz26jxr5k5hhrcyhs"; + sha256 = "16rmxy9y0qhqqna2v49i7nzwm09as699rbyvh4raw7w602w55c3k"; }; buildInputs = [ pkgs.icu ]; - patches = [ - # Fixes a bug in the test suite. - (pkgs.fetchpatch { - url = "https://github.com/ovalhub/pyicu/commit/6ab20d48d85638acb3a811c8676f713bd26f0df9.patch"; - sha256 = "0z4585r6bi0xxvrr93n450ka43vixx9zd063qna078vck0i3bkjg"; - }) - ]; - meta = { homepage = https://pypi.python.org/pypi/PyICU/; description = "Python extension wrapping the ICU C++ API"; From add010f69425075a5d4c73e2fe961e65b92e1d01 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 16 Nov 2016 23:56:11 +0100 Subject: [PATCH 102/107] eclipse-plugin-testng: 6.9.12 -> 6.9.13 --- pkgs/applications/editors/eclipse/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index 42396b72e7cb..61b4e6617edd 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -403,16 +403,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.12.201607091356"; + version = "6.9.13.201609291640"; srcFeature = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar"; - sha256 = "06c6885d3ggg1i085zhfwayj06jn4v1jip9zz40921vpq0iand54"; + sha256 = "02wzcysl7ga3wnvnwp6asl8d77wgc547c5qqawixw94lw6fn1a15"; }; srcPlugin = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "0bpyb9bnh8kglajmdzb7pr21i1sly73kwdjbygg75ad7z37l58br"; + sha256 = "1j4zw6392q3q6z3pcy803k3g0p220gk1x19fs99p0rmmdz83lc8d"; }; meta = with stdenv.lib; { From 1eb545df059ef6830c518920fb6bc77d0a895120 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 16 Nov 2016 08:36:51 -0500 Subject: [PATCH 103/107] jasper: 1.900.21 -> 1.900.28 --- pkgs/development/libraries/jasper/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 895d72dd7a0a..9568d9bbb3bc 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,11 +1,14 @@ { stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.21"; + name = "jasper-1.900.28"; src = fetchurl { + # You can find this code on Github at https://github.com/mdadams/jasper + # however note at https://www.ece.uvic.ca/~frodo/jasper/#download + # not all tagged releases are for distribution. url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; - sha256 = "1cypmlzq5vmbacsn8n3ls9p7g64scv3fzx88qf8c270dz10s5j79"; + sha256 = "0nsiblsfpfa0dahsk6hw9cd18fp9c8sk1z5hdp19m33c0bf92ip9"; }; # newer reconf to recognize a multiout flag From 7ed55dc9e47443276f48908065101d1e9380929e Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 16 Nov 2016 13:31:20 -0500 Subject: [PATCH 104/107] xinetd: patch for CVE-2013-4342 --- pkgs/servers/xinetd/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index 34e67e171f4a..445c6c57bbf1 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, fetchpatch, stdenv }: stdenv.mkDerivation rec { name = "xinetd-2.3.15"; @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1qsv1al506x33gh92bqa8w21k7mxqrbsrwmxvkj0amn72420ckmz"; }; + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch?id=426002bfe2789fb6213fba832c8bfee634d68d02"; + name = "CVE-2013-4342.patch"; + sha256 = "1iqcrqzgisz4b6vamprzg2y6chai7qpifqcihisrwbjwbc4wzj8v"; + }) + ]; + meta = { description = "Secure replacement for inetd"; platforms = stdenv.lib.platforms.linux; From d0d3330866eb74befa24d1cfbead4a22f28fae87 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Wed, 16 Nov 2016 13:57:45 -0500 Subject: [PATCH 105/107] shutter: add patch for CVE-2015-0854 with remote code --- pkgs/applications/graphics/shutter/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix index 0d52e563c9de..3d4e8c592abb 100644 --- a/pkgs/applications/graphics/shutter/default.nix +++ b/pkgs/applications/graphics/shutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, fetchpatch, perl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg }: let perlModules = with perlPackages; @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "09cn3scwy98wqxkrjhnmxhpfnnynlbb41856yn5m3zwzqrxiyvak"; }; + patches = [ + (fetchpatch { + url = "http://svnweb.mageia.org/packages/cauldron/shutter/current/SOURCES/CVE-2015-0854.patch?revision=880308&view=co"; + name = "CVE-2015-0854.patch"; + sha256 = "14r18sxz3ylf39cn9b85snjhjxdk6ngq4vnpljwghw2q5430nb12"; + }) + ]; + buildInputs = [ perl makeWrapper gdk_pixbuf librsvg ] ++ perlModules; installPhase = '' From da547f79617617b3008e6453f58b784993340417 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 17 Nov 2016 01:05:21 -0500 Subject: [PATCH 106/107] ghcHEAD: Add back response files patch --- ...pass-linker-flags-via-response-files.patch | 20 +++++++++++++++++++ pkgs/development/compilers/ghc/head.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch diff --git a/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch new file mode 100644 index 000000000000..ebbb9326a829 --- /dev/null +++ b/pkgs/development/compilers/ghc/ghc-HEAD-dont-pass-linker-flags-via-response-files.patch @@ -0,0 +1,20 @@ +--- ghc/compiler/main/SysTools.hs 2016-11-09 14:03:05.304528147 -0500 ++++ ghc2/compiler/main/SysTools.hs 2016-11-09 14:00:19.712934686 -0500 +@@ -421,7 +421,7 @@ + args1 = map Option (getOpts dflags opt_c) + args2 = args0 ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags cc_filter "C Compiler" p args2 mb_env ++ runSomethingFiltered dflags cc_filter "C Compiler" p args2 mb_env + where + -- discard some harmless warnings from gcc that we can't turn off + cc_filter = unlines . doFilter . lines +@@ -911,7 +911,7 @@ + args1 = map Option (getOpts dflags opt_l) + args2 = args0 ++ linkargs ++ args1 ++ args + mb_env <- getGccEnv args2 +- runSomethingResponseFile dflags ld_filter "Linker" p args2 mb_env ++ runSomethingFiltered dflags ld_filter "Linker" p args2 mb_env + where + ld_filter = case (platformOS (targetPlatform dflags)) of + OSSolaris2 -> sunos_ld_filter diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index aec6faed585e..d95791353ae3 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -27,6 +27,10 @@ in stdenv.mkDerivation (rec { sha256 = "1ryggmz961qd0fl50rkjjvi6g9azwla2vx9310a9nzjaj5x6ib4y"; }; + # This shouldn't be necessary since 1ad1edbb32ce01ba8b47d8e8dad357b0edd6a4dc, but + # see http://hydra.cryp.to/build/2061608/nixlog/1/raw + patches = [ ./ghc-HEAD-dont-pass-linker-flags-via-response-files.patch ]; + postPatch = '' echo ${version} >VERSION echo ${rev} >GIT_COMMIT_ID From ba73dbbda61b14ec8e2ca0ab526d3b35ba1db74c Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 17 Nov 2016 02:09:43 +0100 Subject: [PATCH 107/107] batman-adv: 2016.3 -> 2016.4 --- pkgs/os-specific/linux/batman-adv/alfred.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/batctl.nix | 4 ++-- pkgs/os-specific/linux/batman-adv/default.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix index 885aec52dc79..6a5dced454c0 100644 --- a/pkgs/os-specific/linux/batman-adv/alfred.nix +++ b/pkgs/os-specific/linux/batman-adv/alfred.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, gpsd, libcap, libnl }: let - ver = "2016.3"; + ver = "2016.4"; in stdenv.mkDerivation rec { name = "alfred-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0a92n570hrsh58ivr29c0lkjs7y6zxi1hk0l5mvaqs7k3w7z691l"; + sha256 = "0p8x8m1bdk560d64v010ck7dgm301cy7panxijczcf4p74clh835"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix index 279261745fbf..4fd022a418bb 100644 --- a/pkgs/os-specific/linux/batman-adv/batctl.nix +++ b/pkgs/os-specific/linux/batman-adv/batctl.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, libnl }: let - ver = "2016.3"; + ver = "2016.4"; in stdenv.mkDerivation rec { name = "batctl-${ver}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz"; - sha256 = "0ckh11dw9l6kljwa953384y295jd36x4kwzcw5wpplnx7rkg42cj"; + sha256 = "1ybn2akwj29hsjps6qgvg1ncf238002d3r7fik627ig8cgmx0wi4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index 3170569d5634..ce0ef1ad1055 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -2,14 +2,14 @@ #assert stdenv.lib.versionOlder kernel.version "3.17"; -let base = "batman-adv-2016.3"; in +let base = "batman-adv-2016.4"; in stdenv.mkDerivation rec { name = "${base}-${kernel.version}"; src = fetchurl { url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz"; - sha256 = "0rzhgj0g2hwlrzr8l9ymj6s60vk2zpk1a8x1lm4lhnhsqs9qj4kf"; + sha256 = "1sshl700gwfnqih95q1kp7sya71svp8px2rn14dbb790hgfkc4mw"; }; hardeningDisable = [ "pic" ];