From c34d852ea1bcb643e293cc7c93639a3cd863286e Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 16 Aug 2015 01:46:50 +0200 Subject: [PATCH 01/58] kbd: really do include neo layout --- pkgs/os-specific/linux/kbd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix index fba63daf8e5..4c6f33b1d80 100644 --- a/pkgs/os-specific/linux/kbd/default.nix +++ b/pkgs/os-specific/linux/kbd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { '' mkdir -p data/keymaps/i386/neo cat "$neoSrc" > data/keymaps/i386/neo/neo.map - sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.in + sed -i -e 's,^KEYMAPSUBDIRS *= *,&i386/neo ,' data/Makefile.am # Add the dvp keyboard in the dvorak folder ${gzip}/bin/gzip -c -d ${dvpSrc} > data/keymaps/i386/dvorak/dvp.map From aba6c9e9cb14b2d73aef8528780c93aeeb9371e8 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 16 Aug 2015 20:05:14 -0700 Subject: [PATCH 02/58] antimicro: init at 2.18 antimicro is a graphical program used to map keyboard keys and mouse controls to a gamepad. Useful for playing PC games with no gamepad or poor gamepad support. --- pkgs/tools/misc/antimicro/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/antimicro/default.nix diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix new file mode 100644 index 00000000000..80791756e65 --- /dev/null +++ b/pkgs/tools/misc/antimicro/default.nix @@ -0,0 +1,22 @@ +{ stdenv, cmake, pkgconfig, SDL2, qt5, xlibs, fetchzip }: + +stdenv.mkDerivation rec { + name = "antimicro-${version}"; + version = "2.18"; + + src = fetchzip { + url = "https://github.com/Ryochan7/antimicro/archive/${version}.tar.gz"; + sha256 = "0kyl4xl2am50v2xscgy2irpcdj78f7flgfhljyjck4ynf8d40vb7"; + }; + + buildInputs = [ + cmake pkgconfig SDL2 qt5.base qt5.tools xlibs.libXtst + ]; + + meta = with stdenv.lib; { + description = "GUI for mapping keyboard and mouse controls to a gamepad"; + homepage = "https://github.com/Ryochan7/antimicro"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19353eab4e9..15f42c4c481 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14692,6 +14692,8 @@ let ### MISC + antimicro = callPackage ../tools/misc/antimicro { }; + atari800 = callPackage ../misc/emulators/atari800 { }; ataripp = callPackage ../misc/emulators/atari++ { }; From 992247745ee540a00b585924be99b1e34bf53c48 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Mon, 17 Aug 2015 17:18:43 +0200 Subject: [PATCH 03/58] glide: init at 0.4.1, and dependencies: cli-go: init at 1.2.0 cookoo: init at 1.2.0 go-gypsy: init at current master --- pkgs/top-level/go-packages.nix | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 080fc1d6747..826aa90e8d1 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -342,6 +342,13 @@ let propagatedBuildInputs = [ pflag ]; }; + cli-go = buildFromGitHub { + rev = "v1.2.0"; + owner = "codegangsta"; + repo = "cli"; + sha256 = "1axcpc8wgs0b66dpl36pz97pqbxkgvvbwz1b6rf7gl103jqpii40"; + }; + columnize = buildFromGitHub { rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; owner = "ryanuber"; @@ -522,6 +529,13 @@ let }; }; + cookoo = buildFromGitHub { + rev = "v1.2.0"; + owner = "Masterminds"; + repo = "cookoo"; + sha256 = "1mxqnxddny43k1shsvd39sfzfs0d20gv3vm9lcjp04g3b0rplck1"; + }; + dbus = buildGoPackage rec { rev = "a5942dec6340eb0d57f43f2003c190ce06e43dea"; name = "dbus-${stdenv.lib.strings.substring 0 7 rev}"; @@ -652,6 +666,14 @@ let subPackages = [ "./" ]; # don't try to build test fixtures }; + glide = buildFromGitHub { + rev = "0.4.1"; + owner = "Masterminds"; + repo = "glide"; + sha256 = "0237l8s7z1ysfkv3kmw4788fg4kjcq2sh6073bjcwynz3hldkrlr"; + buildInputs = [ cookoo cli-go go-gypsy ]; + }; + gls = buildFromGitHub { rev = "9a4a02dbe491bef4bab3c24fd9f3087d6c4c6690"; owner = "jtolds"; @@ -1038,6 +1060,13 @@ let buildInputs = [ go-querystring oauth2 ]; }; + go-gypsy = buildFromGitHub { + rev = "42fc2c7ee9b8bd0ff636cd2d7a8c0a49491044c5"; + owner = "kylelemons"; + repo = "go-gypsy"; + sha256 = "04iy8rdk19n7i18bqipknrcb8lsy1vr4d1iqyxsxq6rmb7298iwj"; + }; + go-homedir = buildFromGitHub { rev = "7d2d8c8a4e078ce3c58736ab521a40b37a504c52"; owner = "mitchellh"; From 4d6452bab925f448852f277be66adee1b33ddce7 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Mon, 17 Aug 2015 10:31:22 -0600 Subject: [PATCH 04/58] Move licenseAllowed check into the builder attribute (fixes #7541) --- pkgs/stdenv/generic/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index fe7bec54ba0..19443e3e6ea 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -131,8 +131,6 @@ let else true; in - assert licenseAllowed attrs; - lib.addPassthru (derivation ( (removeAttrs attrs ["meta" "passthru" "crossAttrs" "pos" @@ -152,7 +150,7 @@ let computedPropagatedImpureHostDeps = lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (propagatedBuildInputs ++ propagatedNativeBuildInputs)); in { - builder = attrs.realBuilder or shell; + builder = assert licenseAllowed attrs; attrs.realBuilder or shell; args = attrs.args or ["-e" (attrs.builder or ./default-builder.sh)]; stdenv = result; system = result.system; From 4beab2264b3c20e3f5b97df4fb139004ed00c263 Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Sat, 15 Aug 2015 10:33:24 +0200 Subject: [PATCH 05/58] ardour: simplify version handling --- pkgs/applications/audio/ardour/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 2338af6ec99..593ca89451a 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -17,10 +17,6 @@ let # Version to build. tag = "4.1"; - # Version info that is built into the binary. Keep in sync with 'tag'. The - # last 8 digits is a (fake) commit id. - revision = "4.1-fe672c8"; - in stdenv.mkDerivation rec { @@ -42,7 +38,7 @@ stdenv.mkDerivation rec { ]; patchPhase = '' - printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript patchShebangs ./tools/ ''; From dffb7373a5074c5a9a10b38bf3d41cd2a8f0f740 Mon Sep 17 00:00:00 2001 From: taku0 Date: Tue, 18 Aug 2015 20:35:10 +0900 Subject: [PATCH 06/58] firefox-bin: 39.0.3 -> 40.0.2, thunderbird-bin: 38.1.0 -> 38.2.0 --- .../browsers/firefox-bin/default.nix | 14 +- .../browsers/firefox-bin/generate_sources.rb | 2 +- .../browsers/firefox-bin/sources.nix | 358 +++++++++--------- .../thunderbird-bin/generate_sources.rb | 2 +- .../mailreaders/thunderbird-bin/sources.nix | 234 ++++++------ 5 files changed, 300 insertions(+), 310 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index ebc05a79af9..336c727ea15 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -129,19 +129,9 @@ stdenv.mkDerivation { "$out/usr/lib/firefox-bin-${version}/$executable" done - for executable in \ - firefox firefox-bin plugin-container \ - updater crashreporter webapprt-stub \ - components/libdbusservice.so components/libmozgnome.so \ - gmp-clearkey/0.1/libclearkey.so \ - browser/components/libbrowsercomps.so \ - libnssdbm3.so libsmime3.so libxul.so libnss3.so libplc4.so \ - libfreebl3.so libmozsqlite3.so libmozalloc.so libnspr4.so libssl3.so \ - libsoftokn3.so libnssutil3.so libnssckbi.so libplds4.so - do + find . -executable -type f -exec \ patchelf --set-rpath "$libPath" \ - "$out/usr/lib/firefox-bin-${version}/$executable" - done + "$out/usr/lib/firefox-bin-${version}/{}" \; # Create a desktop item. mkdir -p $out/share/applications diff --git a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb index eabff067f75..b7627e52068 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb +++ b/pkgs/applications/networking/browsers/firefox-bin/generate_sources.rb @@ -8,7 +8,7 @@ version = if ARGV.empty? ARGV[0] end -base_path = "http://download-installer.cdn.mozilla.net/pub/firefox/releases" +base_path = "http://archive.mozilla.org/pub/firefox/releases" Source = Struct.new(:hash, :arch, :locale, :filename) diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index 6517097a19d..d302e47f335 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,185 +4,185 @@ # ruby generate_source.rb > source.nix { - version = "39.0.3"; + version = "40.0.2"; sources = [ - { locale = "ach"; arch = "linux-i686"; sha1 = "4b732557876ff3e4d02ad480b7c73bd7abd6782d"; } - { locale = "ach"; arch = "linux-x86_64"; sha1 = "0a63b048b33638ade924bcf7ae435423c9da906c"; } - { locale = "af"; arch = "linux-i686"; sha1 = "87349773cdb5e07aaa1387e75e08d03786df700d"; } - { locale = "af"; arch = "linux-x86_64"; sha1 = "137d3558eb674036d43e5764ca691a66f9a07782"; } - { locale = "an"; arch = "linux-i686"; sha1 = "db99f86de92b0d1782611926b3053b25ad302e8b"; } - { locale = "an"; arch = "linux-x86_64"; sha1 = "d000f9e8a983be0fa7d05176fb6cc0954bb06ad7"; } - { locale = "ar"; arch = "linux-i686"; sha1 = "b794a584da47ee9197666ab6976863f23ff1972c"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "0319aec1942cd8311b236aef5772850897b36f64"; } - { locale = "as"; arch = "linux-i686"; sha1 = "83b83af48caf75bcdc39efb9c8a09333d6ae97b7"; } - { locale = "as"; arch = "linux-x86_64"; sha1 = "827463330470ab2abd4a71a92e15fea451957fb5"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "9f994c9374c53afa094271907fc6aecbf5a93eb4"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "611835134f1008fcff72f3ab264ce9448a6a0948"; } - { locale = "az"; arch = "linux-i686"; sha1 = "67339f5005bf8c805b6c8ed24fbed597865f5dd0"; } - { locale = "az"; arch = "linux-x86_64"; sha1 = "ecdd763f7d40bcb1ff6004fd0a3f511f5cbb9d9b"; } - { locale = "be"; arch = "linux-i686"; sha1 = "d6a7d84744c0ac6e4cb7f0a1f0025bbee053cdc2"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "051646e7d213099433bc198c74f85d99aeb6e846"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "28e48822cc2977037db1493ddc06ef106a11e8bf"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "7b59deab0fd2b35d2ec087947f5c5a85bd70cf4a"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "4c5bff7f6b3f664138a881479701cfea81ff60b8"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "3a659a5335d4b215ac2a0452264a61c702420c60"; } - { locale = "bn-IN"; arch = "linux-i686"; sha1 = "a641b87769d90db720fc5294ab06f6dae2a597d3"; } - { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "1c1e47f4012c765ce96e4d2581e47f9b61344370"; } - { locale = "br"; arch = "linux-i686"; sha1 = "0491cf87e0815079eba8f57ae8c6f392d2e5251f"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "abe34c6d4998ac2f4e2d1f2d4655f8ace9f0a857"; } - { locale = "bs"; arch = "linux-i686"; sha1 = "40f2eb7fd72f4a05ee47cb136c73e75f139e9ed1"; } - { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a737c33921af68621d906702fb1298f5bf161f9"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "46cf625eea24a819d93741f2d11bc315a21361cc"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "be84a0a6e32fbbb977b654f195064add8881a853"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "ce507b8801646f3156bb38776c17dd7955ba9678"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "5b1599282512c66a8619202b494042dbe959adc0"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "9eb6a71214122e02e7e94b526b4ff1e0bad71680"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "4f21da86ab876bf916157fe7e1fd84502e8fb923"; } - { locale = "da"; arch = "linux-i686"; sha1 = "d175b55ebf05905531f28a74f9a075c4dd4467d1"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "62039edbacf4d5ed9b32f5ef2d993c0b6fc7a0cc"; } - { locale = "de"; arch = "linux-i686"; sha1 = "933cc29a7902f4de25fc593ffbaf6e62ccceb2fc"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "eb69a42286f7d4a7106ddd24ec0c1f1356101956"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "6683f985caece486b068a3ddd85e732903b1f738"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "fd92cd5ab674762fce35fddc54b7dcdfa4829dcf"; } - { locale = "el"; arch = "linux-i686"; sha1 = "91416a56f0221772a0f9691ad418602327d193e2"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "ce89cdb9c8c88d7c4dcd089eef006b98171f5d04"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "8322cad2eacba0c064eb9ef2f5cd1d426411c648"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "c4102cc705610d7ad5b0cc530c600b2170f55419"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "571067007e0dff64095b8eeb760aec7f78f367fd"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "64a0422e42cf1d19e558377d5ecee6536917b414"; } - { locale = "en-ZA"; arch = "linux-i686"; sha1 = "9f5611cd3043b1c267724b198ab04c16078b7818"; } - { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "3a22150e16a12d8fba9d21cef0c8e7ac434edf35"; } - { locale = "eo"; arch = "linux-i686"; sha1 = "6502874b051c281e565cd0e0953698b88b69e5f5"; } - { locale = "eo"; arch = "linux-x86_64"; sha1 = "3bdbcf6d324c43fbf7f3c71243df10a760f7fec2"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "83edce65b276d9989e66d11bfd4e9c1c87955364"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "6281d1d560fb7dd1a8bc1af0be046491a4ee4382"; } - { locale = "es-CL"; arch = "linux-i686"; sha1 = "d394d731f7cde2b17bafd9d9d4cb6819fdbcbfd5"; } - { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "b969107e5e840e1701672b3d5ba81ae3e53889be"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "a9c801142df7a932b2eba4d8f540b2579d0fabeb"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "96cb7bb0bd079d683304168b2b14255a1217fa92"; } - { locale = "es-MX"; arch = "linux-i686"; sha1 = "c233e4da88f3fcc5eb5f2c45766c9197b5910dfc"; } - { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e04973316a340325888f0f2e06590773f81a7cf0"; } - { locale = "et"; arch = "linux-i686"; sha1 = "22c59e40b39aefe356e8b5305ce720d4a2cdd0b7"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "74256cbb8a76d835887727aa01f6e6a22936a43e"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "fa14a31fe15106f224df47a62c3e5ec16da1cb95"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "c8b6216d448f6f192e584ceb81fb22e5ac79a280"; } - { locale = "fa"; arch = "linux-i686"; sha1 = "a1c67f4bec3f46de3cf6297e8a711d55f8189e3b"; } - { locale = "fa"; arch = "linux-x86_64"; sha1 = "70d3b99652e8c690bbd05af7af9c65eeb780d455"; } - { locale = "ff"; arch = "linux-i686"; sha1 = "1f42b51648eb296dfc339982c331e7d63bfbbd96"; } - { locale = "ff"; arch = "linux-x86_64"; sha1 = "bd176a2bda1246e15dbbfb1b068f6b196a0ce266"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "2cd7757360efeca608b8a9b4b56c04f9aca89a79"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "dc130d8ab31c739e4406f8cc72dc32d3795db208"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "6dccfb2944006379271c308fa31d8f6a4bd6bb3d"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "aca6deabd521e29611fccbdeca3bf036a2239c1d"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "4ffb659a341308a097ad26f1873ae243e581bba9"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "340caff2afeb8f9f01c84f780b6aef079ab257e6"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "7adb1a44e0367b570437fdeae9f04c6f94f6702f"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "d427e6ca8287d97b27949ccb412207ef48d0cebe"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "2741c8bdcfad1edc36968bfac70c71b1a2837df4"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "430817ee768fd76dd29e76ae00488d6397f7b6f1"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "725c194c1e08293b44cbeb2a6791f4340a773b81"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "611e5f92796707379a9fd60ade840896eac4eabd"; } - { locale = "gu-IN"; arch = "linux-i686"; sha1 = "720ee20fa7a74dc321ab7fa8a95732ff2e9e5250"; } - { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "778496274c362d9d854b1cc6ac9b1806ce8e708c"; } - { locale = "he"; arch = "linux-i686"; sha1 = "f31729cecde50073e49d1387356c13060cf50c61"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "72e9c8c602c403d16e4d60fbeb1bf5a415aabf25"; } - { locale = "hi-IN"; arch = "linux-i686"; sha1 = "f2498d503005d0a1d7432bbc5a981be350421cfa"; } - { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "b003f7d484ec995fe4f10808d1141e20c6ed9bfc"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "de191039fb5acb5ca9ab556ef4ef6b6211b5b697"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "d5cd94ddd0b301dc0edf2f64bafa678864aa4595"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "cf66178d0a18fcabcde897d4ba869da8d82fe999"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b83bbf3fb4d3aabdc961b9ef669dd2aa9f05ee52"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "0550d016ad044fdac193beee822171a0d891a34d"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "4f5916dac9d8efb333e2ad21370bd8a3d961b68f"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b72515f5e194a4c543c8a6487c858abe07e24db0"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "aef7fdc2f59edbde165c4e98de10f7e20e203f9d"; } - { locale = "id"; arch = "linux-i686"; sha1 = "1db4444dbc9479cad1122925a9af73e358e09cbf"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "a826b23b1783fff4d51451284301610cd26b578f"; } - { locale = "is"; arch = "linux-i686"; sha1 = "2943bbe86e052280d610cbf3adceb89e949615b3"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "c1b0bb2f22c11974e5e3a2d9b221601da07a858d"; } - { locale = "it"; arch = "linux-i686"; sha1 = "2e3568872301c3897e83ee5692638a76fbef15fc"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "5af762e2487171f6b41a6c1654b672c86e6964f8"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "40c042713ee07d4d375327515c7425d6733b926f"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "0dd2808378e870f553e02066f5ee78b11543e420"; } - { locale = "kk"; arch = "linux-i686"; sha1 = "294eb8f7345f6baffc183605988bd1a57bbdd880"; } - { locale = "kk"; arch = "linux-x86_64"; sha1 = "fbd9524ac8c1286e4c4bcf77efa8c9bf86d03948"; } - { locale = "km"; arch = "linux-i686"; sha1 = "09b63d181398b1ff6a83849aa209952c0c5ce9b0"; } - { locale = "km"; arch = "linux-x86_64"; sha1 = "d7478ba2f1b59ef83b1447789034bbdca78fab77"; } - { locale = "kn"; arch = "linux-i686"; sha1 = "72e1e6e225790e4438da20cd2f69dce6e455fe53"; } - { locale = "kn"; arch = "linux-x86_64"; sha1 = "3ef27144bb335d7a3f168bbadc0592a5fd554d78"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "5ef7f628aeb20d20ffa01316c234afafc2a6e2c7"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "cbf6a8d123e98ef1b99221083c743e962ccec58c"; } - { locale = "lij"; arch = "linux-i686"; sha1 = "46f34520fc023f9d20781c9d5f13c683bc7f86bd"; } - { locale = "lij"; arch = "linux-x86_64"; sha1 = "c07c7ca26034e53d29e868315201605b95d83e65"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "8ab47bda33eeec6d135049f775f06478480394b2"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "82b0c898ebf2e3714763640f2cabd00dd14c9078"; } - { locale = "lv"; arch = "linux-i686"; sha1 = "1dba01bbf772b38c67b90d5e68f7e1a5c20f0b02"; } - { locale = "lv"; arch = "linux-x86_64"; sha1 = "ade71dce8572628f99bf59132e8c0efd01a77016"; } - { locale = "mai"; arch = "linux-i686"; sha1 = "486411e211d5505ca696a936db64682e04d43392"; } - { locale = "mai"; arch = "linux-x86_64"; sha1 = "0239e14c627499220518d1f9a3f643315c1846c6"; } - { locale = "mk"; arch = "linux-i686"; sha1 = "d7f314a0caec40e367faa29e071a81da2e50d802"; } - { locale = "mk"; arch = "linux-x86_64"; sha1 = "4ad6c120360f90dea82282a6891419f17d0b5068"; } - { locale = "ml"; arch = "linux-i686"; sha1 = "14a6534cba54ff08695b4322f6566a375f9cb713"; } - { locale = "ml"; arch = "linux-x86_64"; sha1 = "badad6dfe2d794d508c4f8b061ef2a91209a8c32"; } - { locale = "mr"; arch = "linux-i686"; sha1 = "1602ac0a3ac5c8c49a370a64d450aa06b490c8b5"; } - { locale = "mr"; arch = "linux-x86_64"; sha1 = "a8108ecee8557be024c35818a99c30dfd811da83"; } - { locale = "ms"; arch = "linux-i686"; sha1 = "02952ca95545f83231b36e9c05adc51ab955f9e5"; } - { locale = "ms"; arch = "linux-x86_64"; sha1 = "164c31da7ad4272500b8906ee5d29c69ac285618"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "c09a24b8f00409c7c93686586b091bfc33f22e52"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "9124e6b86f947dd4a7d2d7c9b8860dd28647d2f4"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "fb2dbbda6817d8fbcf9870a3233396051ce7c67f"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "bbf1e039a02556df8c68d6d49aa30f821bfdfae9"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "9ff1ae86d0989f81ae3324e9ccbda2d2069281be"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "2be8ac327c7aa90abb38ee6ccfb0181194d5592e"; } - { locale = "or"; arch = "linux-i686"; sha1 = "a6ff7bf9c96b1baa2d22e897d1083c9907300de5"; } - { locale = "or"; arch = "linux-x86_64"; sha1 = "4ab6eff3bf8c99f3404a313f54ea3e0d48842d9f"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "7ed256e6b3a5aec16eb0c5d3cab8c4cd5bf07999"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "da6511f215e206df0fe450225f2b2e4d8d541838"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "d3df1cc8647d6dc8576fcfd0c6a1e28a28c0ce8a"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "af999c2bcb0d865d38e336eaad5d6766fed291cc"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "7369a73558f6df1218dac14c3259e08cfa80ac52"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "bd21ac0aca091de913201d2df5f914b9eeb83c8d"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "8b9a5cf1259a824edb54d4db9aa7db3637ab041a"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "f8004907aac63d8e9e4196424aa94db4fa1ff8c0"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "3403690013738c55f87c56d52ed8f9923a496b42"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "3b00a49b87fa900ecea9fdedce1b49d2560a81dd"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "6e5f1e0460792c080aa9ac82d3be69c047862203"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "2f09d74e5e39f9016ab5594f95f61b369cd6467c"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "df7b6c0806b27ade147dc6d42d181d599cc2c28b"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "1dedbe2a377cee5b32ca4aa0ec54eb24261238b0"; } - { locale = "si"; arch = "linux-i686"; sha1 = "0309c2c97affcfa4c0d155eec2f9f4f586c940eb"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "890a17e8f1d771e12d3e9c03ee0c8069654dae66"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "73fbaabb4644ae3726681bd6c49f6efa25a74a1a"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "573ba7d8526147e47f49fedb5f8c2e3bf0aaee82"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "abacb4f8ad9ed7eb42d5bbf3ebdce4136557bff5"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "cd1dc2a385e1911b5eaf69bc0cab13f257d8f68d"; } - { locale = "son"; arch = "linux-i686"; sha1 = "5c1aff5bbf858e1e7f6fa2c2d996a396b8710124"; } - { locale = "son"; arch = "linux-x86_64"; sha1 = "a6d7e023615936b0d61e956a4dadb6431febaa0c"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "19a7147c4a7de505ef0106b121640f5f651d6dbd"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "f1120ddacc1d5a124512c405855a4014fc910034"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "d21616842495521d3b71877ff2b694e019a4c2c2"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "43b9236a33a803fc0b0dd41cef93a5bf9fd91472"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "17e06ab17369c234bef72b1a284bef39d5810671"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "8f8e2cb6acd475d7d75116c6494ab237b9531364"; } - { locale = "ta"; arch = "linux-i686"; sha1 = "77fb9f32965af6a70275fbca308caf5bf88c3c8e"; } - { locale = "ta"; arch = "linux-x86_64"; sha1 = "4a65de127708cbee44cc7238d14b9c0942d2673b"; } - { locale = "te"; arch = "linux-i686"; sha1 = "37a556dafc73e5de983cb62fdd545d01f32f698d"; } - { locale = "te"; arch = "linux-x86_64"; sha1 = "2f4549d5ef998449b553a5d6f62d01d0313c6c95"; } - { locale = "th"; arch = "linux-i686"; sha1 = "f6a10236fe0fcc9d11c3c5aee3bd84365bb06013"; } - { locale = "th"; arch = "linux-x86_64"; sha1 = "c2694589cc28b938fd7a079378e5fa99cdd7c98b"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "e7888b70a1a90613fd7d38a5a7735857385ae683"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "6ebef5649484bfda154c44232a9e3aae239c0990"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "fe5ffb931bd7e5bb403f6aef6b879c2c9446721e"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "4b53989b554929b085b120788e1e30d5232dedb4"; } - { locale = "uz"; arch = "linux-i686"; sha1 = "bed269a3a7e3fc82d2fb1931632be9b04fe6b6da"; } - { locale = "uz"; arch = "linux-x86_64"; sha1 = "786d51639cd7e952f4c73e9d91b50f6da0ba9242"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "db04c29c9038c856c67e99c77c0628c377bcd8f7"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "d9525ad0b0069ae05cad173ab567198b67fc13dc"; } - { locale = "xh"; arch = "linux-i686"; sha1 = "2a8bbe15f2b2b242e9787704e542a6c0a9ed93bc"; } - { locale = "xh"; arch = "linux-x86_64"; sha1 = "532e224a166addee7b6068bbcee7e6c0b1c3f6df"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "514bc01fe7055a050898a01f0c1ed4773fb33b7e"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "0d5154d3d5062c7e1ff33112ad0a1399ba548b29"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "291ee73bc5540f8089f6b7bbdf8160c931cc4dd7"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "16df041eeaf6a3885d52569db1781635e519fd3f"; } + { locale = "ach"; arch = "linux-i686"; sha1 = "4cd453a4439460164e15ac767483335f0ab153ba"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "2915386e271a710daf63b5fa6e4e6450cd339a23"; } + { locale = "af"; arch = "linux-i686"; sha1 = "2c64d95f8f7a82931906bb8ae6fcd6f2c976aa54"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "b9ca1f6a18283eb9eebd39173c33d7d0bbc5afe2"; } + { locale = "an"; arch = "linux-i686"; sha1 = "0a6c228d7f46bad34b431bb49d6bdc60c2778008"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "a509951f13eaab7661676f833dd9a83125309c82"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "372dffb81f1be1966e95bba114f982497a2caee0"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "82dd88dd2e4ded3c25f7ffd6b21dd51a0b693d43"; } + { locale = "as"; arch = "linux-i686"; sha1 = "52dbcef7858b57652ebd18e8b24af0c656f659e2"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "aafa712986beb5d28c51f07678f9e1f80489e199"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "0f206582c5f934a490f68d5226d1829397cc45a7"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "af49662ae762693ae916fcf491d331ad86acbf66"; } + { locale = "az"; arch = "linux-i686"; sha1 = "c9bbf9024acffabe1651d1ca9d0c13ce574d021b"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "a946941ad0fa094c54b76f0f31501cdd24582402"; } + { locale = "be"; arch = "linux-i686"; sha1 = "de19ed80796ba4423347654bbab170d72aea24b5"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "d566f37f8f908d621a51278c40e971be4a277749"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "bb7c41fd32b4b97ae25c1d7b3aee187810800387"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "b6063f82ce73e5070c983aa69d9c34dab74bc460"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "41b8d113a8d09d8fd28f4808ea630fcf732bee26"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "4c255a14338a602e9b8827f55c8c3f705a76f421"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "c24df5f5dc5493d912b34e526617ed22075f3bb1"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "b1be6518bc16874245e5a532d03a2bd7dc4fdc23"; } + { locale = "br"; arch = "linux-i686"; sha1 = "cfea274abe713d3c5df63b21489ba23766c97dad"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "10e5d0f6435a487b3331b76ac0eee51a2edb3485"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "66462c0af5e9a7f9052db2d9616a44ca08d51713"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "3a78840fe663d7876ea00cd6ecb0530f16146adf"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "8321046f8cbba3d3cdea7381f2ec4323b2ba7cfb"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "599c81a054ad7ef7c27f3be1da2289ed3404255b"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "89480e776bc5add4c9270f8f92e56d1a0207e629"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "7d7d40a7e74670eaaacb66d6a3706710d2d1cd4c"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "087b794e0988484dfd7d67488c3ac197e5529c42"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "3fd60bd6b42497d0968095294c94dcc11bdbbeda"; } + { locale = "da"; arch = "linux-i686"; sha1 = "2e22d7ff7c0a7a2f8bbf2c43f5da24c3eaf4ba8c"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "dc852f942018f08f2c3f56b3315dd039f0dd4159"; } + { locale = "de"; arch = "linux-i686"; sha1 = "a78fb79f0640fc018e4d7807bea41c6239bbdf2e"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "53a7c3e38d81df588db042bd8ee524aa67713f76"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "3721ac332975aa52f692bce9467f3919be16b4cb"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "602bee9867cead4ac79c05d8cb99d022de1169c6"; } + { locale = "el"; arch = "linux-i686"; sha1 = "f3809bd2b456b9548cf8415d4f15e08bf64f2561"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "6ed7be3d3f90ff01f3a8505ea61c69f1dc3f34af"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "3bff3a0f76e6744cb1e1ab78a5c24bd9183db1d5"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "87033acbf2d3277e699b1b54552a88bd33590f75"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "65a852e9774f9f61764d01e4025b64027f10d270"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "99e40bfcbc4146111059cbec1557fbe3a7295285"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "476b5ac7062932584ef634b9bd536495fef974d6"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "51334ee2ee6bdfd7e0b02ed44d95b9d0e86a73af"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "e2973dc7e1decebb24a4a90e8a4a4307ccd7d151"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "4bb52d9197c854ceca4a9d8fed6cec016c823ea7"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "2335e0f3bbae6eefdd1aa7ba58530f0ee9bd3534"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "8fdfc2defee83edeabc5648dcf4e4630862424b2"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "34201da70923a68566856aaf5f33e33f80c3943a"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "03ddd10a75a6a779bc0ff1f06f2ac0f4189c21db"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "b6456b85055178db737c3b2dbebec14ca7c373ec"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "165c5abc403322964de6fbda189c766c1490f57d"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "defd933884c5f97c63e8f07dbd42162d7365b5a6"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "e0588631c0886ca5785f713c2fd4d52e53c901f6"; } + { locale = "et"; arch = "linux-i686"; sha1 = "732b79384c69659d674a849dfc0a4cc0905af5c0"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "30ea22676bf24205595fe3cef17f17e5fa7224c0"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "a0dd6bc63af523f12f77da3d93f842434dd45fbe"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "02e8d43be34bdd57d999ff34e93289d721fd5e18"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "13cb0fc5c3f2faf5907c71a88d9fb6dcf295534f"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "3688cb2d85620d03d8ae90535758384e0eca0b79"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "de4bfeaf65c5db67029f7800d3818f60a15e0a2f"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "3b87f8e2cbafc70264da1afabc9d4a365acdf445"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "e0d1d40ae201852a7afb5c5c3995d1eaac461880"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "d519fa72ae3acd5c5e9590242a1569e2559e7099"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "4c35aade33675ee9e6ee0ba3d2826da06509f048"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "a7f2c8c24766d4ad12a0144007eac93b99ffbc83"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "c809f3baf308c5cd7d9edc1a53f0b7cdb876a97c"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "182c27021f7192c50be9973850a848b138e60d0a"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "8bfa83a569409ae579aaf27f6878f90c9789128b"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "a68688038d975428a232f721da7f638f08fc0157"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "be223957dfcf41db552e4e63ec879e4c21eb40f4"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "d226c4ea4f987a9a8f01a8e6365e2c93ae748988"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "482a19d31d1543d2645ba290d6ab2404f200b81d"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "3bdac94346710be5c2c160153321f5bd9118c291"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "aafc01904d22edf7e6c4db94b3154875736de3be"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "3309dc84bf4d0b4f9aafce95f5af3ee3a01acd79"; } + { locale = "he"; arch = "linux-i686"; sha1 = "aa0f6c2f4d8f4cbd974d39cd0ef85ce7795bb00a"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "17cabcb46375f04a32ac4e156a30b97022406a46"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "51d3c83ff1584c315a18916100a9b2481d8b5ab8"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "0e725242eada7456e15c91acd63d37018167df71"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "3f68ab7a61fd8b6731aaf3089907d9e436a2e5e1"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "5934536499a2ded279a802110d8d8f0e802cc8c9"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "c212eaaa6329f9872e8545d634551d083e0f2db1"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "b6edd09144919be6932baa037f7f09ed26d5c102"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "63eeba0d15763340d802802008cce554a8bbb07d"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "c593a84cfb69ef7ee5d2a8affb15189147d0c2e1"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "b2b63b30ebb9a220b610c0b1696b5da55d641710"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "1c6dcf9b30383a5566448ab4e92ef0a90613e505"; } + { locale = "id"; arch = "linux-i686"; sha1 = "fdaacae2217fe365eb54b977562ed8c889c95de9"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "9def4f5554110b6af64bc91f4ad0f03a6444dfae"; } + { locale = "is"; arch = "linux-i686"; sha1 = "7b9183a80a87febfd7e8cd57b93e2edabea763a8"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "a3ab726b981b8763dbddd74a61d85c4576597fe6"; } + { locale = "it"; arch = "linux-i686"; sha1 = "eced59fb6ddd04967917142301435ea121671f62"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "e80d94b8b8868e357c571710046af3155e558a5f"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "1c3cd61ba760650c7d44d98b8db66b4c7801efad"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "e0c4b3f510eb73d06c68b5b91c707ce5c508b05e"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "20ca59199a6a30bd64dcb943c2a1135885a535b4"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "87703e39a0ea9c402cc535fb4cc04dca5b9025d4"; } + { locale = "km"; arch = "linux-i686"; sha1 = "17cd8d702482cbc1c4bb377b29e0f278cdfc8e15"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "e7372fc31e6cd893fc0ea52e2fc4105c249310d3"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "947b986d5cb5454677d7b9bbcebaf437f0bcd16d"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "7f99697ebc560e2705e4aae628ad56a132af7eb6"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "b3a76512be4f2b86cad800d46d3f6c9ff9c883db"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "3e5c4860e15651ede1ffe569062e23f474b44994"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "36e66cb829024c631f91a9a05e4d4c10c5862c45"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "216d0066b5289335c12339dd109d8f11dc4fa937"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "a784ca15952a69965aa377a2dd6a0232ece0f8a4"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "f172acd6474891177446b61bd538af09cfb30351"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "161f527142c8d8551509e6132871c4901b2d64e7"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "d0428e31ef283749f1691d787ad6983ed0677a50"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "4bd535fdaf01bf8d001bc1147f0ad9e26f0bf39f"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "fc2de8c24f0271f56b3af97e8e4bf14179d6122d"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "9aacbee890a7bc3d714d85d16ab2d278dabd8e1b"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "75c23b833812a9d0b66727b3ed28a0e494bbacb1"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "cf29131fbf6d768e79ef5228cf066355a46b4466"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "df4b6ba0c457f15eee2dcade4882b720c1e39506"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "ab0cc9339d486d576e7004fd35d685421f7853f1"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "4b10dd376a6599f60ac85d41d465f136c4d4ebdc"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "3244858bd6405dc507eb4044be6b8ebaf7100e1f"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "9db094658b9e6d4849c1ede8438427400704c80c"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "9a907fec062b94a8f8dd7e981ea2ab4f36bcd944"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "eafc796f1597464abe3ffd9353e7d098b528525a"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "fd19ace880cfd29a4612b2543e2eab1fbbabe4a4"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "3d8bb5f293a6f18c3f171dcfb52b737a7946aa95"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "0a893fef8363fa980bc2393a2e23241f0c07956c"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "3e066a7834e998422f00e10b65e58ecf9dfc7519"; } + { locale = "or"; arch = "linux-i686"; sha1 = "2448c7e794e926894208abb4d25ea3b4c5db0cbb"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "a096f8152416d6af72a28fe25a849feb22ab835e"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "d974227fe54d7db75fc3b2fd773cf69ff71d647b"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "b318ede019b019ee108d79e4f355311518a05963"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "c9aa90d984c2112f3e0e629f95b694b6281fe1df"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "8b3c1d3ebf013cf1c7bb448131b51920e1475240"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "47318f7ea3655b6fa876d77eea22a499d458b445"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "a1d42692baf6602f69fa436ed5eb6d21c60f3786"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "c97407ba107843f8f1f78ef70028b60bbc94ea87"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "68d1e7771a74e238ce54cff60e7279c672e4fbcd"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "cecb38e05ff1c5e6c0d79781efcf2973db6f68f0"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "5f576fdbbc9626fa9ef3986c2611285ea7fb34e3"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "b97dab8ea7387a69f499c6ab9827bc81b0ffd1ad"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "6d816a79fc954a186f9a3e9d8a909a392e0c8cb0"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "3f3a3b51d488a4940211951d698c59c33199a0a0"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "6d07bd223fd7848c4f92170f299df7091feda8dc"; } + { locale = "si"; arch = "linux-i686"; sha1 = "7b4cf9716f6c4333b143b61ce0ae7f7bf8832839"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "3887efcc6f8a87bdee12aeaeb1e4ad9666e1fba0"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "5d5f9db2a454e40c20db7728140b1e7b71e0f316"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "d8a0e81544d9055f39d0b8e425499e5da7ae2cde"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "f67d1c091a83a129e0f9da21c40a21e54192dfab"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "cf404307b7a5c1346c84f12272526ccc34509794"; } + { locale = "son"; arch = "linux-i686"; sha1 = "72d178beda4c3141ccccb0fd75d1a96e72b8f522"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "aad4b807fcbf460eb0fa0234d36092e0ca75e286"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "72f0b6ff9321bf171e7991853d37416e79db2598"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "c25dd452bd1a76d7aff4542caf4fd02f7cdcf751"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "ab0f31e1f704d125d3deb73dae6b5513f4f66cec"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "680edf9cb98b47ef92e3a9fbaa1bb66fc927003a"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "10e1fbc3cc3f2284fd28ce06c3af22d7010fa664"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "1317fc854581a50a4291bb38ff6954fe37d25efa"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "81188a3e20db29040202b24f99b073daef759f05"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "230488965e68f9170ca7b6623a599e4ec592012d"; } + { locale = "te"; arch = "linux-i686"; sha1 = "ff6048c8c949ef3b4fa821bedd95c046e3a7a7e4"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "02954fbabaf0688e1588652d5be08cb3784ff2aa"; } + { locale = "th"; arch = "linux-i686"; sha1 = "77759d296e5c85741aad42124e51913005215b71"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "8572f88439049bff5e32f4e9929f07c23dcde569"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "07101c61d8a1a7a153c9993f29c2ae7bd46c6ae2"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "dbd64d165bc9bb01545b6d31acdd4fb874f250a9"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "0e00df0f77fd8c7adb1a7822285a8410df92dd48"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "064760c31c2b78fd155a548f18be6bd82746aa7d"; } + { locale = "uz"; arch = "linux-i686"; sha1 = "39e185b485b6808619f4fb0853e161d31dfc07f4"; } + { locale = "uz"; arch = "linux-x86_64"; sha1 = "8842689c5894ea116f637691627f8513e22e00fb"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "db96505385175ae4267ae6774c6f6375db8f7dca"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "8a9e2e5b17619857a0a2c795ffd7c04d1a767559"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "2e3e0aeff9143b74e464d532eb4c94dc72165303"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "e24a2d824ffb5fe5f1f8678b8567fb58e925f3d4"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "6dbc06e58b5bf2b3b8f109c2ff1840ecfb1fdfd3"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "ae7868f33c6e4b15af3f6f6fcc18814a726d9c9f"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "4a46a545fbd4236b0eff0ade9ce57dc53458ad67"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "acec465483c0a2c445e9a3c9c5166c21308b9697"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb index 72b9d1599e0..308e0b71c05 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/generate_sources.rb @@ -6,7 +6,7 @@ version = if ARGV.empty? ARGV[0] end -base_path = "http://download-installer.cdn.mozilla.net/pub/thunderbird/releases" +base_path = "http://archive.mozilla.org/pub/thunderbird/releases" Source = Struct.new(:hash, :arch, :locale, :filename) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 241b43bc1f1..e6db0a3f74e 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_source.rb > source.nix { - version = "38.1.0"; + version = "38.2.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha1 = "0b5babaeec839aedb879b98dc540a3c44e1c0a39"; } - { locale = "ar"; arch = "linux-x86_64"; sha1 = "c70e123c8e04a8366e2a96a948006caf3b084d2f"; } - { locale = "ast"; arch = "linux-i686"; sha1 = "a17ad952ce2ec1dfe6dc797b4377ae694930578c"; } - { locale = "ast"; arch = "linux-x86_64"; sha1 = "dbf6b871e6ac7a5701a5e8ce1aa1c974e43c62db"; } - { locale = "be"; arch = "linux-i686"; sha1 = "e7f9d73339eb55d374a172445c11da33ecff8f8f"; } - { locale = "be"; arch = "linux-x86_64"; sha1 = "b619fc248f8cd704eebbf92bd999949e0a0d2935"; } - { locale = "bg"; arch = "linux-i686"; sha1 = "09cb9ee2b5a9d25430467961657a4d60610437d2"; } - { locale = "bg"; arch = "linux-x86_64"; sha1 = "c8b63f07ee7ac0d2f4e18f6e401d012c8bfcceae"; } - { locale = "bn-BD"; arch = "linux-i686"; sha1 = "d20033996503ad6f690e8fe8f8201bf02c453c98"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "f8b45a57a2ed4ce232d20224afdc6c4e0338743a"; } - { locale = "br"; arch = "linux-i686"; sha1 = "567ac67210f34a267e53f74f31cc91131f07eaa7"; } - { locale = "br"; arch = "linux-x86_64"; sha1 = "9cef9f6a5fbca4e1d0bc912dddf07200f1f8f8a4"; } - { locale = "ca"; arch = "linux-i686"; sha1 = "346d439ea1092f3c9a7d7077bb2fe3910d672935"; } - { locale = "ca"; arch = "linux-x86_64"; sha1 = "b099cc648318d7826949110d75851108f8dd2669"; } - { locale = "cs"; arch = "linux-i686"; sha1 = "3b72f45ccd22beb2fdfbc92014b4a3ccfa80e76b"; } - { locale = "cs"; arch = "linux-x86_64"; sha1 = "e38710c2d1f90202813d95b2fde32fdde4d4091e"; } - { locale = "cy"; arch = "linux-i686"; sha1 = "12a179f42fb8c3a11fc5985667e4f604e14ba8c5"; } - { locale = "cy"; arch = "linux-x86_64"; sha1 = "6407a7b3cd5b4dcb306823a4085c85f960c292f9"; } - { locale = "da"; arch = "linux-i686"; sha1 = "9c49871f3ff4ecfe33077c6ebf05e166d19651a0"; } - { locale = "da"; arch = "linux-x86_64"; sha1 = "8d6299fe5998113da4c623083957a204296affd5"; } - { locale = "de"; arch = "linux-i686"; sha1 = "06a6c73f4a640060ae7b8aa02011558d2767acb2"; } - { locale = "de"; arch = "linux-x86_64"; sha1 = "8fffb7568b982c1202de754cb2a2e8fcb16910f5"; } - { locale = "dsb"; arch = "linux-i686"; sha1 = "31a8674c191829fa4abeb403053b8266f23b983c"; } - { locale = "dsb"; arch = "linux-x86_64"; sha1 = "bb86a2aafcf5d6d358eeda8e572956b90ca1e275"; } - { locale = "el"; arch = "linux-i686"; sha1 = "3db0fafa71f7e1fe0cc9036c343d12aa35988e04"; } - { locale = "el"; arch = "linux-x86_64"; sha1 = "4ddd0c373b00621fa271a1301e75930f5acc6657"; } - { locale = "en-GB"; arch = "linux-i686"; sha1 = "6e240781d53a1853ee5be2eee18cdcb17949a228"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "d203791c4ce8da5d2e68a3485f3bed8933f929d3"; } - { locale = "en-US"; arch = "linux-i686"; sha1 = "0e4097922c16620c04bb68cd3474f813cf8c60e0"; } - { locale = "en-US"; arch = "linux-x86_64"; sha1 = "39bfc23dd04a59f3465e8a0b583ca72fc9bc2c8a"; } - { locale = "es-AR"; arch = "linux-i686"; sha1 = "82887b30873baff493688a3d9b2b8acb0e335ed1"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d48e6977535776e5547969c486abb68f4a7f70d2"; } - { locale = "es-ES"; arch = "linux-i686"; sha1 = "d9aad735745addbbe619ce51c6b793ce10a967bf"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "c429c1b6e38523b9912d5c9ae1425a48075fb2fd"; } - { locale = "et"; arch = "linux-i686"; sha1 = "9fe1aaab4c8f53b4d01b1374511121a3cba3b38d"; } - { locale = "et"; arch = "linux-x86_64"; sha1 = "b5759e44971e09703f4112499c85347fc30a5ef1"; } - { locale = "eu"; arch = "linux-i686"; sha1 = "0e91e95057246a9843faca8a0c53b772f329d51d"; } - { locale = "eu"; arch = "linux-x86_64"; sha1 = "b5cf9660cc877d3ca6943f4d365f02f3b5eb4ffa"; } - { locale = "fi"; arch = "linux-i686"; sha1 = "116118d2e4540502c2b71c9d1fcf121923016d8d"; } - { locale = "fi"; arch = "linux-x86_64"; sha1 = "fdbefa73fb355d4a97b7be2cc7f2785757c62d72"; } - { locale = "fr"; arch = "linux-i686"; sha1 = "f9055260509b2bc85a7e8a95d13c90be4443054f"; } - { locale = "fr"; arch = "linux-x86_64"; sha1 = "a5b880cea53c7ae278f6d6bb70208d697d2aa928"; } - { locale = "fy-NL"; arch = "linux-i686"; sha1 = "77ca3d79ff9d8ebef0dac367b0025515663d11b0"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "40f3c82cc93286032facea886636e95558ecedf3"; } - { locale = "ga-IE"; arch = "linux-i686"; sha1 = "1ecc581714b9ee079bea5de14cffdd35cea8a253"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "e5c270d9f4443068ba83dd6dcd7fb1bc318a8957"; } - { locale = "gd"; arch = "linux-i686"; sha1 = "c6db2b2d54257eb9376a95a63a8ec630661b859f"; } - { locale = "gd"; arch = "linux-x86_64"; sha1 = "bb561dd4a2cd0e72f6ec8d4abd7d30505603fbdf"; } - { locale = "gl"; arch = "linux-i686"; sha1 = "00d3aa2504711fa89190068427e9c8c3fdb20f8e"; } - { locale = "gl"; arch = "linux-x86_64"; sha1 = "4f0950bf70cea56969bf044d459799d54675b0ef"; } - { locale = "he"; arch = "linux-i686"; sha1 = "dbfc82675022ddf4ca69bd64aedd62b7c670b6e0"; } - { locale = "he"; arch = "linux-x86_64"; sha1 = "7c28e93a85543021861eb9314d3661edda04b086"; } - { locale = "hr"; arch = "linux-i686"; sha1 = "b39ac627848ade0617430e284fed55d3ae846b8d"; } - { locale = "hr"; arch = "linux-x86_64"; sha1 = "3ae901876dbe64fa30969dedc1d60e092a4f7924"; } - { locale = "hsb"; arch = "linux-i686"; sha1 = "0d20bc9316882548fa3ce9797af3fdc95ff88cfe"; } - { locale = "hsb"; arch = "linux-x86_64"; sha1 = "3a94683a81a76ce73453f2b3466c256b3e3e1e66"; } - { locale = "hu"; arch = "linux-i686"; sha1 = "88998fc8b637cbde34c37120e637ebd1a080f75b"; } - { locale = "hu"; arch = "linux-x86_64"; sha1 = "374cc24a23cc80c552044c43dbc2547d9adb2661"; } - { locale = "hy-AM"; arch = "linux-i686"; sha1 = "1a6ad2c0d105daadf68db573871f45e6a83a8781"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "a43817b520218e6f5b83365bb6d5784f82fd3c61"; } - { locale = "id"; arch = "linux-i686"; sha1 = "be03aa731ca6385f447d21e5b089fce89abdb605"; } - { locale = "id"; arch = "linux-x86_64"; sha1 = "dcadd18432c9dbd31c23ba260c1b278e96620c55"; } - { locale = "is"; arch = "linux-i686"; sha1 = "e40cba8fb39620ac3e065e27ae9bb2756d5f0808"; } - { locale = "is"; arch = "linux-x86_64"; sha1 = "81d7b1212a49d3e3f4cce405bb32ab8b57b53183"; } - { locale = "it"; arch = "linux-i686"; sha1 = "d1719489c95ad26dee243f4b13a7a3c13c80731a"; } - { locale = "it"; arch = "linux-x86_64"; sha1 = "a5a86761df367d015d6b63f85db7c091be9f7557"; } - { locale = "ja"; arch = "linux-i686"; sha1 = "cb934acf447a20761fb61be41a5093011962ed74"; } - { locale = "ja"; arch = "linux-x86_64"; sha1 = "b08541d43c30c64df64f1fa9e3e444a00a1ce66b"; } - { locale = "ko"; arch = "linux-i686"; sha1 = "5f6b9a343ad93c969ff864775cacbf008fd5683c"; } - { locale = "ko"; arch = "linux-x86_64"; sha1 = "e1551063d40661de6a0067bb6d51ad0e89ad08f6"; } - { locale = "lt"; arch = "linux-i686"; sha1 = "9c07080670ec9f1a57aec634f81cfd73defd9ccf"; } - { locale = "lt"; arch = "linux-x86_64"; sha1 = "44eeb1185f75ba2a8e4a34c161161862a12dc54c"; } - { locale = "nb-NO"; arch = "linux-i686"; sha1 = "26d12843a80bcbe4ea8008429bd075794e9dab20"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "89fec10ec8be9a298fed4ae5ebda68b117ee35ad"; } - { locale = "nl"; arch = "linux-i686"; sha1 = "13bea7053d38cb7d00950cf4d13fe06cab33b4e7"; } - { locale = "nl"; arch = "linux-x86_64"; sha1 = "1c927583ab814caac16ece34156110826ddbdf37"; } - { locale = "nn-NO"; arch = "linux-i686"; sha1 = "1c8ca9891483fe489f26b82d5b81562223af1210"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "88db986d9de826407f1692c1fddc64068eb190bb"; } - { locale = "pa-IN"; arch = "linux-i686"; sha1 = "db25c5d46fbab8692882bf32422eb334a5790ed4"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "a50bf1a7277a7bbbc162a547916abae63a49becd"; } - { locale = "pl"; arch = "linux-i686"; sha1 = "b4500262a14c781546966bc713c1a574b29bd221"; } - { locale = "pl"; arch = "linux-x86_64"; sha1 = "196c388eb6bc00099196cc6774fa2fa327b36d81"; } - { locale = "pt-BR"; arch = "linux-i686"; sha1 = "19e5c34a64a0a2d7258f285ad3d4182e0c1859e2"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "cf17768842cdbfc3fb4f922655e102ace1420b4c"; } - { locale = "pt-PT"; arch = "linux-i686"; sha1 = "60cb1312edde3d610ba7b786f7e0030066c097fc"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "82535ac23e75f77767a844735b5950109ed7ef15"; } - { locale = "rm"; arch = "linux-i686"; sha1 = "15bdb9f7b06ad28ab5bb6a219afc2cf98bd94689"; } - { locale = "rm"; arch = "linux-x86_64"; sha1 = "ba4aa04ea6380d6ca9e5776806f478da3a18acf2"; } - { locale = "ro"; arch = "linux-i686"; sha1 = "30319593b61aa454c72e372c47c97fd98e425cfa"; } - { locale = "ro"; arch = "linux-x86_64"; sha1 = "364734483184c769370ca2948dc9335bfe6fe1ba"; } - { locale = "ru"; arch = "linux-i686"; sha1 = "5b5bf58fb96072590d4d3e9e1f7239c352910b49"; } - { locale = "ru"; arch = "linux-x86_64"; sha1 = "bee00bc517deaa46d5e409d80b54f19bf8133e44"; } - { locale = "si"; arch = "linux-i686"; sha1 = "17d313829c47fc57256181b5a916605860f5c20f"; } - { locale = "si"; arch = "linux-x86_64"; sha1 = "69d536b6c14b29a86503cf9d492e20318e6ca550"; } - { locale = "sk"; arch = "linux-i686"; sha1 = "01e1fa5218459dc6e32d7a4d51bd120bc96c3f13"; } - { locale = "sk"; arch = "linux-x86_64"; sha1 = "24cfbe861062ba1f3e5847b4b05c925a2db52518"; } - { locale = "sl"; arch = "linux-i686"; sha1 = "b01bd9bff5d31998f69cbc18c31df3798346d5bb"; } - { locale = "sl"; arch = "linux-x86_64"; sha1 = "ab0a0ffc3816923384f519caef4b07830526a3b1"; } - { locale = "sq"; arch = "linux-i686"; sha1 = "e310ae1b0f32c67ccc03097fe9917f37eca3b271"; } - { locale = "sq"; arch = "linux-x86_64"; sha1 = "2d746d4743ca5be9dfb082129f2527ef4453e8f8"; } - { locale = "sr"; arch = "linux-i686"; sha1 = "9053948612aa9de8898d7e3606eb08d855fff41a"; } - { locale = "sr"; arch = "linux-x86_64"; sha1 = "b3c621a120756aba91c985deb06a31051b63468f"; } - { locale = "sv-SE"; arch = "linux-i686"; sha1 = "ef7480dc06af7376387a27da47e49bd2e5078453"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "c23f9b1832ab1d0317d09017c5a39824638da921"; } - { locale = "ta-LK"; arch = "linux-i686"; sha1 = "eea8f9b4832b6bdc61b0cd4dedb5d78aae02c953"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "75f4856b28f589098599a786a242681a911ff92e"; } - { locale = "tr"; arch = "linux-i686"; sha1 = "5ca3104abb9636ffcd5cdf913b14f48ba2a03977"; } - { locale = "tr"; arch = "linux-x86_64"; sha1 = "8edb7885b506d1b4288bded01dccb00b89c929f2"; } - { locale = "uk"; arch = "linux-i686"; sha1 = "2776e9dc93263ac8c7cf757e0a03f71b0a3d2a9c"; } - { locale = "uk"; arch = "linux-x86_64"; sha1 = "7ec1dc5df673394c3e61293d92d369045a0d2bd6"; } - { locale = "vi"; arch = "linux-i686"; sha1 = "1582f2552bc644729ffcb0d42b405e065a56ca9c"; } - { locale = "vi"; arch = "linux-x86_64"; sha1 = "5e24d1ce8e6b74883dabb70dc1ac03c034e6e659"; } - { locale = "zh-CN"; arch = "linux-i686"; sha1 = "f8df723a211049e853628b5f2dd7240b4216871c"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "2cb69569638090ae09d552e95aaae40b876144e3"; } - { locale = "zh-TW"; arch = "linux-i686"; sha1 = "ca3790624a90e49e7271bccf3870a8da629df074"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "ebe6e83ee9f2fce3823d01c4900231bc00682fba"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "e78d69e77c7a41a5d1db177d1ff2011620d0030e"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "0392f81672db2005796966f125a50722d62437d5"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "583d831cc2a2b9707e76ecead28d830ce4971b0e"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "741ce8879c18477048eace82676a4e3dc8a9c248"; } + { locale = "be"; arch = "linux-i686"; sha1 = "f838f7034293f188566d5866a8e02a7045477deb"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "cd32f6da77e0c9f0d82659105f696daa8ad71798"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "784d23acca591ebceca30c67e0468e53c9ee2776"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "547e8d013635e88e1575a68b0ea11b375c430213"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "7ddc0b28640e4e43fa5d70790a46be663962be99"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "b56e9b9e781f73074d2c4ee19e5bd267c6aad9ec"; } + { locale = "br"; arch = "linux-i686"; sha1 = "a28f9b548ae4c081e792b77dda3395874b355d13"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "2c37c60ea39218abe1e937be7584ca9966cc6c81"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "1fecd72a93a5d76c506dfc5c95e6f0e613f5e89f"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "32063fa5a27838a4ca9f5dd7c091e01b464653b2"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "32ccce02f24ba87cd1c8e5997feb95c6e54b8cbd"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "98ce62455ffbb373eb47f3c107042510b4ceae23"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "4eb168b3858107239fef24c97da279c5f33c737a"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "4d1dea9922cebc848bb45d82d413968b99f06e73"; } + { locale = "da"; arch = "linux-i686"; sha1 = "87b5de179a6be0cc8cca4c125fe32b6c0a23e08b"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "06a0bd4ac2a7709703c3cc860268fcdbccf2ac83"; } + { locale = "de"; arch = "linux-i686"; sha1 = "00f40a074255e4f3fe2d3bead1a37b1d406bca68"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "9e58b681b85028a932104295a8e39e209a21e549"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "0ee112d071dd3fb580521bf730e762e314c3c0fb"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "69a01bc3875151dd3a7b283f8edc44896778f00d"; } + { locale = "el"; arch = "linux-i686"; sha1 = "3ac525634c74814cd8fd73b841b4aa8095af6ca4"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "cce461a7de648677ada0e7ab144c6b492044a370"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "321795d34d8708fff3149d99db41abbde3d59a38"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "f9435cb01e929591ab54f313442c42fc31007041"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "415c1b828bad3680da7b6f0ac6c6d85be3002ca5"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "56eddaa513439a3c66deed3b1396660cecfb7224"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "9963d13b6b6ab8fe4df7f69fee812e8ed3c79f2b"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "4c64efa0c7b3b46e3db8c2a8bf1afa7fd59b1afb"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "7fe8db80f25a155a4fbe606b43e8ea192bdeb2d3"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "2a5f57603236604829e5d75103216b2239354b04"; } + { locale = "et"; arch = "linux-i686"; sha1 = "f99161ca84c7bf660198481757a97505bff41016"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "220155dbc6f604f3a3daaaa5bafd8f096409931a"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "117546c2ea2d2410e0d0da57f79b8a17e39fea0d"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "ec22ab958396424a1134c6e2e7a6f182ef38d2e3"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "2115972a75ab795253b1ac639b3c939cc90b186c"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "c59da6176e5278f05c489449d477a8b508612efc"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "76a50fa696f0f489cd129fd5590853a6b689987e"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "772b5eab11f94b2f7713e43b7c384f9d24d407bc"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "156b5e3a99bb2ee1bc489f3f1d06643860709d55"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "02c52d17d1d2d98d1281ae957205eabb0dae4c3a"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "f1e8e28988504c4bec059348942d38b3c1a3b3f3"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "80491a140c3d3b29f46eb882c41fa84842e3e44b"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "412e478fb2a56fb53ca27fdf01346a1c8f3e7a53"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "31a4aee19453bc754db2149e2cfa952ee6829ef7"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "70e5d130dc08a86d7ae7b28e29fbd7485e750a6e"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "b0735f3f05f36b174399300c8eb8c851aa92ea1c"; } + { locale = "he"; arch = "linux-i686"; sha1 = "28eda52f1a9b13c15faeb87b241bef6be001f856"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "d311d07f86e3280d422dcaa76925308dec1bbf29"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "d19f966f31fa298a4d6d2b61d83a407c950b94ba"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "b730ed1556bc3337dba3d4391773746c344fd16d"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "bb6e4f02d1b7ebfa56c3510fe7707218c7ee0fbc"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "826ce8b68e61a6c6e340ab7e2766f7a432927aa0"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "af06b6b2d52dba79ca21cfc7e9eff1b135ba79f8"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "c90755e7048bb1b33d0407010db770a3a20f144a"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "56992cb46445b4f389e62e5e621a09ee37558864"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "764c62cb4b44f25947ef778cd78de2ce17546da6"; } + { locale = "id"; arch = "linux-i686"; sha1 = "02170606677c5d1177e98fec537ab9997d1d2bb2"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "9079cdf731c69ad204ec2e4d92b1b9e7e476b8f8"; } + { locale = "is"; arch = "linux-i686"; sha1 = "59e47a5d030c8a18faaff875d06fc2fee8ff2fa9"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "207c2e8671f9266c70b03c42e4b6952c7b139fcc"; } + { locale = "it"; arch = "linux-i686"; sha1 = "cb724a67e5e0413f670602cb351fd8c7538d4074"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "24901bb227c7df290d030bfaccf048b6fbbd2bf6"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "8df9208999956eea39f4774c482da5db3ed5662b"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "6f29589c86eee9cf95410c0e0098e2b96bffb4d0"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "e266fb9dba4368e80d206c248fe3c1bc202dc064"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "106a6152a5f91407ee1cde665f70b39fbe6bfe69"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "3385483d2db12873b645add7e16455874cd2ac91"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "fb2aafa56998000c6f08730c467d7fb3e37a7f70"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "93a2f4e45b47335cad077581601b1da6becb5e5b"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "7d609d01d0cf46b2d94f15253e0e1cd1ba42d6ac"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "35d4c18935d64b4ca371eed75def0cda549715ad"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "168a20038f76eafec00a63501019a55b59b7c9b0"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "3fc3c67c8f60814f70e8b53d7896d392b38b1af6"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "be54f52ea730447b53e020c1ed0c804a7f22bf40"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "8a4db5fea163ebbb7738f86d878f371323b0da10"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "71ac68f8b117549e7a66207ca556cfc951827406"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "1d5fcf5ce59e552e1d122249a158d4956e6e9610"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "1519da5234c5a7a7ba569c1d995a8ecefcd266aa"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "913ba6f41cdbde5a4d0bb7d67751c29d29a4b294"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "ca6e7915533cacd710980711e8143061e6e7fc2e"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "5578ba04b7d431a78728cb08cd25513c269db003"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "a2a42233fac046158dbe8ee2f743cddb53df151a"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "e8abf6f03cb05a42c47c6dcb68ab9226229fcc14"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "0a69eb3783653ee645c443b24feb1c100a2e0688"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "73fb22e26cd39b32ba42d427d200dd20f6206884"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "9ea1dbfc283efb72abca7b7ef97c168c54026b0b"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "fa9e4eb824a7f2d09bfcf66eb7740e4bdff24131"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "a0f6e30587f549f44140bbd9fcb7c3abe12e5ec3"; } + { locale = "si"; arch = "linux-i686"; sha1 = "cbed568fa683f3b95bd5e63470f5035d67135c8b"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "613576519cc050facff46a4c419f997d2a9660f4"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "e22226e26405d9aac5bac49e458f08980ffa7419"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "d96029ff232537645a6d9f93394e02e9c68b8c2a"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "cfb39baf1c3637d4e77f177d4075ec6a1d78e522"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "78264ea3ff48ff1e5e89c174a181636fe5498f7d"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "c55b151b1945ca507fef2e00a492fda7dc622f80"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "75138732d8f82a879c0ba3c657dde6e41192f55c"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "34e9e650bc5adc27a4262897914d8b97d65d9d95"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "236189aa59dee7d991d2c7e15467666d9fa1c4ec"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "924e01fad080da3c2f52834d9f55511cc2c56781"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "2c5ad3832956d427f5a415681145fb2e32a1be71"; } + { locale = "ta-LK"; arch = "linux-i686"; sha1 = "b87a9ec4cc658cfb0fcf45f82546ed385104bbdd"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha1 = "db30febd32a867e125df3039dfcef74055f4428e"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "513c56c7308d6562a14b268e17f6f7d79e4860da"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "9f69846c81b847736b917521fae2f6c1cdcaea38"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "d43edd5cce1f121e2676b3876ca4579142e7df21"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "4eeddcadc812dc66a7c510e39018baf98ed928bc"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "75832dada4af3880d00d5918a2d8b2e5ad50fb53"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "8521ce3fb633bd9deafb2bdbba5b8a487a08e23a"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "22ec231d065c73627c39147b34c656dfdcd27d14"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "fa037a2ba7e8559ed8bbbc86772dcff24eada7e3"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "685ec1667d29b45a144cba118ad97eb3b340feb8"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "859f97ddbb05c76495fd09c4f039bc6324cc60a1"; } ]; } From 3d37dcc9eb8f057f01927fc837e3692405139597 Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Sat, 15 Aug 2015 21:28:02 +0200 Subject: [PATCH 07/58] ardour: 4.1 -> 4.2 --- pkgs/applications/audio/ardour/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 593ca89451a..e47dbfb856b 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -15,7 +15,7 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "4.1"; + tag = "4.2"; in From e31e28602ff9168387de1c215415ef2b4f696d8d Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Sat, 15 Aug 2015 21:59:31 +0200 Subject: [PATCH 08/58] rkrlv2: initial version at beta --- pkgs/applications/audio/rkrlv2/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/audio/rkrlv2/default.nix diff --git a/pkgs/applications/audio/rkrlv2/default.nix b/pkgs/applications/audio/rkrlv2/default.nix new file mode 100644 index 00000000000..9c41c88b012 --- /dev/null +++ b/pkgs/applications/audio/rkrlv2/default.nix @@ -0,0 +1,24 @@ +{ stdenv, pkgs, fetchFromGitHub, +automake, pkgconfig, lv2, fftw, cmake, xlibs, libjack2, libsamplerate, libsndfile +}: + +stdenv.mkDerivation rec { + repo = "rkrlv2"; + name = "${repo}-b1.0"; + + src = fetchFromGitHub { + owner = "ssj71"; + inherit repo; + rev = "a315f5aefe63be7e34663596b8b050410a9b7e72"; + sha256 = "0kr3rvq7n1bh47qryyarcpiibms601qd8l1vypmm61969l4d4bn8"; + }; + + buildInputs = with xlibs; [ automake pkgconfig lv2 fftw cmake libXpm libjack2 libsamplerate libsndfile libXft ]; + + meta = { + description = "Rakarrak effects ported to LV2"; + homepage = https://github.com/ssj71/rkrlv2; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.joelmo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23413feea81..56ded529983 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2850,6 +2850,8 @@ let rkflashtool = callPackage ../tools/misc/rkflashtool { }; + rkrlv2 = callPackage ../applications/audio/rkrlv2 {}; + rmlint = callPackage ../tools/misc/rmlint { inherit (pythonPackages) sphinx; }; From bf5eece51d0a75984f6868cd6a779e8ce33f61df Mon Sep 17 00:00:00 2001 From: Joel Moberg Date: Sun, 16 Aug 2015 18:00:35 +0200 Subject: [PATCH 09/58] Make fetchFromGitHub return an additional attr rev This means it is more consistent with fetchgit which returns rev. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56ded529983..0f2fbc8da5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -398,7 +398,7 @@ let inherit name sha256; url = "https://github.com/${owner}/${repo}/archive/${rev}.tar.gz"; meta.homepage = "https://github.com/${owner}/${repo}/"; - }; + } // { inherit rev; }; fetchFromBitbucket = { owner, repo, rev, sha256, name ? "${repo}-${rev}-src" }: fetchzip { inherit name sha256; From fea03379d635800ca9e96f36467f80d5d5189357 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sat, 18 Oct 2014 09:30:31 +0000 Subject: [PATCH 10/58] nixos: add /share/doc and /share/nano (for symmetry) to environment.pathsToLink and sort all of them --- nixos/modules/config/system-path.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index d7979593f40..ec112b63b2f 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -105,12 +105,14 @@ in "/lib" "/man" "/sbin" + "/share/doc" "/share/emacs" - "/share/vim-plugins" - "/share/org" "/share/info" - "/share/terminfo" "/share/man" + "/share/nano" + "/share/org" + "/share/terminfo" + "/share/vim-plugins" ]; system.path = pkgs.buildEnv { From c6256c0e3e4292080b8574a483bdfce4b7d81b5f Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 17 Aug 2015 16:04:16 +0000 Subject: [PATCH 11/58] nixos: generate infodirs directly in system-path `man 1 info` says: The first non-option argument, if present, is the menu entry to start from; it is searched for in all `dir' files along INFOPATH. If it is not present, info merges all `dir' files and shows the result. Any remaining arguments are treated as the names of menu items relative to the initial node visited. Which means that this does what previous programs/info did and #8519 (on-the-fly infodir generation for Emacs) wanted to do, but for both programs. --- nixos/modules/config/system-path.nix | 8 ++++++ nixos/modules/module-list.nix | 1 - nixos/modules/programs/info.nix | 38 ---------------------------- 3 files changed, 8 insertions(+), 39 deletions(-) delete mode 100644 nixos/modules/programs/info.nix diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index ec112b63b2f..3a9a09ee87c 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -45,6 +45,7 @@ let pkgs.strace pkgs.su pkgs.time + pkgs.texinfoInteractive pkgs.utillinux extraManpages ]; @@ -138,6 +139,13 @@ in if [ -x $out/bin/update-desktop-database -a -w $out/share/applications ]; then $out/bin/update-desktop-database $out/share/applications fi + + if [ -x $out/bin/install-info -a -w $out/share/info ]; then + shopt -s nullglob + for i in $out/share/info/*.info $out/share/info/*.info.gz; do + $out/bin/install-info $i $out/share/info/dir + done + fi ''; }; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 733f3c5d853..6586b36968a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -61,7 +61,6 @@ ./programs/command-not-found/command-not-found.nix ./programs/dconf.nix ./programs/environment.nix - ./programs/info.nix ./programs/ibus.nix ./programs/kbdlight.nix ./programs/light.nix diff --git a/nixos/modules/programs/info.nix b/nixos/modules/programs/info.nix deleted file mode 100644 index 253f9e87769..00000000000 --- a/nixos/modules/programs/info.nix +++ /dev/null @@ -1,38 +0,0 @@ -{config, pkgs, ...}: - -let - - texinfo = pkgs.texinfoInteractive; - - # Quick hack to make the `info' command work properly. `info' needs - # a "dir" file containing all the installed Info files, which we - # don't have (it would be impure to have a package installation - # update some global "dir" file). So this wrapper script around - # "info" builds a temporary "dir" file on the fly. This is a bit - # slow (on a cold cache) but not unacceptably so. - infoWrapper = pkgs.writeScriptBin "info" - '' - #! ${pkgs.stdenv.shell} - - dir=$(mktemp --tmpdir -d "info.dir.XXXXXX") - - if test -z "$dir"; then exit 1; fi - - trap 'rm -rf "$dir"' EXIT - - shopt -s nullglob - - for i in $(IFS=:; echo $INFOPATH); do - for j in $i/*.info; do - ${texinfo}/bin/install-info --quiet $j $dir/dir - done - done - - INFOPATH=$dir:$INFOPATH ${texinfo}/bin/info "$@" - ''; # */ - -in - -{ - environment.systemPackages = [ infoWrapper texinfo ]; -} From 4cc5be347ad839d7ca6ccf8875c055b9d143f90d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Aug 2015 15:03:51 +0200 Subject: [PATCH 12/58] haskell-configuration-ghc-head: update obsolete jailbreak-cabal override --- .../configuration-ghc-head.nix | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 0eff5705805..c8b6f33d847 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -34,11 +34,22 @@ self: super: { xhtml = null; # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9. - jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal; - - # GHC 7.10.x's Haddock binary cannot generate hoogle files. - # https://ghc.haskell.org/trac/ghc/ticket/9921 - mkDerivation = drv: super.mkDerivation (drv // { doHoogle = false; }); + Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: { + version = "1.23.0.0"; + src = pkgs.fetchFromGitHub { + owner = "haskell"; + repo = "cabal"; + rev = "fe7b8784ac0a5848974066bdab76ce376ba67277"; + sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s"; + }; + jailbreak = false; + doHaddock = false; + postUnpack = "sourceRoot+=/Cabal"; + }); + jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: { + executableHaskellDepends = [ self.Cabal_1_23_0_0 ]; + preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal"; + }); # haddock: No input file(s). nats = dontHaddock super.nats; From 7e80417fa84d762ccd6b79c92482469973e7a62f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Aug 2015 21:28:33 +0200 Subject: [PATCH 13/58] coq-QuickChick: 21f50a02 -> 20150605 --- pkgs/development/coq-modules/QuickChick/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix index 9141bfd24d1..3e7731d4d94 100644 --- a/pkgs/development/coq-modules/QuickChick/default.nix +++ b/pkgs/development/coq-modules/QuickChick/default.nix @@ -1,18 +1,20 @@ {stdenv, fetchgit, coq, coqPackages}: +let revision = "b73a594af5460567dc233b2f2e7b0f781ae0490d"; in + stdenv.mkDerivation rec { name = "coq-QuickChick-${coq.coq-version}-${version}"; - version = "21f50a02"; + version = "20150605-${builtins.substring 0 7 revision}"; src = fetchgit { url = git://github.com/QuickChick/QuickChick.git; - rev = "21f50a02e752f6d99d5bfefefcd2ad45df5e778a"; - sha256 = "15hsirm443cr098hksfcg3nbjm9mdnmxzpz61qq7ap7lglabl7pw"; + rev = revision; + sha256 = "1yql40x1zbrc6wzfafvfaxzhw57v1n468lxdv1rvsjd7gyyf74y7"; }; - buildInputs = [ coq.ocaml coq.camlp5 coqPackages.ssreflect ]; - propagatedBuildInputs = [ coq ]; + buildInputs = [ coq.ocaml coq.camlp5 ]; + propagatedBuildInputs = [ coq coqPackages.ssreflect ]; enableParallelBuilding = true; From d8487667cfe3f83f857b45d4927a19d9181b7f4c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 17 Aug 2015 19:45:13 +0000 Subject: [PATCH 14/58] haskell-packages: bring hoogle to the masses by imlementing ghcWithHoogle Replace `ghcWithPackages` to `ghcWithHoogle` in your config and enjoy. --- pkgs/development/haskell-modules/default.nix | 23 +++++++++++++++----- pkgs/development/haskell-modules/hoogle.nix | 4 ++++ 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index ab3ac6930b9..7e6f1c0552d 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -47,18 +47,29 @@ let defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; + withPackages = packages: callPackage ./with-packages-wrapper.nix { + inherit (self) llvmPackages; + haskellPackages = self; + inherit packages; + }; + in import ./hackage-packages.nix { inherit pkgs stdenv callPackage; } self // { inherit mkDerivation callPackage; - ghcWithPackages = pkgs: callPackage ./with-packages-wrapper.nix { - inherit (self) llvmPackages; - haskellPackages = self; - packages = pkgs self; - }; + ghcWithPackages = selectFrom: withPackages (selectFrom self); - ghc = ghc // { withPackages = self.ghcWithPackages; }; + ghcWithHoogle = selectFrom: + let + packages = selectFrom self; + hoogle = callPackage ./hoogle.nix { inherit packages; }; + in withPackages (packages ++ [ hoogle ]); + + ghc = ghc // { + withPackages = self.ghcWithPackages; + withHoogle = self.ghcWithHoogle; + }; }; diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 822c2bdd82e..89e9b157e68 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -98,6 +98,10 @@ stdenv.mkDerivation { chmod +x $out/bin/hoogle ''; + passthru = { + isHaskellLibrary = false; # for the filter in ./with-packages-wrapper.nix + }; + meta = { description = "A local Hoogle database"; platforms = ghc.meta.platforms; From 00137438459949bfbd2c0311e8664a9da8bb1e53 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Mon, 17 Aug 2015 23:55:04 +0000 Subject: [PATCH 15/58] haskell-packages: make hoogle wrapper much more helpful * Build most of the stuff on /tmp, not in /nix/store. * Generate hoogle database for all the dependencies. * Generate haddock index and contents files. * Cleanup. --- .../haskell-modules/hoogle-local-wrapper.sh | 3 +- pkgs/development/haskell-modules/hoogle.nix | 62 ++++++++++++------- pkgs/development/haskell-modules/lib.nix | 1 + 3 files changed, 40 insertions(+), 26 deletions(-) diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh index 13ea889119c..471b2c81584 100644 --- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh +++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh @@ -2,5 +2,4 @@ COMMAND=$1 shift -HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \ - "$COMMAND" -d @out@/share/hoogle "$@" +exec @hoogle@/bin/hoogle "$COMMAND" -d @out@/share/doc/hoogle "$@" diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 89e9b157e68..e2f6c289a80 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -23,7 +23,7 @@ # This will build mmorph and monadControl, and have the hoogle installation # refer to their documentation via symlink so they are not garbage collected. -{ stdenv, hoogle, rehoo +{ lib, stdenv, hoogle, rehoo , ghc, packages ? [ ghc.ghc ] }: @@ -35,62 +35,76 @@ stdenv.mkDerivation { name = "hoogle-local-0.1"; buildInputs = [hoogle rehoo]; - phases = [ "installPhase" ]; + phases = [ "buildPhase" ]; - docPackages = packages; - installPhase = '' + docPackages = (lib.closePropagation packages); + + buildPhase = '' if [ -z "$docPackages" ]; then echo "ERROR: The packages attribute has not been set" exit 1 fi - mkdir -p $out/share/hoogle/doc - export HOOGLE_DOC_PATH=$out/share/hoogle/doc - - cd $out/share/hoogle + mkdir -p $out/share/doc/hoogle function import_dbs() { find $1 -name '*.txt' | while read f; do newname=$(basename "$f" | tr '[:upper:]' '[:lower:]') if [[ -f $f && ! -f ./$newname ]]; then - cp -p $f ./$newname + cp -p $f "./$newname" hoogle convert -d "$(dirname $f)" "./$newname" fi done } - for i in $docPackages; do - findInputs $i docPackages propagated-native-build-inputs - findInputs $i docPackages propagated-build-inputs + echo importing builtin packages + for docdir in ${ghc}/share/doc/ghc*/html/libraries/*; do + if [[ -d $docdir ]]; then + import_dbs $docdir + ln -sfn $docdir $out/share/doc/hoogle + fi done + echo importing other packages for i in $docPackages; do if [[ ! $i == $out ]]; then for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do + name=`basename $docdir` + docdir=$docdir/html if [[ -d $docdir ]]; then import_dbs $docdir - ln -sf $docdir $out/share/hoogle/doc + ln -sfn $docdir $out/share/doc/hoogle/$name fi done fi done - import_dbs ${ghc}/share/doc/ghc*/html/libraries - ln -sf ${ghc}/share/doc/ghc*/html/libraries/* $out/share/hoogle/doc - + echo building hoogle database + # FIXME: rehoo is marked as depricated on Hackage chmod 644 *.hoo *.txt rehoo -j4 -c64 . - rm -fr downloads *.dep *.txt - mv default.hoo x || exit 0 - rm -f *.hoo - mv x default.hoo || exit 1 + mv default.hoo .x + rm -fr downloads *.dep *.txt *.hoo + mv .x $out/share/doc/hoogle/default.hoo - if [ ! -f default.hoo ]; then - echo "Unable to build the default Hoogle database" - exit 1 - fi + echo building haddock index + # adapted from GHC's gen_contents_index + cd $out/share/doc/hoogle + args= + for hdfile in `ls -1 */*.haddock | grep -v '/ghc\.haddock' | sort` + do + name_version=`echo "$hdfile" | sed 's#/.*##'` + args="$args --read-interface=$name_version,$hdfile" + done + + ${ghc}/bin/haddock --gen-index --gen-contents -o . \ + -t "Haskell Hierarchical Libraries" \ + -p ${ghc}/share/doc/ghc*/html/libraries/prologue.txt \ + $args + + echo finishing up mkdir -p $out/bin substitute ${wrapper} $out/bin/hoogle \ --subst-var out --subst-var-by shell ${stdenv.shell} \ diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 526bb5c3248..9f9eba0675d 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -85,6 +85,7 @@ rec { withHoogle = haskellEnv: with haskellEnv.haskellPackages; import ./hoogle.nix { inherit (pkgs) stdenv; + inherit (pkgs.stdenv) lib; inherit hoogle rehoo ghc; packages = haskellEnv.paths; }; From c80af74a84b4286cc7869abbe85197f9d9f8cc24 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 18 Aug 2015 17:01:07 +0000 Subject: [PATCH 16/58] haskell-packages: throw withHoogle away from the lib --- pkgs/development/haskell-modules/lib.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index 9f9eba0675d..5b2ba44d86d 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -82,11 +82,6 @@ rec { triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; }); - withHoogle = haskellEnv: with haskellEnv.haskellPackages; - import ./hoogle.nix { - inherit (pkgs) stdenv; - inherit (pkgs.stdenv) lib; - inherit hoogle rehoo ghc; - packages = haskellEnv.paths; - }; + #FIXME: throw this away sometime in the future. added 2015-08-18 + withHoogle = throw "withHoogle is no longer supported, use ghcWithHoogle instead"; } From 848c1a72b2ab1912bce19d06a750920afbe99df4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Aug 2015 23:02:35 +0200 Subject: [PATCH 17/58] gnome-control-center: don't add sounds to userEnv It's not needed after all. See discussion at https://github.com/NixOS/nixpkgs/pull/9308. --- .../gnome-3/3.16/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index edd35202314..0f95f322d13 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; propagatedUserEnvPkgs = - [ gnome3.gnome_themes_standard gnome3.libgnomekbd sound-theme-freedesktop ]; + [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; # https://bugzilla.gnome.org/show_bug.cgi?id=752596 enableParallelBuilding = false; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { preFixup = with gnome3; '' wrapProgram $out/bin/gnome-control-center \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" for i in $out/share/applications/*; do substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" done From 69367e4ebcacd65b8e4fce52c80c7d6bda20c404 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 18 Aug 2015 23:21:07 +0200 Subject: [PATCH 18/58] blender: unbreak cudaSupport Currently it errors out at build time with: /nix/store/HASH-cudatoolkit-6.5.19/usr_include/host_config.h:82:2: error: #error -- unsupported GNU version! gcc 4.9 and up are not supported! Instead of downgrading gcc to 4.8, this patch upgrades cuda to 7.0, which I think is the better choice. (Cuda 7 dropped support for some older graphics cards, but gained support for newer ones.) --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01299dc671d..1ccc2032284 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,7 +3,7 @@ , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw , jackaudioSupport ? false, libjack2 -, cudaSupport ? false, cudatoolkit65 +, cudaSupport ? false, cudatoolkit7 , colladaSupport ? true, opencollada }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudatoolkit65 + ++ optional cudaSupport cudatoolkit7 ++ optional colladaSupport opencollada; postUnpack = From 2d40eecedafccf891625bafffff21206becb7c6c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 18 Aug 2015 14:44:58 -0700 Subject: [PATCH 19/58] ceph-git: 2015-08-07 -> 2015-08-18 --- pkgs/tools/filesystems/ceph/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix index c71ad134222..77d0352f670 100644 --- a/pkgs/tools/filesystems/ceph/git.nix +++ b/pkgs/tools/filesystems/ceph/git.nix @@ -1,12 +1,12 @@ { callPackage, fetchgit, ... } @ args: callPackage ./generic.nix (args // rec { - version = "2015-08-07"; + version = "2015-08-18"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; - rev = "dcd6e96495d949066962d1c7e18a9d4188b0fa37"; - sha256 = "1w62xfbcdx2q5wjz2bqlhn4bb1iag8xyhgjc2nklqk7py9lif16m"; + rev = "cf8a360cd1e3937aa1ac74fbf39790b7fb43e71f"; + sha256 = "0d8vlxap800x8gil16124nb4yvfqb5wa3pk09knrikmmwia49k9v"; }; patches = [ ./fix-pythonpath.patch ]; From 56d6a3d846ebc8c87cfabafa1e549298f3103df0 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Tue, 18 Aug 2015 23:52:12 +0200 Subject: [PATCH 20/58] aria2: Remove openssl dependency --- pkgs/tools/networking/aria2/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index f2809b5c7b2..0a3628d129b 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, cppunit, libgcrypt -, c-ares, openssl, libxml2, sqlite, zlib }: +, c-ares, libxml2, sqlite, zlib }: stdenv.mkDerivation rec { name = "aria2-${version}"; @@ -13,8 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig autoreconfHook cppunit libgcrypt c-ares openssl libxml2 - sqlite zlib + pkgconfig autoreconfHook cppunit libgcrypt c-ares libxml2 sqlite zlib ]; configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; From f2ce6390004b3bfdd647e8f3922befd2c0924487 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Tue, 18 Aug 2015 17:33:21 -0500 Subject: [PATCH 21/58] kodi: 15.0 -> 15.1 --- pkgs/applications/video/kodi/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 09b33099139..3fd3d31c18c 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -37,17 +37,17 @@ assert rtmpSupport -> rtmpdump != null; let rel = "Isengard"; - ffmpeg_2_6_3 = fetchurl { - url = "https://github.com/xbmc/FFmpeg/archive/2.6.3-${rel}.tar.gz"; - sha256 = "129nwrj9i758vz9xakpp68sm1l7z4in0krq6ayyqnpsnm54r9xlc"; + ffmpeg_2_6_4 = fetchurl { + url = "https://github.com/xbmc/FFmpeg/archive/2.6.4-${rel}.tar.gz"; + sha256 = "0gsjz8sr0dqq68gcln29xhz3h35n77769h1gb0ias0apmpaad1r4"; }; in stdenv.mkDerivation rec { name = "kodi-" + version; - version = "15.0"; + version = "15.1"; src = fetchurl { url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz"; - sha256 = "1zqdmqffjfr5219cvpbvq9v1z5p5pzi2m9xs9lzk4jz7rxrs3nr7"; + sha256 = "0187qxzyq4nhzbcwbhi71j4bl5k7pwjryhklil90gy5ziw6n3ckj"; }; buildInputs = [ @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { --replace 'usr/share/zoneinfo' 'etc/zoneinfo' substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \ --replace "/bin/bash" "${bash}/bin/bash -ex" - cp ${ffmpeg_2_6_3} tools/depends/target/ffmpeg/ffmpeg-2.6.3-${rel}.tar.gz + cp ${ffmpeg_2_6_4} tools/depends/target/ffmpeg/ffmpeg-2.6.4-${rel}.tar.gz ''; preConfigure = '' From ccb9acc43ea8fc3b1fdb09ab86ae270b18c23be2 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 19 Aug 2015 00:45:59 +0100 Subject: [PATCH 22/58] youtube-dl: update to 2015.08.16.1 --- pkgs/tools/misc/youtube-dl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index eb337573018..de9d918deeb 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { name = "youtube-dl-${version}"; - version = "2015.05.29"; + version = "2015.08.16.1"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0lgxir2i5ipplg57wk8gnbbsdrk7szqnyb1bxr97f3h0rbm4dfij"; + sha256 = "04g78anvy519pj8m8ys1ifmnmp1x3i9bw3afwqjch71n9f77papy"; }; buildInputs = [ makeWrapper zip pandoc ]; # Ensure ffmpeg is available in $PATH for post-processing & transcoding support. - postInstall = stdenv.lib.optionalString (ffmpeg != null) + postInstall = stdenv.lib.optionalString (ffmpeg != null) ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"''; meta = with stdenv.lib; { From 429d4beaa25313b912ba84a3b85269144abc3c5b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 18 Aug 2015 17:01:13 -0700 Subject: [PATCH 23/58] lvm2: 2.02.124 -> 2.02.128 --- pkgs/os-specific/linux/lvm2/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 1789018d414..6ddbbc9340f 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.124"; + version = "2.02.128"; in stdenv.mkDerivation { @@ -9,15 +9,20 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "0myqs0ajpjmlc56vp4f66x5izhbh7wzzf3408gqnrjmikb5sr9rh"; + sha256 = "0a5m63b729ranbnmg964b36jlbfc140bs92di37w2gq54hzp1v97"; }; - configureFlags = - "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-cmdlib" - + (stdenv.lib.optionalString enable_dmeventd " --enable-dmeventd") - ; + configureFlags = [ + "--disable-readline" + "--enable-udev_rules" + "--enable-udev_sync" + "--enable-pkgconfig" + "--enable-applib" + "--enable-cmdlib" + ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd"; - buildInputs = [ pkgconfig udev ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ udev ]; preConfigure = '' From ab7a1646d9bfcbb9017952fd5767ab18364b7f18 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 18 Aug 2015 17:15:57 -0700 Subject: [PATCH 24/58] aria2: Fix ssl support and switch back to sourceforge Using sourceforge gives release binaries which don't require us to regenerate all of the autotools scripts. This removes the need for dependencies like cppunit and libgcrypt and autoreconfHook. cc @geerds --- pkgs/tools/networking/aria2/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 0a3628d129b..69b9dc40638 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,20 +1,18 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, cppunit, libgcrypt -, c-ares, libxml2, sqlite, zlib }: +{ stdenv, fetchurl, pkgconfig, autoreconfHook +, openssl, c-ares, libxml2, sqlite, zlib, libssh2 +}: stdenv.mkDerivation rec { name = "aria2-${version}"; version = "1.19.0"; - src = fetchFromGitHub { - owner = "tatsuhiro-t"; - repo = "aria2"; - rev = "release-${version}"; - sha256 = "1k4b8jfg4wjsvybb7hysplp6h831allhiqdy9jwsyy0m0zmgk00a"; + src = fetchurl { + url = "mirror://sourceforge/aria2/${name}.tar.xz"; + sha256 = "0xm4fmap9gp2pz6z01mnnpmazw6pnhzs8qc58181m5ai4gy5ksp2"; }; - buildInputs = [ - pkgconfig autoreconfHook cppunit libgcrypt c-ares libxml2 sqlite zlib - ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ]; configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; From d70c01daec57187ec19dcb8d39b686d8df6b0210 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 18 Aug 2015 21:06:45 -0700 Subject: [PATCH 25/58] grsecurity: Update patches --- pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 79d58a539f0..b3c51dc6306 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -75,17 +75,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.50"; - revision = "201508102128"; + { kversion = "3.14.51"; + revision = "201508181951"; branch = "stable"; - sha256 = "0inp0ab8pcjfj1wnrkyiwb6cxjp2ymqcjv7lq30a4ij6qcvmfb5s"; + sha256 = "1sp1gwa7ahzflq7ayb51bg52abrn5zx1hb3pff3axpjqq7vfai6f"; }; grsecurity_unstable = grsecPatch - { kversion = "4.1.5"; - revision = "201508102129"; + { kversion = "4.1.6"; + revision = "201508181953"; branch = "test"; - sha256 = "1pc40xd7k0fzzd99lshy58gnapv701hjvc4bm0slfzagh241545a"; + sha256 = "1m227k1wb1q588vkgmngcz86k0wpzan6vra67pcx2478mabm3s89"; }; grsec_fix_path = From 13576925552b1d0751498fdda22e91a055a1ff6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 19 Aug 2015 07:25:25 +0200 Subject: [PATCH 26/58] blender: take unversioned cudatoolkit attr Makes it less weird to do an override, if a user wants to use e.g. cuda 6.5 (also requires gcc 4.8). --- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 1ccc2032284..bc4c97d1f21 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -3,7 +3,7 @@ , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python , zlib, fftw , jackaudioSupport ? false, libjack2 -, cudaSupport ? false, cudatoolkit7 +, cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport libjack2 - ++ optional cudaSupport cudatoolkit7 + ++ optional cudaSupport cudatoolkit ++ optional colladaSupport opencollada; postUnpack = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29038081ad4..47bc0bb85b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10835,6 +10835,7 @@ let bleachbit = callPackage ../applications/misc/bleachbit { }; blender = callPackage ../applications/misc/blender { + cudatoolkit = cudatoolkit7; python = python34; }; From 5711761622ceccc1fb2c97c965150fa8495546fc Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Aug 2015 00:37:19 -0700 Subject: [PATCH 27/58] firefox: Revert gstreamer-1.0 changes This causes firefox to sometimes crash and hang when playing videos. --- pkgs/applications/networking/browsers/firefox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 2774b2c50d2..a9e4bc39f62 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gst_all_1, icu, libpng, jemalloc +, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc , enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo - gst_all_1.gstreamer gst_all_1.gst-plugins-base icu libpng + gstreamer gst_plugins_base icu libpng jemalloc ] ++ lib.optional enableGTK3 gtk3; @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { "--enable-system-pixman" "--enable-system-sqlite" "--enable-system-cairo" - "--enable-gstreamer=1.0" + "--enable-gstreamer" "--enable-startup-notification" "--enable-content-sandbox" # available since 26.0, but not much info available "--disable-content-sandbox-reporter" # keeping disabled for now From 54dee45402634e06491042edc01c377d08bb589d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 18 Aug 2015 20:56:37 -0700 Subject: [PATCH 28/58] Revert "firefoxWrapper: switch to GStreamer 1.0" This reverts commit 69269bebeb22b8ad3b099bc41169f57e29d46efe. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 3e26a597256..409f7d29ba2 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { --suffix-each LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ - --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}"*)" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47bc0bb85b8..4bec3213522 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13276,10 +13276,10 @@ let ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ++ lib.optional (cfg.enableBluejeans or false) bluejeans ); - libs = (with gst_all_1; [ gstreamer gst-plugins-base ]) ++ lib.optionals (cfg.enableQuakeLive or false) + libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash; - gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-libav gst-vaapi ]; + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; gtk_modules = [ libcanberra ]; }; From b69d119b89268f280f8d10180e8ae41c55b31209 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Wed, 19 Aug 2015 10:09:44 +0200 Subject: [PATCH 29/58] cudatoolkit: switch the default from version 5 to 7 Version 5 doesn't build because it depends on broken/EOL'd python 2.6. Better switch to something that works. Most users of unversioned cudatoolkit attr are r-packages, but they are already marked as broken. Another user is haskellPackages.cuda, it builds fine with cuda 7. --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26f1c0b0306..49c399b79c1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1214,7 +1214,7 @@ let inherit callPackage; }; - cudatoolkit = cudatoolkit5; + cudatoolkit = cudatoolkit7; curlFull = curl.override { idnSupport = true; From 574e2a5f81f1d13b74c5c1a2c965eef39e4e824d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2015 18:08:33 +0200 Subject: [PATCH 30/58] hackage-packages.nix: update to https://github.com/commercialhaskell/all-cabal-hashes/commit/83e7ec0b3146b1cbaa05abf4e7d9b52fdf69ae55 with hackage2nix v20150807-45-gbadda1e --- .../haskell-modules/hackage-packages.nix | 690 ++++++++++-------- 1 file changed, 400 insertions(+), 290 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index c0c7bac41fd..7e1975ba55c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1697,8 +1697,8 @@ self: { }: mkDerivation { pname = "Bookshelf"; - version = "0.4"; - sha256 = "361260f69f528733158f15aea84085dcc47a3d9011aef136ee271c0c2fb343c0"; + version = "0.5"; + sha256 = "b9437069606fadc6b4f9213588c8269e187b00f00453856c7bfabd38dfe00ca2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -5040,8 +5040,8 @@ self: { }: mkDerivation { pname = "FontyFruity"; - version = "0.5.1.1"; - sha256 = "5e4c09e6c1f21c1f1fd4ae8bc2ecad584202eef72f46b694ae536481304e8c18"; + version = "0.5.2"; + sha256 = "bc7c25ee36a344f31a3a99eb0f4b8cf634141897a54012276d2a821f2e01bdf4"; libraryHaskellDepends = [ base binary bytestring containers deepseq directory filepath text vector @@ -7120,12 +7120,16 @@ self: { }) {}; "HMap" = callPackage - ({ mkDerivation, base, hashable, mtl, unordered-containers }: + ({ mkDerivation, base, data-default, hashable, mtl + , unordered-containers + }: mkDerivation { pname = "HMap"; - version = "1.2.4"; - sha256 = "23d0eda120817e17f47d9dc6ec5f9e09b52ae7322df27218509d1234a73fea20"; - libraryHaskellDepends = [ base hashable mtl unordered-containers ]; + version = "1.2.6"; + sha256 = "8424dcbcb903c49d369230e2c10421daf3a2e35f3ffb5ec4058f769213769b8a"; + libraryHaskellDepends = [ + base data-default hashable mtl unordered-containers + ]; homepage = "https://github.com/atzeus/HMap"; description = "Fast heterogeneous maps and unconstrained typeable like functionality"; license = stdenv.lib.licenses.bsd3; @@ -8049,10 +8053,8 @@ self: { ({ mkDerivation, base, hspec, random, transformers }: mkDerivation { pname = "Hangman"; - version = "0.1.0.0"; - sha256 = "98caea366753debaa6185ddf3ba3c1613a13caec64aabe9ddb917273cb28f40f"; - revision = "1"; - editedCabalFile = "001a10b5e54971341acc23271a48f0ef3d7bc764e380b9292580f259aab3c3c9"; + version = "0.1.0.2"; + sha256 = "b057343ce4b95177c01f3eec7a0c6c83190e2c0758d93bcaea437e70a1e88307"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random transformers ]; @@ -9405,8 +9407,8 @@ self: { }: mkDerivation { pname = "JuicyPixels"; - version = "3.2.5.3"; - sha256 = "fc36f130e678119475434febcdfe75e1e083062a4729a3104cc5bdc7972cd8ce"; + version = "3.2.6"; + sha256 = "f99e82c84d8eeff23ba57332ed4b89530bc1a739c3a8f4b670b07ac33bfc9a46"; libraryHaskellDepends = [ base binary bytestring containers deepseq mtl primitive transformers vector zlib @@ -16323,18 +16325,23 @@ self: { }) {}; "X11" = callPackage - ({ mkDerivation, base, data-default, libX11, libXext, libXrandr }: + ({ mkDerivation, base, data-default, libX11, libXext, libXinerama + , libXrandr, libXrender + }: mkDerivation { pname = "X11"; version = "1.6.1.2"; sha256 = "5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf"; libraryHaskellDepends = [ base data-default ]; - librarySystemDepends = [ libX11 libXext libXrandr ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender + ]; homepage = "https://github.com/haskell-pkg-janitors/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; }) { inherit (pkgs.xlibs) libX11; inherit (pkgs.xlibs) libXext; - inherit (pkgs.xlibs) libXrandr;}; + inherit (pkgs.xlibs) libXinerama; inherit (pkgs.xlibs) libXrandr; + inherit (pkgs.xlibs) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -18873,8 +18880,8 @@ self: { ({ mkDerivation, base, c2hs, mtl, openal }: mkDerivation { pname = "al"; - version = "0.1.4"; - sha256 = "383c8f52248dc59ad9866eb2ffce167999a8fb91dd7ed5a2dc32500ddd0127cb"; + version = "0.1.4.1"; + sha256 = "30e58c4459630e669c1029afe845f5fa9e33b140fc4983f5d086cec41850b3d6"; libraryHaskellDepends = [ base mtl ]; libraryPkgconfigDepends = [ openal ]; libraryToolDepends = [ c2hs ]; @@ -19492,8 +19499,8 @@ self: { }: mkDerivation { pname = "amazonka"; - version = "1.0.0"; - sha256 = "6d774924eacb7f958a45660255894b815aef015c6668d8b3f40c4154ea339533"; + version = "1.0.1"; + sha256 = "36583da0607497b69668bc9100373031d24cc64eb467e06676b409358d4c061a"; libraryHaskellDepends = [ amazonka-core base bytestring conduit conduit-extra directory exceptions free http-client http-conduit ini lens mmorph @@ -19512,8 +19519,8 @@ self: { }: mkDerivation { pname = "amazonka-autoscaling"; - version = "1.0.0"; - sha256 = "35f259716332837cae24f32580bb8c59682cabb7fbedf1a0d3e01bf38a4fa8c8"; + version = "1.0.1"; + sha256 = "a74e6157a99285f556edb546ea1876507b197b1392bebcdf5f7d0ac4e418d702"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19532,8 +19539,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudformation"; - version = "1.0.0"; - sha256 = "6729b14e427f33ac75f05b23cb6bed59e6f1960e9bcc84adfe90ea911809a047"; + version = "1.0.1"; + sha256 = "b09f594282e3e5fc13b0de3cd4f562ba9c9bfec96973d5aeba334f32a5f88fe6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19552,8 +19559,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudfront"; - version = "1.0.0"; - sha256 = "fe77d79cf0e230df4082056a40a68a66f4ad04dd2ebd6c747994146420c384bf"; + version = "1.0.1"; + sha256 = "82e0d72534717397395a2109af59725b86bb9361610b1143e7bac58b7ff1c948"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19572,8 +19579,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudhsm"; - version = "1.0.0"; - sha256 = "65fb9f1b72ee5131fae219afa409e1a355e743ab87eb055c863a8374b67f6b8e"; + version = "1.0.1"; + sha256 = "88be89b5bacd848704f28ecf0544e6d9dfffa05f67e3f9317d64b17ec2caaac9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19592,8 +19599,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch"; - version = "1.0.0"; - sha256 = "a0785561ff3ecbba2f04899635ffcaf3264a0554018dd4c6b0e396cfaa4d7ed3"; + version = "1.0.1"; + sha256 = "9476d436b0ea895edc0aa3b0ee36458cfeea35faaee8e5b9fcc653ee5c47f027"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19612,8 +19619,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudsearch-domains"; - version = "1.0.0"; - sha256 = "38de7c58b7b9924029307177f0da27bf6719b43c6006c773c075369ee944cb86"; + version = "1.0.1"; + sha256 = "b2dd61ab239b00e884be45b305f5587ec66dbe031c4d65f93d00f297eb4400c5"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19632,8 +19639,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudtrail"; - version = "1.0.0"; - sha256 = "16b56b6761bfeaf410ab5f6a786de75355752804d52761e30171e08818e41b3d"; + version = "1.0.1"; + sha256 = "c4aedc71e6d8d18befcd90573c664a859d6a5952711512b57eba596726ddcff9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19652,8 +19659,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch"; - version = "1.0.0"; - sha256 = "dba8fc034548f8fad9ee77b1d6e69d056582e25282054061d91749c8f5d57ebc"; + version = "1.0.1"; + sha256 = "5562fb8ffbd5485091b7f0a8a1b6d4ab533371804341dd352c6de97fe8297233"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19672,8 +19679,8 @@ self: { }: mkDerivation { pname = "amazonka-cloudwatch-logs"; - version = "1.0.0"; - sha256 = "917a8c1f9cd9138396794d57a399e1e698b1a1f1b64581b886efd540e93b7ff3"; + version = "1.0.1"; + sha256 = "c8d16042fb42fe562a754467d3f3be13ab1dc7c862d5dd6467864fd9cdc5b551"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19692,8 +19699,8 @@ self: { }: mkDerivation { pname = "amazonka-codecommit"; - version = "1.0.0"; - sha256 = "3edfe5808d2249c8f674729614e3a12d0d0320c3c6f0c1ca563495e0d1f803f5"; + version = "1.0.1"; + sha256 = "a930435da46193d2a8a648fbe0d741f009b3c524127a60989740cb46e692013e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19712,8 +19719,8 @@ self: { }: mkDerivation { pname = "amazonka-codedeploy"; - version = "1.0.0"; - sha256 = "1e4a475d8d5ae6a7474359721e8e76fa7e25224406fd7ce6f9ea0a59c1a0d8f7"; + version = "1.0.1"; + sha256 = "77be78235ebefc1f1f08a7db8b800bcd06a7dafe37c5f69413543f08926628c1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19732,8 +19739,8 @@ self: { }: mkDerivation { pname = "amazonka-codepipeline"; - version = "1.0.0"; - sha256 = "64f1e64f804ef615957d1aba9960c8c5816b5dfd6581b313fe5d6420d40f4aad"; + version = "1.0.1"; + sha256 = "6f573007d05e22f6afda550b8d0f61bde15ddfbe8e700779207fd78c7546b819"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19752,8 +19759,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-identity"; - version = "1.0.0"; - sha256 = "2cef14155b27fbfc686dc9e490fd72bc9f39f38844f8121683012bae65c44f72"; + version = "1.0.1"; + sha256 = "87fe6bdcdb3f6056180c48e5b9c1d57ff64aa953e5763e93d8b28cd2d5ffe2f7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19772,8 +19779,8 @@ self: { }: mkDerivation { pname = "amazonka-cognito-sync"; - version = "1.0.0"; - sha256 = "9130f9246dd86bb60478ca81f49371a9a393bc7ee74f7dab18c8c4937275d6e9"; + version = "1.0.1"; + sha256 = "7dc187fc5269bba71ac05e0bdae22c08d9fd0e1988263e0828fe7f9cec4e614d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19792,8 +19799,8 @@ self: { }: mkDerivation { pname = "amazonka-config"; - version = "1.0.0"; - sha256 = "e193b0e4c9c0d2508c43a1835a9ec9afd429f9dbb4b0620ed6906438f929628a"; + version = "1.0.1"; + sha256 = "317ed1ec7dc99e06068fb600f21be98b05dd61a73dd0d140ed644774fb81d33a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19817,8 +19824,8 @@ self: { }: mkDerivation { pname = "amazonka-core"; - version = "1.0.0"; - sha256 = "a6960654512bc30bc00877110a09674cf52b2a37835f6995fe6b3b5515c08277"; + version = "1.0.1"; + sha256 = "e432d7b5510685dd37688a632e3a17a8968cb3b1e08537257c054fa8f9eda946"; libraryHaskellDepends = [ aeson attoparsec base bifunctors bytestring case-insensitive conduit conduit-extra cryptonite exceptions hashable http-client @@ -19842,8 +19849,8 @@ self: { }: mkDerivation { pname = "amazonka-datapipeline"; - version = "1.0.0"; - sha256 = "aa483755113ec34eca9d9ec5a50155f9b2224f319a3e464e63dd4775c71d43ce"; + version = "1.0.1"; + sha256 = "d8b88c9a51eab9110650ea9e40f09950e8df2c20264cbc629b8a29c50b252dc2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19862,8 +19869,8 @@ self: { }: mkDerivation { pname = "amazonka-devicefarm"; - version = "1.0.0"; - sha256 = "26847794bf233655d37b62985305d2da182356444d99632f0d4101ff6cc6c4ed"; + version = "1.0.1"; + sha256 = "9b23b6c2853b073635c8e6e76026ffa2cccd705bd7d958fa6dd2c4785a887297"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19882,8 +19889,8 @@ self: { }: mkDerivation { pname = "amazonka-directconnect"; - version = "1.0.0"; - sha256 = "fd07424780428559f9da651e4b81ade00a6d689730eff1e92c37c286c4cd18af"; + version = "1.0.1"; + sha256 = "8fc02b3ade3970117e13b2b133235c006a21914e91269cb42d63d712501d013a"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19902,8 +19909,8 @@ self: { }: mkDerivation { pname = "amazonka-ds"; - version = "1.0.0"; - sha256 = "dd823809c8c85ee33e9393c3a15c1fd70a9f852e759170213f78d5b7e703ae56"; + version = "1.0.1"; + sha256 = "523f0fb329f502115aed6b1aafc7efd96ac8233d56de05379465fe3c3b7ddbf1"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19922,8 +19929,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb"; - version = "1.0.0"; - sha256 = "f44166ab92f90121738e226b78a62513a6cab1bed15db5e6912997d9a3e67842"; + version = "1.0.1"; + sha256 = "85194e782b7a44ff914af01cdc8d5c3e8285031f0b23a07ef37020c0798c9bfb"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19942,8 +19949,8 @@ self: { }: mkDerivation { pname = "amazonka-dynamodb-streams"; - version = "1.0.0"; - sha256 = "374c6184ba5358e30827238ba37d27c84f024c225b5878956fb4aa8daa453086"; + version = "1.0.1"; + sha256 = "edfcfc6e4281012cbec96f2b96416cf8c3e0e2313388d677e78f4ff8e51d94f7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19962,8 +19969,8 @@ self: { }: mkDerivation { pname = "amazonka-ec2"; - version = "1.0.0"; - sha256 = "f3dea2fdc9455f87548d677791ddb63579b1c244993b8fcbbf88f2e28d7dbc3c"; + version = "1.0.1"; + sha256 = "fd0ec9d15a97195472be403b9d8c03cdcd2f70daf4beec326c360083479d37ec"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -19982,8 +19989,8 @@ self: { }: mkDerivation { pname = "amazonka-ecs"; - version = "1.0.0"; - sha256 = "f46a0c8377475da81c746de13b7011ba9f856cba9fb0ec195a1c28fa0b9275b9"; + version = "1.0.1"; + sha256 = "77e78bf43efd1c3fb77b0d2a6cbab5140ffe13c7e8fcc22cbe7e509d73f978e8"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20002,8 +20009,8 @@ self: { }: mkDerivation { pname = "amazonka-efs"; - version = "1.0.0"; - sha256 = "a827bb8595036a9bb40c2e7f7d9cda5fca791e3c22bfe48de3755a525e85e370"; + version = "1.0.1"; + sha256 = "9ff36087cc77bf044b515e6a8fc11f4067ab76372e02b3cb7b8dadfb3ad697a2"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20022,8 +20029,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticache"; - version = "1.0.0"; - sha256 = "9f634d604a1f36a82b40bca42a656df3456c590de0b26236b4bbdfc04b5c7293"; + version = "1.0.1"; + sha256 = "638d40a60b59e020cad3dac813563be07b5f698fd9b602784f3ac344c013ca15"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20042,8 +20049,8 @@ self: { }: mkDerivation { pname = "amazonka-elasticbeanstalk"; - version = "1.0.0"; - sha256 = "644d165e1f99647aea3ef92aa2c0d38c696740c8df0e423b25c21738d4c4fa52"; + version = "1.0.1"; + sha256 = "43dc5564b2183011340d9751b7c4a1cf8197b215b9b857c78d68c70a35c050cb"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20062,8 +20069,8 @@ self: { }: mkDerivation { pname = "amazonka-elastictranscoder"; - version = "1.0.0"; - sha256 = "0aec463a40a5b54516f98a0a2b3a5070652b46fd2ee201455631841875560411"; + version = "1.0.1"; + sha256 = "5bac9e2c04f4c775ee7018a2073f5141fa5f062467f4eeba91e9a64e03525298"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20082,8 +20089,8 @@ self: { }: mkDerivation { pname = "amazonka-elb"; - version = "1.0.0"; - sha256 = "0aae52d1ba515d991985851ed22d63ee0c4fd645b7c11fdbf18c8e12c67c7c9b"; + version = "1.0.1"; + sha256 = "4c9a033830f09147953ffc7c58c39856e1a7c62d600267029bdfce7acf786b52"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20102,8 +20109,8 @@ self: { }: mkDerivation { pname = "amazonka-emr"; - version = "1.0.0"; - sha256 = "797807616a93861862cd145cf11968fbaf8c3803322ce6c82fb0e258de609325"; + version = "1.0.1"; + sha256 = "e1f289ca504d4220d1a28f055ba01cbf2e87ce42ce3ff6525a6dc1f4adaa6b96"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20122,8 +20129,8 @@ self: { }: mkDerivation { pname = "amazonka-glacier"; - version = "1.0.0"; - sha256 = "f8fc5d54e10447ecd6879fcee41240171e421711e541bfb19062b49081d3077a"; + version = "1.0.1"; + sha256 = "4a6d67f4ac6b34316281810d10b46b46e34fd6869bbf463ef6fa6c8257da28ad"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20142,8 +20149,8 @@ self: { }: mkDerivation { pname = "amazonka-iam"; - version = "1.0.0"; - sha256 = "778cb110971732b64c5c7422ffeb617a2f189c52d322107ad4c9cafb013d259d"; + version = "1.0.1"; + sha256 = "63d8091722baa876de7a04e92387f4b3015e7194fed25a0e0da9f6ec7ecdb441"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20162,8 +20169,8 @@ self: { }: mkDerivation { pname = "amazonka-importexport"; - version = "1.0.0"; - sha256 = "d09085f68a8bef6c900b3ed02831dceee1b2f2189449be4166e5dcde32362383"; + version = "1.0.1"; + sha256 = "281e37c37bdc5d175723ba8b428c63be3a1a543d2e66ace7f8f288e7419e82fc"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20182,8 +20189,8 @@ self: { }: mkDerivation { pname = "amazonka-kinesis"; - version = "1.0.0"; - sha256 = "8fd7c64c287581a4383d0478718155a59c9af1c9db5a8d8eb89c3f7f44831df6"; + version = "1.0.1"; + sha256 = "f942f5a7c13d1dccd98ec52529d24e7cc26bf87d729271c00ea752255e22cd40"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20202,8 +20209,8 @@ self: { }: mkDerivation { pname = "amazonka-kms"; - version = "1.0.0"; - sha256 = "36759431a21c11fe0066ff6dda522a2a7fbd78c45d4839a63615562e0860448c"; + version = "1.0.1"; + sha256 = "9fc90213cb962c1fe6d49b188bb4e3c4b08db7a9820d25bdda2600b4fc0e9681"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20222,8 +20229,8 @@ self: { }: mkDerivation { pname = "amazonka-lambda"; - version = "1.0.0"; - sha256 = "1c64ef771a7b9aa47f69305c066d71ec6c3f4348f1ab60d3e9393b62207c34cb"; + version = "1.0.1"; + sha256 = "09b29ce0649e01ce74717f0ba9379dbf98993b217652bb310e7136c288c1b8f9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20242,8 +20249,8 @@ self: { }: mkDerivation { pname = "amazonka-ml"; - version = "1.0.0"; - sha256 = "4602977012ba8c5a5da2d28f25a038bcb7ecc3a78d9e3a20c62f93866e87e276"; + version = "1.0.1"; + sha256 = "6a670ff312be363929409768d3172a28bf7cd549764038f1aa71fd31e2930436"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20262,8 +20269,8 @@ self: { }: mkDerivation { pname = "amazonka-opsworks"; - version = "1.0.0"; - sha256 = "69831a3df942a70c624babe44c8ae7af18c75b3ebd8ecc2e02a0c020f63de8b7"; + version = "1.0.1"; + sha256 = "998f65d4b6dc4a43959f7c1f2380af5e5f4fa588bc181a793eb4f3eadee5078d"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20282,8 +20289,8 @@ self: { }: mkDerivation { pname = "amazonka-rds"; - version = "1.0.0"; - sha256 = "4ee2eb45b7a95f586a8747e208f18e9f647cf15992239a5ca59e54491b002773"; + version = "1.0.1"; + sha256 = "f10aa66616746f3ef5728fe50f6ce9506b13a0d9e0dab95edd4aeeb2b6a3eca0"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20302,8 +20309,8 @@ self: { }: mkDerivation { pname = "amazonka-redshift"; - version = "1.0.0"; - sha256 = "7c8ebb747839d312475f4fae8ac303b14eab648987f8980c07ccca4f12670b88"; + version = "1.0.1"; + sha256 = "2a10e70b53d5fc8e723660a595d521e6e4b7f0acd16430cf9a63e2199ab86e9c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20322,8 +20329,8 @@ self: { }: mkDerivation { pname = "amazonka-route53"; - version = "1.0.0"; - sha256 = "0733757c703e9cfdd8ed72a08629b75bc15eed07d87526b1c7cdbcf0360e818a"; + version = "1.0.1"; + sha256 = "e559cce14249db7d13282bc376b9a5c42719d795da20cfc420c3b95afcfa26a9"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20342,8 +20349,8 @@ self: { }: mkDerivation { pname = "amazonka-route53-domains"; - version = "1.0.0"; - sha256 = "600a096c249826c489f1fa2ff5b723ecb94db890ad5386ede881a1f335cbd46a"; + version = "1.0.1"; + sha256 = "fa4e85bbe0ccf8875cd08b601b69db8fba038046c66e9b65219fecd6b3105fc3"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20362,8 +20369,8 @@ self: { }: mkDerivation { pname = "amazonka-s3"; - version = "1.0.0"; - sha256 = "f044ef823a9bc5ede3564f5460e1dc3c7332474543b379f62cb56330e93706f1"; + version = "1.0.1"; + sha256 = "2ba4b833b1ccb7d3ca4ac46ae88cf522951972b428987e78328e14766f77f5c4"; libraryHaskellDepends = [ amazonka-core base lens text ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20382,8 +20389,8 @@ self: { }: mkDerivation { pname = "amazonka-sdb"; - version = "1.0.0"; - sha256 = "73e41153331fdf08d33c9a0a44b326118e5d7da6c93177232282bf61dfc73aaa"; + version = "1.0.1"; + sha256 = "dad868bcae8795c9e8e0719ae18bb99514d7a8bd4ee373e194531a0120e4061c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20402,8 +20409,8 @@ self: { }: mkDerivation { pname = "amazonka-ses"; - version = "1.0.0"; - sha256 = "c1f8ec0f1b94891a478ce46e169cfbb6fe9aa515dbe8208b33085dca03c37339"; + version = "1.0.1"; + sha256 = "d6ded081d5dded1b58b46d49255773e633bceb7d7526960e06dc40f0ea60bfce"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20422,8 +20429,8 @@ self: { }: mkDerivation { pname = "amazonka-sns"; - version = "1.0.0"; - sha256 = "7790cb4ab13932df53e056b389e70ac2873e66002ee5e1ba67d7b952264cb820"; + version = "1.0.1"; + sha256 = "eccab0209ca98f037e1e21abff164c4f6f29836e57b06bf307a97eab465bbbd7"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20442,8 +20449,8 @@ self: { }: mkDerivation { pname = "amazonka-sqs"; - version = "1.0.0"; - sha256 = "8acef52b122988cd7b231ca10d42fe69b06ff129342daa00afaed5c48880f488"; + version = "1.0.1"; + sha256 = "abf01ab527d589cc0f30d0ded41b88fb522cb003130063c1f56a8e92e1315161"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20462,8 +20469,8 @@ self: { }: mkDerivation { pname = "amazonka-ssm"; - version = "1.0.0"; - sha256 = "d6c35acac9bea450001beaa65d3c8eabd1b006b916390004354369db29c2fb59"; + version = "1.0.1"; + sha256 = "2aa03de9ff893045894c9873ef466100d2449e0ea5f7af3549559807a8209193"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20482,8 +20489,8 @@ self: { }: mkDerivation { pname = "amazonka-storagegateway"; - version = "1.0.0"; - sha256 = "38a3c9e98906c6f4feec927b442f694c268dfbb1e5aaa4bd6c883e552b0f77d0"; + version = "1.0.1"; + sha256 = "676e938699d2ec73abab356c0a0a358067710ce3bf7bb210970afe90f01fd26e"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20502,8 +20509,8 @@ self: { }: mkDerivation { pname = "amazonka-sts"; - version = "1.0.0"; - sha256 = "12cd1e3cffc9fdb8c8337f25c47496a6d7163916880b1bcb25c6fe86610c3d65"; + version = "1.0.1"; + sha256 = "ee7f9e97fc8da24440781513995fbc5afded54a4ecc465a3d46511c22f2bd9a6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20522,8 +20529,8 @@ self: { }: mkDerivation { pname = "amazonka-support"; - version = "1.0.0"; - sha256 = "524eed7040b08552ad50a9afb4d958dc0bd31014a0e64169041554c65136351a"; + version = "1.0.1"; + sha256 = "4510faae1b970b48cd35519504edaa9f6f43c49ad97003c1893f34346d4483f6"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20542,8 +20549,8 @@ self: { }: mkDerivation { pname = "amazonka-swf"; - version = "1.0.0"; - sha256 = "d437d11781c5e515d91448959fe90e007ef0c1a492fee33ef903e30b5028a727"; + version = "1.0.1"; + sha256 = "84b940ed61beb7744807eb613fe8a9897f51ef609efed8f568f5d2b02e534c48"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20562,8 +20569,8 @@ self: { }: mkDerivation { pname = "amazonka-workspaces"; - version = "1.0.0"; - sha256 = "0ade5a1a0064b9398117d86c98711e811009058824667add29b18f399f0328cf"; + version = "1.0.1"; + sha256 = "1d110c2d674a53be3266d1c480d7adba18bd12706fb78bb81b9e26acc56cb53c"; libraryHaskellDepends = [ amazonka-core base ]; testHaskellDepends = [ amazonka-core amazonka-test base bytestring lens tasty tasty-hunit @@ -20893,13 +20900,13 @@ self: { ({ mkDerivation, ansi-terminal, base }: mkDerivation { pname = "ansi-wl-pprint"; - version = "0.6.7.2"; - sha256 = "015ec4414242089fff5d6d567b392b6bb4fa5f85afff7f0708566082e1d91774"; + version = "0.6.7.3"; + sha256 = "3789ecaa89721eabef58ddc5711f7fd1ff67e262da1659f3b20d38a9e1f5b708"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-terminal base ]; executableHaskellDepends = [ ansi-terminal base ]; - homepage = "http://github.com/batterseapower/ansi-wl-pprint"; + homepage = "http://github.com/ekmett/ansi-wl-pprint"; description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -28898,6 +28905,7 @@ self: { homepage = "https://github.com/capn-freako/broker-haskell"; description = "Haskell bindings to Broker, Bro's messaging library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) { broker = null;}; "bsd-sysctl" = callPackage @@ -29325,8 +29333,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.5.1"; - sha256 = "06601c919d69bea28b116f6447f5557ce46a3e4c4b6b4b75bb65dc2579ff48d6"; + version = "0.5.2"; + sha256 = "659d75f91d2d08447bce484a8176f6a2cc94cc10a2d732b7e733e4312a527e90"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -29338,6 +29346,7 @@ self: { hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework test-framework-hunit text ]; + homepage = "http://www.freedesktop.org/wiki/Software/Bustle/"; description = "Draw sequence diagrams of D-Bus traffic"; license = "unknown"; }) {}; @@ -29371,6 +29380,7 @@ self: { terminfo-hs text transformers ]; executableHaskellDepends = [ base text ]; + jailbreak = true; homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; @@ -33805,14 +33815,14 @@ self: { , ixset, jmacro, lens, mtl, network, network-uri, old-locale , openssl, process, random, reform, reform-happstack, reform-hsp , safecopy, stm, tagsoup, text, time, time-locale-compat - , unordered-containers, utf8-string, uuid, vector, web-plugins - , web-routes, web-routes-happstack, web-routes-hsp, web-routes-th - , xss-sanitize + , unordered-containers, userid, utf8-string, uuid, vector + , web-plugins, web-routes, web-routes-happstack, web-routes-hsp + , web-routes-th, xss-sanitize }: mkDerivation { pname = "clckwrks"; - version = "0.23.8"; - sha256 = "ed3f3c42fab644b52d2d7e3d125f55b6f303421d5674f76c052989a0a5efd046"; + version = "0.23.9"; + sha256 = "7d4c1b4d181b8c974e8472c43c72a1c226e4806f430e49d07f07039c511df51b"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -33820,13 +33830,12 @@ self: { happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl network network-uri old-locale process random reform reform-happstack reform-hsp safecopy stm tagsoup text time - time-locale-compat unordered-containers utf8-string uuid vector - web-plugins web-routes web-routes-happstack web-routes-hsp + time-locale-compat unordered-containers userid utf8-string uuid + vector web-plugins web-routes web-routes-happstack web-routes-hsp web-routes-th xss-sanitize ]; librarySystemDepends = [ openssl ]; libraryToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; @@ -35422,8 +35431,8 @@ self: { }: mkDerivation { pname = "commutative"; - version = "0.0.1.2"; - sha256 = "8233c0d2be80252501b4d75828d1cd2d4a1ee53e64284da5ee79e185e7e0eb4a"; + version = "0.0.1.3"; + sha256 = "6d1a855914f5106ba8279a719ef8e9f97e24abab3079fcfd3253081348848ccd"; libraryHaskellDepends = [ base random semigroups ]; testHaskellDepends = [ base QuickCheck quickcheck-instances random semigroups tasty @@ -36087,6 +36096,7 @@ self: { ]; description = "Concurrent networked stream transducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "concurrent-sa" = callPackage @@ -40210,6 +40220,7 @@ self: { jailbreak = true; description = "Import/export git fast-import streams to/from darcs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "darcs-graph" = callPackage @@ -41629,19 +41640,24 @@ self: { }) {}; "dataflow" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, MissingH, mtl - , parsec + ({ mkDerivation, aeson, base, blaze-html, bytestring, containers + , filepath, hastache, hspec, HUnit, markdown, MissingH, mtl, parsec + , text, vector }: mkDerivation { pname = "dataflow"; - version = "0.6.1.0"; - sha256 = "7d1d0c0c0484406cdccf14613426cead7e4b0e89a3e0d3bfdabf24d369053625"; + version = "0.7.1.0"; + sha256 = "cb7bc18db84941303981a4aafb4b07883ee869d62587f416cb0304d4a0d4bfb4"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base containers MissingH mtl parsec ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec HUnit ]; - jailbreak = true; + libraryHaskellDepends = [ + aeson base blaze-html bytestring containers filepath hastache + markdown MissingH mtl parsec text vector + ]; + executableHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + aeson base bytestring containers hspec HUnit parsec vector + ]; homepage = "https://github.com/sonyxperiadev/dataflow"; description = "Generate Graphviz documents from a Haskell representation"; license = stdenv.lib.licenses.bsd3; @@ -46159,6 +46175,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "drifter-postgresql" = callPackage + ({ mkDerivation, base, drifter, either, mtl, postgresql-simple + , tasty, tasty-hunit, text, time + }: + mkDerivation { + pname = "drifter-postgresql"; + version = "0.0.1"; + sha256 = "a256bfe89eb0bf8a7191a4a912c77869154fcfb0b178e69804c20036a145f1c7"; + libraryHaskellDepends = [ + base drifter either mtl postgresql-simple time + ]; + testHaskellDepends = [ + base drifter either postgresql-simple tasty tasty-hunit text + ]; + description = "PostgreSQL support for the drifter schema migration tool"; + license = stdenv.lib.licenses.mit; + }) {}; + "dropbox-sdk" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , certificate, conduit, HTTP, http-conduit, http-types, json @@ -51172,8 +51206,8 @@ self: { }: mkDerivation { pname = "feed"; - version = "0.3.9.7"; - sha256 = "1468425b73887fba6740ab3e64ac62473be5f5ec61de17c5e1ac8812d4f15a07"; + version = "0.3.10.0"; + sha256 = "74b25a85eab11fda19be3c837755f024036542f5bd729911526845cac572d094"; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -54703,34 +54737,35 @@ self: { "fwgl" = callPackage ({ mkDerivation, base, hashable, transformers, unordered-containers - , vector, Yampa + , vect, vector, Yampa }: mkDerivation { pname = "fwgl"; - version = "0.1.2.2"; - sha256 = "d05ac0f948609029f63a5088a334c41a87df7f4289e9ac7465c6326b1f0f92e8"; + version = "0.1.3.1"; + sha256 = "9f1426ce575f72694e663cfabf8e12083feac2353ffec0c1c3a94166aa7563e6"; libraryHaskellDepends = [ - base hashable transformers unordered-containers vector Yampa + base hashable transformers unordered-containers vect vector Yampa ]; jailbreak = true; homepage = "https://github.com/ziocroc/FWGL"; - description = "FRP 2D/3D game engine"; + description = "Game engine"; license = stdenv.lib.licenses.bsd3; }) {}; "fwgl-glfw" = callPackage ({ mkDerivation, base, fwgl, gl, GLFW-b, hashable, JuicyPixels - , transformers, unordered-containers, vector, Yampa + , transformers, unordered-containers, vect, vector }: mkDerivation { pname = "fwgl-glfw"; - version = "0.1.0.5"; - sha256 = "14d7eda355a7b2ed55cd54fe1c75e20ea8b4563d1ea4dac869acc0e815ae60f8"; + version = "0.1.1.0"; + sha256 = "1393f48dafc63c43db18cc7f26ec04c3a258ea8cc7fb7525d2c92309509c140b"; + revision = "1"; + editedCabalFile = "9e4d781888a4b29f18d2759638f5562367daea4f7f8fbb78590c9e981209b848"; libraryHaskellDepends = [ base fwgl gl GLFW-b hashable JuicyPixels transformers - unordered-containers vector Yampa + unordered-containers vect vector ]; - jailbreak = true; homepage = "https://github.com/ziocroc/FWGL"; description = "FWGL GLFW backend"; license = stdenv.lib.licenses.bsd3; @@ -54738,14 +54773,14 @@ self: { "fwgl-javascript" = callPackage ({ mkDerivation, base, fwgl, ghcjs-base, hashable - , unordered-containers, Yampa + , unordered-containers, vect }: mkDerivation { pname = "fwgl-javascript"; - version = "0.1.0.6"; - sha256 = "49451b405761c96cc9d5e3f59c1bd5418924814ce3e8296f126c0072aeb4b63b"; + version = "0.1.1.0"; + sha256 = "ccfb9320bb0a205cfa1f977c2ab73f3640dfa7317d02ad115a4525c5633efa80"; libraryHaskellDepends = [ - base fwgl ghcjs-base hashable unordered-containers Yampa + base fwgl ghcjs-base hashable unordered-containers vect ]; jailbreak = true; homepage = "https://github.com/ziocroc/FWGL"; @@ -55189,8 +55224,8 @@ self: { }: mkDerivation { pname = "generic-accessors"; - version = "0.4.1.1"; - sha256 = "b8a3ff34ba1adff9cf8bf2b568eae405a65336cce2ef3c5544177e2fce07baf9"; + version = "0.4.2.0"; + sha256 = "b1ee291607909663a2693189a63d1e8015cec543e550f3478a0d383d41334de8"; libraryHaskellDepends = [ base linear spatial-math ]; testHaskellDepends = [ base HUnit QuickCheck test-framework test-framework-hunit @@ -59273,13 +59308,12 @@ self: { }: mkDerivation { pname = "group-with"; - version = "0.2.0.2"; - sha256 = "06a26e6530af71a52375bedb07361a4af483b9748d7e0aee17109935e41af730"; + version = "0.2.0.3"; + sha256 = "eb179700db93ad736cf13520a105dd344f1c170952bcbdd1ad7e51b3244342de"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base Cabal containers hspec hspec-expectations QuickCheck ]; - jailbreak = true; homepage = "https://github.com/ulikoehler/group-with"; description = "Classify objects by key-generating function, like SQL GROUP BY"; license = stdenv.lib.licenses.asl20; @@ -62419,23 +62453,22 @@ self: { , happstack-server, hsp, hsx-jmacro, hsx2hs, http-conduit , http-types, ixset-typed, jmacro, jwt, lens, mime-mail, mtl , pwstore-purehaskell, random, safecopy, shakespeare, text, time - , unordered-containers, web-routes, web-routes-boomerang + , unordered-containers, userid, web-routes, web-routes-boomerang , web-routes-happstack, web-routes-hsp, web-routes-th }: mkDerivation { pname = "happstack-authenticate"; - version = "2.1.4"; - sha256 = "3f24dfb2cef2d4225b1a9e6557ec47ab0f67734d0dfa478e89f0fc5a28b3ab1c"; + version = "2.1.5"; + sha256 = "203026967ec479957db08ad4109fb488eed254403064d7843deb8202b6c71ae2"; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default filepath happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro hsx2hs http-conduit http-types ixset-typed jmacro jwt lens mime-mail mtl pwstore-purehaskell random safecopy shakespeare text time - unordered-containers web-routes web-routes-boomerang + unordered-containers userid web-routes web-routes-boomerang web-routes-happstack web-routes-hsp web-routes-th ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Happstack Authentication Library"; license = stdenv.lib.licenses.bsd3; @@ -62683,13 +62716,12 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.5"; - sha256 = "c6c53a708bd9b26fd1329629b97b953c1dc12260eb159516b147e2dc588b105d"; + version = "7.3.6"; + sha256 = "e3f41aca20991e0bc5bbc00977ff97971d09b77ef293665a138efa7b74467631"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using HSP templates in Happstack"; license = stdenv.lib.licenses.bsd3; @@ -63102,8 +63134,8 @@ self: { }: mkDerivation { pname = "harmony"; - version = "0.1.0.0"; - sha256 = "d413a21f30ce41ee74db4dba4525ac66b10cdd14ca9074c15c1094d3a21467bd"; + version = "0.1.0.3"; + sha256 = "c4d91ca6923e9d04d72590eb309020e6937aa3097b3b649db6803e527eb4c092"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -63115,7 +63147,6 @@ self: { testHaskellDepends = [ base containers derive hlint hslogger hspec HUnit QuickCheck ]; - jailbreak = true; description = "A web service specification compiler that generates implementation and tests"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -64679,8 +64710,8 @@ self: { }: mkDerivation { pname = "haskelldb-hdbc"; - version = "2.2.2"; - sha256 = "6eb42d86c1c39fc05722115a788b2c9d07c88c5decf859ea2287866994ff7f1b"; + version = "2.2.4"; + sha256 = "42270f14d5138b2e69ddd61684ce13080853519b29c2082698949ec12d4cc70b"; libraryHaskellDepends = [ base containers convertible haskelldb HDBC mtl old-time ]; @@ -67294,8 +67325,8 @@ self: { }: mkDerivation { pname = "hemokit"; - version = "0.6.5"; - sha256 = "463c3163d2fcac0b693c458a4b2995f4a22833020ffa29ebf4d06194f0418380"; + version = "0.6.6"; + sha256 = "83ee3c5ace9f86602249ed3d66f0b4d81dfea97b477685ef43a097417713df55"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67309,8 +67340,7 @@ self: { transformers vector vector-fftw websockets ]; testHaskellDepends = [ base bytestring hspec HUnit vector ]; - jailbreak = true; - homepage = "https://github.com/nh2/haskell-hemokit"; + homepage = "https://github.com/nh2/hemokit"; description = "Haskell port of the Emokit EEG project"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -74835,8 +74865,8 @@ self: { ({ mkDerivation, base, hsqml, qt5, template-haskell, text }: mkDerivation { pname = "hsqml-datamodel"; - version = "0.1.0.0"; - sha256 = "354c225514ae632f5429f45a75975b7b7f6f2a245f7c57cd68567eacb2f2e21f"; + version = "0.2.0.2"; + sha256 = "fbab7cc84a7a8938438b35d3c59f75dedf5a66b46719f044a7c869e227f7dcec"; libraryHaskellDepends = [ base hsqml template-haskell text ]; libraryPkgconfigDepends = [ qt5 ]; homepage = "https://github.com/marcinmrotek/hsqml-datamodel"; @@ -74851,8 +74881,8 @@ self: { }: mkDerivation { pname = "hsqml-datamodel-vinyl"; - version = "0.3.0.0"; - sha256 = "d746e03f7cd77bab28ed9bb53253608e239237b510e412f2c55a8fdd61e144a2"; + version = "0.3.0.1"; + sha256 = "b75630e22b253bcdc2760adc9e6e1e39e03ae24e2bbbebab923892f8ccd09fe0"; libraryHaskellDepends = [ base exceptions hsqml-datamodel type-list vinyl ]; @@ -75745,8 +75775,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.4.19"; - sha256 = "5e5db3a8dfb309c8dc99ba154e0176013f7c50547b60b758725a5f5927b5e3f8"; + version = "0.4.20"; + sha256 = "8d79157a2887b67d90926a267eaf21b24e914c0975e371ac079167894e308a24"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -80024,8 +80054,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.5.5"; - sha256 = "b888f22dce4233e2664fd5410873ebc26e9e82227c447b8bdf7e406e4feb984a"; + version = "0.5.7.1"; + sha256 = "b3fa9f8e1046cf3a967cd3d920d4cab5c959a010bd5048ccd19e1596b9e5c72a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80574,8 +80604,8 @@ self: { pname = "irc-core"; version = "1.1.0.1"; sha256 = "a788848f0d60068ed173c394bf28ad637a85df4f3007daebe502126c1907c106"; - revision = "4"; - editedCabalFile = "bbe603100961c3b2746c733f31f56f26177b1b28180d6468133140f80d95b402"; + revision = "5"; + editedCabalFile = "8971a294711aaae3c327c2fe4f1f53eaed33a57b986585c934df43fa69e8f914"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80588,7 +80618,6 @@ self: { network old-locale split stm text time tls transformers vty x509 x509-store x509-system x509-validation ]; - jailbreak = true; homepage = "https://github.com/glguy/irc-core"; description = "An IRC client library and text client"; license = stdenv.lib.licenses.bsd3; @@ -80866,8 +80895,8 @@ self: { ({ mkDerivation, base, hspec, HUnit, time }: mkDerivation { pname = "iso8601-time"; - version = "0.1.3"; - sha256 = "fba7986008ed9ab105d5077b6db123bbe899b4e500db5617902b424e24bb1c17"; + version = "0.1.4"; + sha256 = "761d737ea0841ee8fd3660cfe20041e9458be8ab424de8b3b661bb249b930126"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base hspec HUnit time ]; homepage = "https://github.com/nh2/iso8601-time"; @@ -81141,6 +81170,7 @@ self: { homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; description = "Ivory C backend"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-bitdata" = callPackage @@ -81161,6 +81191,7 @@ self: { homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; description = "Ivory bit-data support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-examples" = callPackage @@ -81183,6 +81214,7 @@ self: { homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; description = "Ivory examples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-hw" = callPackage @@ -81200,6 +81232,7 @@ self: { homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; description = "Ivory hardware model (STM32F4)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ivory-opts" = callPackage @@ -82396,8 +82429,8 @@ self: { }: mkDerivation { pname = "json-stream"; - version = "0.3.0.4"; - sha256 = "4d6c385b3f035d42f5c85351d9701517c96629aeaf8fceaeaee940dafbf11506"; + version = "0.3.1.0"; + sha256 = "0de2f4abe549c2bee7bdb13e9bdd70137a06140e3b390ad3697a16a7d34ce7c6"; libraryHaskellDepends = [ aeson base bytestring scientific text unordered-containers vector ]; @@ -82405,7 +82438,6 @@ self: { aeson base bytestring hspec scientific text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/ondrap/json-stream"; description = "Incremental applicative JSON parser"; license = stdenv.lib.licenses.bsd3; @@ -83980,6 +84012,7 @@ self: { homepage = "https://github.com/lucasdicioccio/laborantin-hs"; description = "an experiment management framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "labyrinth" = callPackage @@ -85409,6 +85442,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "language-vhdl" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "language-vhdl"; + version = "0.1.0.0"; + sha256 = "ca55cb762f8b6225df178280dd5a0a3bf9fde2ac0ab942cdabd6239e8dedba33"; + libraryHaskellDepends = [ base pretty ]; + homepage = "https://github.com/markus-git/language-vhdl"; + description = "VHDL AST and pretty printer in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "largeword" = callPackage ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -86179,8 +86224,8 @@ self: { }: mkDerivation { pname = "lens-simple"; - version = "0.1.0.7"; - sha256 = "b8e00c791052f159463d1aa6e4738ac4fed5de4d0ebfdab21ec0500a3fe8d623"; + version = "0.1.0.8"; + sha256 = "26a144c5b274947b58f6fe0a65d8200edb43f5e99ff4519a2dfce74fffb28458"; libraryHaskellDepends = [ base lens-family lens-family-core lens-family-th mtl transformers ]; @@ -88631,8 +88676,8 @@ self: { ({ mkDerivation, base, containers, monadLib, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.3.1.1"; - sha256 = "5665a4d0e565042e649d9530102e1227aae3418a185b0f15aa894568236d63e2"; + version = "0.4.0.0"; + sha256 = "6d757a9929a0b43f3e22d0799939d7489b16dd2637553bb396a47cd0318bf23f"; libraryHaskellDepends = [ base containers monadLib pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -88645,8 +88690,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.1.3.1"; - sha256 = "1a3bed9ca5eadfa19dcd35102b97ef055720edfc7e4296730d4fea38db370696"; + version = "0.2.1.0"; + sha256 = "2d852be9dc0aa29d7a3c898486a201748c2f1a0276393a1f156e624eee108a8a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -88884,8 +88929,8 @@ self: { }: mkDerivation { pname = "log"; - version = "0.2.3"; - sha256 = "883a6e2d190046842713debf3dfa267aac5e096661f31b856ac2afbb50ee2f97"; + version = "0.2.4"; + sha256 = "56f3e654199a547551faa93fe8a97e2f3d7412bd3c20c5dd2b3c1eac9947d5b5"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq exceptions hpqtypes lifted-base monad-control monad-time mtl @@ -90166,17 +90211,34 @@ self: { }) { inherit (pkgs) ncurses;}; "magic" = callPackage - ({ mkDerivation, base, magic }: + ({ mkDerivation, base, file }: mkDerivation { pname = "magic"; version = "1.1"; sha256 = "b21c3b69f57b64199c1d7be0ac8ea1d02d698be59943058f6a2d642ea57ce082"; libraryHaskellDepends = [ base ]; - librarySystemDepends = [ magic ]; + librarySystemDepends = [ file ]; description = "Interface to C file/magic library"; license = stdenv.lib.licenses.bsd3; + }) { inherit (pkgs) file;}; + + "magico" = callPackage + ({ mkDerivation, base, hmatrix, transformers, utility-ht }: + mkDerivation { + pname = "magico"; + version = "0.0.0.1"; + sha256 = "97f4f606544bbc741b593d96167bcd4e80d2f5f98face9460a1c6ab1dab12c38"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hmatrix transformers utility-ht + ]; + jailbreak = true; + homepage = "http://hub.darcs.net/thielema/magico"; + description = "Compute solutions for Magico puzzle"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) { magic = null;}; + }) {}; "magma" = callPackage ({ mkDerivation, base, deepseq, profunctors, semigroups }: @@ -91986,12 +92048,12 @@ self: { }: mkDerivation { pname = "memory"; - version = "0.7"; - sha256 = "e123c8851a0f9bc3d442a462324bb828f6571d0d90fe1c6cb671f8913bd941fa"; + version = "0.8"; + sha256 = "7eef7546b1fc9b6f1d09422d36f0218fa582f83a93452c7422e5b267e94db7de"; libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; homepage = "https://github.com/vincenthz/hs-memory"; - description = "memory and related abtraction stuff"; + description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -92039,8 +92101,8 @@ self: { }: mkDerivation { pname = "messagepack"; - version = "0.4.0"; - sha256 = "11684ac166c7023c6cb31fbe27205ef532497f9fe3d787c87dfaa7e47d6a19a5"; + version = "0.5.0"; + sha256 = "6f1900a0df65cede2134a51c6bbe5084aa5a991777698cbeb2cd283b36a93ed8"; libraryHaskellDepends = [ base bytestring cereal containers ]; testHaskellDepends = [ base bytestring cereal containers QuickCheck test-framework @@ -92062,6 +92124,7 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers messagepack network-simple ]; + jailbreak = true; homepage = "http://github.com/rodrigosetti/messagepack-rpc"; description = "Message Pack RPC over TCP"; license = stdenv.lib.licenses.mit; @@ -92340,8 +92403,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microlens"; - version = "0.3.0.0"; - sha256 = "fc3fa9c8218f8c6c6fa3c56e1d378bf6ebd4bb51b3d9649f6f89249121d0f088"; + version = "0.3.1.0"; + sha256 = "6c822ad2697798b5073f2d04a8951392b6cead80ede5713ad415aa4213b565ee"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/aelve/microlens"; description = "A tiny part of the lens library which you can depend upon"; @@ -92381,8 +92444,8 @@ self: { }: mkDerivation { pname = "microlens-mtl"; - version = "0.1.4.0"; - sha256 = "99fb9facb90cece06a5b4d1e108b9b4a917bbf6832383d0d08eadc76684173b9"; + version = "0.1.4.1"; + sha256 = "5a9a54d7804ece4bc4ab45c1784ce91df7681e2742b301754a212c7ccc2d7e70"; libraryHaskellDepends = [ base microlens mtl transformers transformers-compat ]; @@ -92397,8 +92460,8 @@ self: { }: mkDerivation { pname = "microlens-platform"; - version = "0.1.0.0"; - sha256 = "f9be21db09c032a4827868ad1888650bb1aae4a86e9d99d11cf375b0877170e1"; + version = "0.1.1.0"; + sha256 = "73511b2b66b356a1231d7a3a7b2da9021ad5f03c9ab61cfa659483fa03166ad6"; libraryHaskellDepends = [ base hashable microlens microlens-ghc microlens-mtl microlens-th text unordered-containers vector @@ -93470,19 +93533,19 @@ self: { "moesocks" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network - , optparse-applicative, random, safe, stm, text, time, transformers - , unix, unordered-containers + , optparse-applicative, random, safe, stm, strict, text, time + , transformers, unix, unordered-containers }: mkDerivation { pname = "moesocks"; - version = "0.1.0.18"; - sha256 = "2428e0b69aa2c8e91471299835ed4cbab9d03a3e252913f7636cbc904fb29ecd"; + version = "0.1.0.20"; + sha256 = "06cb6e29dde04f62c9519fa295551e4130f596a96e74fceb9c2e36552d9de52e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ aeson async attoparsec base binary bytestring containers cryptohash hslogger HsOpenSSL lens mtl network optparse-applicative random - safe stm text time transformers unix unordered-containers + safe stm strict text time transformers unix unordered-containers ]; homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; @@ -97043,15 +97106,15 @@ self: { }) {}; "naver-translate" = callPackage - ({ mkDerivation, aeson, base, iso639, lens, lens-aeson, random - , text, wreq + ({ mkDerivation, aeson, base, iso639, lens, lens-aeson, network-uri + , random, text, wreq }: mkDerivation { pname = "naver-translate"; - version = "0.1.0.0"; - sha256 = "81fa0fb48c1096b141ab0e3972da9750a8027e9255805330c8fc0a6f982b7519"; + version = "0.1.0.1"; + sha256 = "8a1cd7b0f04d9c8445bc33d999fd144421d4a59c6779d5dbe2b45e55f2d35f8e"; libraryHaskellDepends = [ - aeson base iso639 lens lens-aeson random text wreq + aeson base iso639 lens lens-aeson network-uri random text wreq ]; jailbreak = true; homepage = "https://github.com/dahlia/naver-translate"; @@ -99916,8 +99979,8 @@ self: { ({ mkDerivation, base, containers }: mkDerivation { pname = "observable-sharing"; - version = "0.2.1.2"; - sha256 = "ea03b6c46ebe248f090c52d280bf7591a0f71972db507083b82ab5d817514d38"; + version = "0.2.2.1"; + sha256 = "a93236cd153fed0a8364c21780083e6f2e9e08a84ac3dfb938a3e56b19e37a80"; libraryHaskellDepends = [ base containers ]; homepage = "https://github.com/atzeus/observable-sharing"; description = "Simple observable sharing"; @@ -99934,8 +99997,8 @@ self: { }: mkDerivation { pname = "octohat"; - version = "0.1.4.2"; - sha256 = "821620dfc1d888027c984c29759432b4e5bbc30997ec848dd664e32f90295e69"; + version = "0.1.5.0"; + sha256 = "a064f32fdf4272e6b653ccc1bc13036c77b1bb902f1d9f6482ea76a02674639d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101240,8 +101303,8 @@ self: { }: mkDerivation { pname = "orchestrate"; - version = "0.2.0.2"; - sha256 = "1fb90d34287fb423e5b08b4ba92cf2fb812a4671ab1f723855da17112d960926"; + version = "0.2.0.3"; + sha256 = "ccc60ad893d0590a92495a3982a0a753cd2628dca9307ffe2e5077a4740eb0d7"; libraryHaskellDepends = [ aeson base bytestring case-insensitive data-default either errors http-client http-types lens mtl text transformers @@ -102001,8 +102064,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.1.2.4"; - sha256 = "f4b4219c029735cc9d9b03951460870155b5c8340d90accbb742a8dee727c5ab"; + version = "0.1.3.0"; + sha256 = "f3cdb3988ac223111dc7ccb3a28aa8a4db91ace098475f5e8e0c8f8bcfe6b8bd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -102013,7 +102076,6 @@ self: { base bytestring containers data-default hspec mtl pandoc pandoc-types process yaml ]; - jailbreak = true; description = "Pandoc filter for cross-references"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -110397,8 +110459,8 @@ self: { }: mkDerivation { pname = "quiver-http"; - version = "0.0.0.1"; - sha256 = "3c55e3de17b1cc41b4f2e0a3ea184b57a3e8c7be6d7c1eb0176aa538a29de292"; + version = "0.0.0.2"; + sha256 = "e221dbbe65a0b4509e7efbd1e70383575175932e16b28d0cbeaa2165b7a5dfe0"; libraryHaskellDepends = [ base bytestring http-client http-client-tls quiver ]; @@ -111310,6 +111372,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "react-flux" = callPackage + ({ mkDerivation, aeson, base, deepseq, mtl, text }: + mkDerivation { + pname = "react-flux"; + version = "0.9.0"; + sha256 = "6da5232f92bd5667a0ff2b6c3bbe9139ba412e82a8f619cfd05f2c056b907209"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ aeson base deepseq mtl text ]; + executableHaskellDepends = [ base deepseq ]; + homepage = "https://bitbucket.org/wuzzeb/react-flux"; + description = "A binding to React based on the Flux application architecture for GHCJS"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "react-haskell" = callPackage ({ mkDerivation, aeson, base, deepseq, lens-family, monads-tf, text , transformers, unordered-containers, void @@ -112338,12 +112415,11 @@ self: { ({ mkDerivation, base, blaze-markup, reform, shakespeare, text }: mkDerivation { pname = "reform-hamlet"; - version = "0.0.4"; - sha256 = "cf2107c6dd086b0875b8b80b2b63a234d89371fd420219e03ccf7415798219b9"; + version = "0.0.5"; + sha256 = "8a841b4a31518ddd6da9b64f93c5527aaab9bdc67eaef70298c9455004e896b6"; libraryHaskellDepends = [ base blaze-markup reform shakespeare text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Add support for using Hamlet with Reform"; license = stdenv.lib.licenses.bsd3; @@ -113851,6 +113927,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "resistor-cube" = callPackage + ({ mkDerivation, base, hmatrix, transformers, utility-ht }: + mkDerivation { + pname = "resistor-cube"; + version = "0.0"; + sha256 = "6c1eeaf029f0990b141dcdb7ba930bd3a16eb6b670a3d60cf83c0b37c65db269"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hmatrix transformers utility-ht + ]; + jailbreak = true; + homepage = "http://hub.darcs.net/thielema/resistor-cube"; + description = "Compute total resistance of a cube of resistors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "resolve-trivial-conflicts" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, directory, filepath , mtl, process, unix @@ -126396,8 +126490,8 @@ self: { ({ mkDerivation, base, ghc-prim, mmorph, mtl, transformers }: mkDerivation { pname = "streaming"; - version = "0.1.0.5"; - sha256 = "2d85fe60c6b1b6bd62711bbb67067dfece11fd89b5c8af00451d19df2857631e"; + version = "0.1.0.6"; + sha256 = "604014b7d23181e7906b81a9bca1829f8e63b8e3dc690709a7d5c348d0ff3af9"; libraryHaskellDepends = [ base ghc-prim mmorph mtl transformers ]; homepage = "https://github.com/michaelt/streaming"; description = "A free monad transformer optimized for streaming applications"; @@ -127372,8 +127466,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.3.1"; - sha256 = "8ca2837bc93bcd0bc538671cf23368fd3dad53fa8f98cb0da9e9126e453bd2ba"; + version = "0.3.2"; + sha256 = "b9fc42919351b5afd17cf8983e2cf8024edd3544efe92fe9ba26130d7d0d2d03"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -129282,6 +129376,7 @@ self: { ]; description = "Manage pools of possibly interdependent tasks using STM and async"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty" = callPackage @@ -130161,13 +130256,12 @@ self: { }: mkDerivation { pname = "terminfo-hs"; - version = "0.1.0.1"; - sha256 = "01bd721ce433eaef39ec1714940f7a61b12f990c1cfae4a108185132d8196ead"; + version = "0.2.1"; + sha256 = "632fa74d6ae9fc0026022c6dd91577c8a05f95e973347b33b4d49cd9059a48ff"; libraryHaskellDepends = [ attoparsec base bytestring containers directory errors filepath ]; testHaskellDepends = [ base directory errors filepath QuickCheck ]; - jailbreak = true; description = "A pure-Haskell (no FFI) module for accessing terminfo databases"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -130711,8 +130805,8 @@ self: { }: mkDerivation { pname = "texmath"; - version = "0.8.2.2"; - sha256 = "a1f492d8bfdd9a28f9bbb546fd335e285b7da15ab1e7ac0cc0c96a8e42cec2f3"; + version = "0.8.3"; + sha256 = "553d4e8785caf97370aa8d1b626c0e310fe0a1dec15abf2b146dc2ee219e1d34"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134718,23 +134812,22 @@ self: { "twilio" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal , containers, errors, exceptions, free, http-client - , http-client-tls, http-types, mtl, network-uri, old-locale, text - , time, transformers, unordered-containers + , http-client-tls, http-types, mtl, network-uri, old-locale + , scientific, text, time, transformers, unordered-containers }: mkDerivation { pname = "twilio"; - version = "0.1.2.0"; - sha256 = "77db1379626f5443c1fdfc91d5d1356dc93f5eb6ad23b43e6f3d9c2b5b7a1017"; + version = "0.1.3.0"; + sha256 = "e3a25a6896c83d84c347510e7112b597d398e4e04b5254c5732e2b2b4354b4e1"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers errors exceptions free http-client http-client-tls http-types mtl network-uri old-locale - text time transformers unordered-containers + scientific text time transformers unordered-containers ]; testHaskellDepends = [ aeson base bytestring Cabal http-client http-client-tls network-uri text transformers ]; - jailbreak = true; homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -137560,6 +137653,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "userid" = callPackage + ({ mkDerivation, aeson, base, boomerang, lens, safecopy, web-routes + , web-routes-th + }: + mkDerivation { + pname = "userid"; + version = "0.1.0.0"; + sha256 = "327e1d4bee9789ee911d35ce11ba50b3a135ee24cb93bd59ea42ded3426f00ba"; + libraryHaskellDepends = [ + aeson base boomerang lens safecopy web-routes web-routes-th + ]; + homepage = "http://www.github.com/Happstack/userid"; + description = "A library which provides the UserId type and useful instances for web development"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "users" = callPackage ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }: mkDerivation { @@ -140250,6 +140359,7 @@ self: { homepage = "https://github.com/Helkafen/wai-middleware-metrics"; description = "A WAI middleware to collect EKG request metrics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-preprocessor" = callPackage @@ -140729,29 +140839,30 @@ self: { "warp" = callPackage ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, case-insensitive, containers, directory, doctest - , ghc-prim, hashable, hspec, HTTP, http-date, http-types, http2 - , HUnit, iproute, lifted-base, network, old-locale, process - , QuickCheck, simple-sendfile, stm, streaming-commons, text, time - , transformers, unix, unix-compat, vault, wai, word8 + , bytestring, bytestring-builder, case-insensitive, containers + , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date + , http-types, http2, HUnit, iproute, lifted-base, network + , old-locale, process, QuickCheck, simple-sendfile, stm + , streaming-commons, text, time, transformers, unix, unix-compat + , vault, wai, word8 }: mkDerivation { pname = "warp"; - version = "3.1.2"; - sha256 = "b845179b3ec3e78d94408da61fdc9195807adaa25646205769e9a2b0b6ab48f9"; + version = "3.1.3"; + sha256 = "f65d32e374da0c1c1a44624e9744e4e2b5e325ca1e24a6aeae5719ee48c2b8e3"; libraryHaskellDepends = [ - array auto-update base blaze-builder bytestring 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 + array 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 - case-insensitive containers directory doctest ghc-prim hashable - hspec HTTP http-date http-types http2 HUnit iproute lifted-base - network old-locale process QuickCheck simple-sendfile stm - streaming-commons text time transformers unix unix-compat vault wai - word8 + bytestring-builder case-insensitive containers directory doctest + ghc-prim hashable hspec HTTP http-date http-types http2 HUnit + iproute lifted-base network old-locale process QuickCheck + 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"; @@ -140804,8 +140915,8 @@ self: { }: mkDerivation { pname = "warp-tls"; - version = "3.1.0"; - sha256 = "3fdb29b9bcbbe41bab87921eb8c0fee5c24a3dd50d6ac103d8ee88a10685209d"; + version = "3.1.1"; + sha256 = "5e9a75cc877f52053c5e1ceb15427ac28bf9937750336af0f71569b4e9e213bd"; libraryHaskellDepends = [ base bytestring cprng-aes data-default-class network streaming-commons tls wai warp @@ -146434,8 +146545,8 @@ self: { }: mkDerivation { pname = "yesod-table"; - version = "1.0.4"; - sha256 = "d0de749b9875ad2f744366c48abe0cca88cf96608cdc3462d888c95dfddf1789"; + version = "1.0.5"; + sha256 = "873cb5ae68d3726678ce4f254a5342f56244f86e88c731ca6849691df30f85df"; libraryHaskellDepends = [ base bytestring containers contravariant text yesod-core ]; @@ -146687,15 +146798,15 @@ self: { , data-default, directory, dlist, dynamic-state, dyre, exceptions , filepath, glib, gtk, hashable, hint, HUnit, lens, mtl, old-locale , oo-prototypes, pango, parsec, pointedlist, process, QuickCheck - , random, safe, semigroups, split, tasty, tasty-hunit + , random, safe, semigroups, split, stm, tasty, tasty-hunit , tasty-quickcheck, template-haskell, text, text-icu, time , transformers-base, unix, unix-compat, unordered-containers, vty , word-trie, xdg-basedir, yi-language, yi-rope }: mkDerivation { pname = "yi"; - version = "0.12.1"; - sha256 = "3b8e59f48053c42f1f51e4971f326991f0a59b5ee65705be6a48da2cf5824705"; + version = "0.12.2"; + sha256 = "16107755bd53f04a8edd03c2db50be3d7640b8d9503dea17ea923726c4de9e06"; configureFlags = [ "-fpango" "-fvty" ]; isLibrary = true; isExecutable = true; @@ -146703,7 +146814,7 @@ self: { array base binary bytestring Cabal containers data-default directory dlist dynamic-state dyre exceptions filepath glib gtk hashable hint lens mtl old-locale oo-prototypes pango parsec - pointedlist process QuickCheck random safe semigroups split + pointedlist process QuickCheck random safe semigroups split stm template-haskell text text-icu time transformers-base unix unix-compat unordered-containers vty word-trie xdg-basedir yi-language yi-rope @@ -146713,7 +146824,6 @@ self: { base directory filepath HUnit lens QuickCheck semigroups tasty tasty-hunit tasty-quickcheck text yi-language yi-rope ]; - jailbreak = true; homepage = "https://yi-editor.github.io"; description = "The Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; From b591bec333ab842cd3d6d9495428c7097fe74e87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2015 17:58:18 +0200 Subject: [PATCH 31/58] haskell-yi: fixed by upstream --- pkgs/development/haskell-modules/configuration-common.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 66bf20c55c9..41d56211827 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -919,13 +919,6 @@ self: super: { # https://github.com/GaloisInc/HaNS/pull/8 hans = appendPatch super.hans ./patches/hans-disable-webserver.patch; - # https://github.com/yi-editor/yi/issues/776 - yi = markBroken super.yi; - yi-monokai = dontDistribute super.yi-monokai; - yi-snippet = dontDistribute super.yi-snippet; - yi-solarized = dontDistribute super.yi-solarized; - yi-spolsky = dontDistribute super.yi-spolsky; - # https://github.com/athanclark/commutative/issues/1 commutative = dontCheck super.commutative; From f92eb718eb6d927e7bc85aec5c924c9e926218b0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2015 17:59:33 +0200 Subject: [PATCH 32/58] haskell-sets still can't compile its test suite. --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 41d56211827..2e1ff1df7cc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -925,7 +925,7 @@ self: super: { # https://github.com/athanclark/set-with/issues/1 set-with = dontCheck super.set-with; - # https://github.com/athanclark/sets/issues/1 + # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; # https://github.com/lens/lens-aeson/issues/18 From 0eca00a544dbd9fdd79c67ef1f392fe1b4160d64 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2015 18:00:19 +0200 Subject: [PATCH 33/58] haskell-sets-with was deprecated. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2e1ff1df7cc..8e0564dd20d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -922,9 +922,6 @@ self: super: { # https://github.com/athanclark/commutative/issues/1 commutative = dontCheck super.commutative; - # https://github.com/athanclark/set-with/issues/1 - set-with = dontCheck super.set-with; - # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; From d8650d5d6c574c6f911be859b7fb48ccf3af0f09 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2015 18:08:04 +0200 Subject: [PATCH 34/58] haskell-commutative: re-enable test suite All files, dependencies, etc. appear to now be set correctly. Tested with 'cabal test' in a local nix-shell environment. Closes https://github.com/peti/nixpkgs/pull/20. --- pkgs/development/haskell-modules/configuration-common.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 8e0564dd20d..6612b5a40cf 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -919,9 +919,6 @@ self: super: { # https://github.com/GaloisInc/HaNS/pull/8 hans = appendPatch super.hans ./patches/hans-disable-webserver.patch; - # https://github.com/athanclark/commutative/issues/1 - commutative = dontCheck super.commutative; - # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; From 1a590a618541d0eeff767280ec2c438e25ba820b Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 6 Aug 2015 15:10:48 +0300 Subject: [PATCH 35/58] haskell: use postPatch instead of patchPhase where possible Closes https://github.com/NixOS/nixpkgs/pull/9297. --- .../haskell-modules/configuration-common.nix | 10 +++++----- .../haskell-modules/configuration-ghc-7.10.x.nix | 4 ++-- .../haskell-modules/configuration-ghc-7.6.x.nix | 4 ++-- .../haskell-modules/configuration-ghc-7.8.x.nix | 4 ++-- .../haskell-modules/configuration-ghc-head.nix | 4 ++-- .../haskell-modules/configuration-ghc-nokinds.nix | 4 ++-- .../haskell-modules/configuration-ghcjs.nix | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6612b5a40cf..2fd397d9797 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -166,7 +166,7 @@ self: super: { # Jailbreak doesn't get the job done because the Cabal file uses conditionals a lot. darcs = (overrideCabal super.darcs (drv: { doCheck = false; # The test suite won't even start. - patchPhase = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal"; + postPatch = "sed -i -e 's|attoparsec .*,|attoparsec,|' -e 's|vector .*,|vector,|' darcs.cabal"; })).overrideScope (self: super: { zlib = self.zlib_0_5_4_2; }); # https://github.com/massysett/rainbox/issues/1 @@ -206,7 +206,7 @@ self: super: { x509-system = if pkgs.stdenv.isDarwin && !pkgs.stdenv.cc.nativeLibc then let inherit (pkgs.darwin) security_tool; in pkgs.lib.overrideDerivation (addBuildDepend super.x509-system security_tool) (drv: { - patchPhase = (drv.patchPhase or "") + '' + postPatch = (drv.postPatch or "") + '' substituteInPlace System/X509/MacOS.hs --replace security ${security_tool}/bin/security ''; }) @@ -216,7 +216,7 @@ self: super: { then super.double-conversion else overrideCabal super.double-conversion (drv: { - patchPhase = '' + postPatch = '' substituteInPlace double-conversion.cabal --replace stdc++ c++ ''; }); @@ -721,7 +721,7 @@ self: super: { # Already fixed in upstream darcs repo. xmonad-contrib = overrideCabal super.xmonad-contrib (drv: { - patchPhase = '' + postPatch = '' sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs ''; @@ -732,7 +732,7 @@ self: super: { # Hardcoded include path poppler = overrideCabal super.poppler (drv: { - patchPhase = '' + postPatch = '' sed -i -e 's,glib/poppler.h,poppler.h,' poppler.cabal sed -i -e 's,glib/poppler.h,poppler.h,' Graphics/UI/Gtk/Poppler/Structs.hsc ''; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index cbc9ed32f76..2fd9b9c0fb0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -90,10 +90,10 @@ self: super: { # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { - patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; + postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; }); utf8-string = overrideCabal super.utf8-string (drv: { - patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; + postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); pointfree = doJailbreak super.pointfree; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix index a7bad53c749..ccc4aa54c28 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix @@ -85,8 +85,8 @@ self: super: { # https://github.com/magthe/sandi/issues/7 sandi = overrideCabal super.sandi (drv: { - patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } - ); + postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; + }); # blaze-builder requires an additional build input on older compilers. blaze-builder = addBuildDepend super.blaze-builder super.bytestring-builder; diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix index 8ec10e22fa4..3579c697ada 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix @@ -127,8 +127,8 @@ self: super: { # https://github.com/magthe/sandi/issues/7 sandi = overrideCabal super.sandi (drv: { - patchPhase = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; } - ); + postPatch = "sed -i -e 's|base ==4.8.*,|base,|' sandi.cabal"; + }); # Overriding mtl 2.2.x is fine here because ghc-events is an stand-alone executable. ghc-events = super.ghc-events.override { mtl = self.mtl_2_2_1; }; diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index c8b6f33d847..55fd891ba2a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -66,10 +66,10 @@ self: super: { # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { - patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; + postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; }); utf8-string = overrideCabal super.utf8-string (drv: { - patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; + postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); # bos/attoparsec#92 diff --git a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix index be78321b38a..e62f21f135e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-nokinds.nix @@ -65,10 +65,10 @@ self: super: { # Setup: At least the following dependencies are missing: base <4.8 hspec-expectations = overrideCabal super.hspec-expectations (drv: { - patchPhase = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; + postPatch = "sed -i -e 's|base < 4.8|base|' hspec-expectations.cabal"; }); utf8-string = overrideCabal super.utf8-string (drv: { - patchPhase = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; + postPatch = "sed -i -e 's|base >= 3 && < 4.8|base|' utf8-string.cabal"; }); # bos/attoparsec#92 diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 48e7c14f317..bec8fabae20 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -56,7 +56,7 @@ self: super: { vector = null; pqueue = overrideCabal super.pqueue (drv: { - patchPhase = '' + postPatch = '' sed -i -e '12s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs sed -i -e '64s|null|Data.PQueue.Internals.null|' Data/PQueue/Internals.hs sed -i -e '32s|null|Data.PQueue.Internals.null|' Data/PQueue/Min.hs From 7e48c52aaacb34bed86b97ac5e5fd8903ffe9ea3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2015 18:10:12 +0200 Subject: [PATCH 36/58] haskell-singletons: update documentation for override --- pkgs/development/haskell-modules/configuration-common.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2fd397d9797..adbe14ef4f7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -769,9 +769,7 @@ self: super: { # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; - # https://github.com/goldfirere/singletons/issues/116 # https://github.com/goldfirere/singletons/issues/117 - # https://github.com/goldfirere/singletons/issues/118 clash-lib = dontDistribute super.clash-lib; clash-verilog = dontDistribute super.clash-verilog; Frames = dontDistribute super.Frames; From f2fc95686c3ff01ed4fbca124090be8ed077927d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 17 Aug 2015 22:27:17 +0200 Subject: [PATCH 37/58] haskell-shelly has transient test suite failures. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index adbe14ef4f7..5bae86683eb 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -971,4 +971,8 @@ self: super: { ''; }); + # https://github.com/yesodweb/Shelly.hs/issues/106 + # https://github.com/yesodweb/Shelly.hs/issues/108 + shelly = dontCheck super.shelly; + } From d58753b994dff5d3b66a86624f73ade0c5ebbb52 Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Mon, 17 Aug 2015 21:16:09 -0700 Subject: [PATCH 38/58] Newer haskell cmdlib version 0.3.6 is no longer marked as broken. Closes https://github.com/NixOS/nixpkgs/pull/9316. --- .../haskell-modules/configuration-ghc-7.10.x.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 2fd9b9c0fb0..8c8498b7a13 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -174,15 +174,6 @@ self: super: { in addBuildDepends jsaddle' [ self.glib self.gtk3 self.webkitgtk3 self.webkitgtk3-javascriptcore ]; - # contacted maintainer by e-mail - cmdlib = markBrokenVersion "0.3.5" super.cmdlib; - darcs-fastconvert = dontDistribute super.darcs-fastconvert; - ivory-backend-c = dontDistribute super.ivory-backend-c; - ivory-bitdata = dontDistribute super.ivory-bitdata; - ivory-examples = dontDistribute super.ivory-examples; - ivory-hw = dontDistribute super.ivory-hw; - laborantin-hs = dontDistribute super.laborantin-hs; - # https://github.com/cartazio/arithmoi/issues/1 arithmoi = markBroken super.arithmoi; NTRU = dontDistribute super.NTRU; From 09e5107d3b9e1b517920ee4054e6a0adfa6df27a Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Tue, 18 Aug 2015 05:47:59 -0400 Subject: [PATCH 39/58] haskell-hbro: fixed by upstream --- pkgs/development/haskell-modules/configuration-common.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5bae86683eb..0e5e1d42f0f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -895,8 +895,7 @@ self: super: { # https://github.com/liyang/thyme/issues/36 thyme = dontCheck super.thyme; - # https://github.com/k0ral/hbro/issues/15 - hbro = markBroken super.hbro; + # https://github.com/k0ral/hbro-contrib/issues/1 hbro-contrib = dontDistribute super.hbro-contrib; # https://github.com/aka-bash0r/multi-cabal/issues/4 From fabeee76bd1c2795933e5012c35cb4799ea18ef4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Aug 2015 22:54:42 +0200 Subject: [PATCH 40/58] haskell-configurator fails its test suite. --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0e5e1d42f0f..fde9bb782d8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -974,4 +974,7 @@ self: super: { # https://github.com/yesodweb/Shelly.hs/issues/108 shelly = dontCheck super.shelly; + # https://github.com/bos/configurator/issues/22 + configurator = dontCheck super.configurator; + } From f423ba3863092692f32a939f701d0eaf97afe9b2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Aug 2015 11:52:43 +0200 Subject: [PATCH 41/58] cbc: Enable on Darwin --- pkgs/applications/science/math/cbc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/cbc/default.nix b/pkgs/applications/science/math/cbc/default.nix index aa749a25889..0d1ef26092e 100644 --- a/pkgs/applications/science/math/cbc/default.nix +++ b/pkgs/applications/science/math/cbc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { homepage = https://projects.coin-or.org/Cbc; license = lib.licenses.epl10; maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; description = "A mixed integer programming solver"; }; } From 2ffc2099bed9b0e38a01e590318d5a5f6383d9ca Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Wed, 19 Aug 2015 12:25:50 +0200 Subject: [PATCH 42/58] leiningen: 2.5.1 -> 2.5.2. --- pkgs/development/tools/build-managers/leiningen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix index 5fb7d1a6995..70a6fac7bab 100644 --- a/pkgs/development/tools/build-managers/leiningen/default.nix +++ b/pkgs/development/tools/build-managers/leiningen/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "leiningen"; - version = "2.5.1"; + version = "2.5.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg"; - sha256 = "0pqqb2bh0a17426diwyhk5vbxcfz45rppbxmjydsmai94jm3cgix"; + sha256 = "0pzs645315nvn981w3nj8fi30g6kq67cmj7hq7da658qlk0p6r7i"; }; jarsrc = fetchurl { # NOTE: This is actually a .jar, Github has issues url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip"; - sha256 = "1irl3w66xq1xbbs4g10dnw1vknfw8al70nhr744gfn2za27w0xdl"; + sha256 = "0qhvgvii4x3p49bx494f6fc7dfvxx2crp2wbkldxx2brvh105iv4"; }; patches = [ ./lein-fix-jar-path.patch ]; From 172522e153b9601c86bb4eacc46ca1cc934d90b5 Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 19 Aug 2015 12:14:18 +0100 Subject: [PATCH 43/58] ecryptfs: - upgrade 106 -> 108 - fix passphrase rewrapper (password changing should now work fine) as discussed on https://bugs.launchpad.net/ecryptfs/+bug/1486470 - add lsof dependency so ecryptfs-migrate-home should work out of the box --- nixos/modules/security/pam.nix | 2 +- pkgs/tools/security/ecryptfs/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 02520fb88cd..0aa8ee0da82 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -251,9 +251,9 @@ let ${optionalString (!(config.security.pam.enableEcryptfs || cfg.pamMount)) "auth required pam_deny.so"} # Password management. + password requisite pam_unix.so nullok sha512 ${optionalString config.security.pam.enableEcryptfs "password optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"} - password requisite pam_unix.so nullok sha512 ${optionalString cfg.pamMount "password optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} ${optionalString config.users.ldap.enable diff --git a/pkgs/tools/security/ecryptfs/default.nix b/pkgs/tools/security/ecryptfs/default.nix index 590e6071b52..0ea5bc62fd4 100644 --- a/pkgs/tools/security/ecryptfs/default.nix +++ b/pkgs/tools/security/ecryptfs/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, perl, utillinux, keyutils, nss, nspr, python, pam -, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which }: +, intltool, makeWrapper, coreutils, bash, gettext, cryptsetup, lvm2, rsync, which, lsof }: stdenv.mkDerivation rec { name = "ecryptfs-${version}"; - version = "106"; + version = "108"; src = fetchurl { url = "http://launchpad.net/ecryptfs/trunk/${version}/+download/ecryptfs-utils_${version}.orig.tar.gz"; - sha256 = "1d5nlzcbl8ch639zi3lq6d14gkk4964j6dqhfs87i67867fhlghp"; + sha256 = "1pfpzc907m4qi5h2rxmkqq072c6g22pik2rilj4bl4qishd8p0sj"; }; #TODO: replace wrapperDir below with from config.security.wrapperDir; @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${rsync}/bin" \ --prefix PATH ":" "${keyutils}/bin" \ --prefix PATH ":" "${which}/bin" \ + --prefix PATH ":" "${lsof}/bin" \ --prefix PATH ":" "$out/bin" done ''; From 9d0efe846e15b951a44be434711e45aa020844ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= Date: Wed, 19 Aug 2015 11:04:34 +0100 Subject: [PATCH 44/58] rkt: init at 0.8.0 --- .../virtualization/rkt/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/virtualization/rkt/default.nix diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix new file mode 100644 index 00000000000..0b3300e2026 --- /dev/null +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio +, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.8.0"; + name = "rkt-${version}"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "coreos"; + repo = "rkt"; + sha256 = "1abv9psd5w0m8p2kvrwyjnrclzajmrpbwfwmkgpnkydhmsimhnn0"; + }; + + buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ]; + + preConfigure = '' + ./autogen.sh + ''; + + installPhase = '' + mkdir -p $out/bin + cp -Rv build-rkt-${version}/bin/* $out/bin + ''; + + meta = with lib; { + description = "A fast, composable, and secure App Container runtime for Linux"; + homepage = http://rkt.io; + license = licenses.asl20; + maintainers = with maintainers; [ ragge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7889e5c334d..ed4b1e5b8a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12506,6 +12506,8 @@ let RhythmDelay = callPackage ../applications/audio/RhythmDelay { }; + rkt = callPackage ../applications/virtualization/rkt { }; + rofi = callPackage ../applications/misc/rofi { automake = automake114x; }; From 57c276110fa21aa3c03838b7c12554497128f07c Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Sun, 16 Aug 2015 15:39:56 -0400 Subject: [PATCH 45/58] haskell-ghcjs: use ghcjs compatible with new vector Closes https://github.com/NixOS/nixpkgs/issues/9328. --- pkgs/development/compilers/ghcjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix index 9f1d3122818..5423c41f25b 100644 --- a/pkgs/development/compilers/ghcjs/default.nix +++ b/pkgs/development/compilers/ghcjs/default.nix @@ -55,8 +55,8 @@ in mkDerivation (rec { inherit version; src = fetchgit { url = git://github.com/ghcjs/ghcjs.git; - rev = "fb1faa9cb0a11a8b27b0033dfdb07aafb6add35e"; # master branch - sha256 = "1vqf19059j86h3rnbvzcp55bdqd5dkw3krb5vkw5mgsmva2g8sch"; + rev = "39c1cb6d5d2551b306a7957a0e7f682f4a048490"; # master branch + sha256 = "1v2hpmhdssgf1jmchiwkvp5j8j6rw3k0hpkf326vb8l1b0kbmibr"; }; isLibrary = true; isExecutable = true; From bed96a585f7d2fe05a48dd7e86660bfb39348b8e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Aug 2015 14:28:35 +0200 Subject: [PATCH 46/58] libmtp: Update to 1.1.9 --- pkgs/development/libraries/libmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix index 938c995e755..13b40501933 100644 --- a/pkgs/development/libraries/libmtp/default.nix +++ b/pkgs/development/libraries/libmtp/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { - name = "libmtp-1.1.8"; + name = "libmtp-1.1.9"; propagatedBuildInputs = [ libusb1 ]; buildInputs = [ pkgconfig ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/libmtp/${name}.tar.gz"; - sha256 = "10i2vnj8r6hyd61xgyhmxbsissq971g50fhm1h6mc3m4d99qg7iz"; + sha256 = "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93"; }; meta = { From d8b9521d643af4e03c526310d1495d0b535c16ef Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Aug 2015 16:05:25 +0200 Subject: [PATCH 47/58] nixos xfs_quota: add new module for managing xfs_quota projects --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/xfs_quota.nix | 109 +++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 nixos/modules/programs/xfs_quota.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6586b36968a..60255914d5d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -74,6 +74,7 @@ ./programs/venus.nix ./programs/wvdial.nix ./programs/freetds.nix + ./programs/xfs_quota.nix ./programs/zsh/zsh.nix ./rename.nix ./security/apparmor.nix diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix new file mode 100644 index 00000000000..34a44d17e4e --- /dev/null +++ b/nixos/modules/programs/xfs_quota.nix @@ -0,0 +1,109 @@ +# Configuration for the xfs_quota command + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.programs.xfs_quota; + + limitOptions = opts: concatStringsSep " " [ + (optionalString (opts.sizeSoftLimit != null) "bsoft=${opts.sizeSoftLimit}") + (optionalString (opts.sizeHardLimit != null) "bhard=${opts.sizeHardLimit}") + ]; + +in + +{ + + ###### interface + + options = { + + programs.xfs_quota = { + projects = mkOption { + type = types.attrsOf (types.submodule { + options = { + id = mkOption { + type = types.int; + description = "Project ID."; + }; + + fileSystem = mkOption { + type = types.string; + description = "XFS filesystem hosting the xfs_quota project."; + default = "/"; + }; + + path = mkOption { + type = types.string; + description = "Project directory."; + }; + + sizeSoftLimit = mkOption { + type = types.nullOr types.string; + default = null; + example = "30g"; + description = "Soft limit of the project size"; + }; + + sizeHardLimit = mkOption { + type = types.nullOr types.string; + default = null; + example = "50g"; + description = "Hard limit of the project size."; + }; + }; + }); + + description = "Setup of xfs_quota projects. Make sure the filesystem is mounted with the pquota option."; + + example = { + "projname" = { + id = 50; + path = "/xfsprojects/projname"; + sizeHardLimit = "50g"; + }; + }; + }; + }; + + }; + + + ###### implementation + + config = mkIf (cfg.projects != {}) { + + environment.etc.projects.source = pkgs.writeText "etc-project" + (concatStringsSep "\n" (mapAttrsToList + (name: opts: "${toString opts.id}:${opts.path}") cfg.projects)); + + environment.etc.projid.source = pkgs.writeText "etc-projid" + (concatStringsSep "\n" (mapAttrsToList + (name: opts: "${name}:${toString opts.id}") cfg.projects)); + + systemd.services = mapAttrs' (name: opts: + nameValuePair "xfs_quota-${name}" { + description = "Setup xfs_quota for project ${name}"; + script = '' + ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem} + ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem} + ''; + + wantedBy = [ "multi-user.target" ]; + after = [ ((replaceChars [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ]; + + restartTriggers = [ (pkgs.writeText "xfs_quota-project-trigger-${name}" (builtins.toJSON opts)) ]; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + } + ) cfg.projects; + + }; + +} From bc46013ac113a1d87b8b96b27cc7b18cc79fc177 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Aug 2015 18:03:42 +0200 Subject: [PATCH 48/58] nixos xfs_quota: set default projects to {} --- nixos/modules/programs/xfs_quota.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix index 34a44d17e4e..129e23b7f1d 100644 --- a/nixos/modules/programs/xfs_quota.nix +++ b/nixos/modules/programs/xfs_quota.nix @@ -23,6 +23,7 @@ in programs.xfs_quota = { projects = mkOption { + default = {}; type = types.attrsOf (types.submodule { options = { id = mkOption { From 50e9dd7da19b11258664f2acd0e953d56d3dce7e Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 19 Aug 2015 18:34:29 +0200 Subject: [PATCH 49/58] uclibc: Provide a more stable location for source. At the upstream URL at http://git.uclibc.org/uClibc/snapshot/, older versions are dropped at a regular basis. Unfortunately the tarball "uClibc-20150131.tar.bz2" has already been deleted from that directory and I didn't find a mirror providing the same file. So I've switched it to use fetchzip from the cgit site instead of using fetchgit directly. The reason why I didn't use fetchgit is that we'd need need git, which depends (indirectly? not sure, haven't checked) on libiconv and that in turn triggers an assertion if we're on Linux and are cross-building using uclibc. Signed-off-by: aszlig --- pkgs/os-specific/linux/uclibc/default.nix | 15 +++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index 88cf59cf8b7..472d432bc63 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, linuxHeaders, libiconvReal, cross ? null, gccCross ? null, +{stdenv, fetchzip, linuxHeaders, libiconvReal, cross ? null, gccCross ? null, extraConfig ? ""}: assert stdenv.isLinux; @@ -52,15 +52,18 @@ let UCLIBC_HAS_FPU n ''; + name = "uclibc-0.9.34-pre-20150131"; + rev = "343f6b8f1f754e397632b0552e4afe586c8b392b"; + in stdenv.mkDerivation { - name = "uclibc-0.9.34-pre-20150131" + stdenv.lib.optionalString (cross != null) - ("-" + cross.config); + name = name + stdenv.lib.optionalString (cross != null) ("-" + cross.config); - src = fetchurl { - url = http://www.uclibc.org/downloads/snapshots/uClibc-20150131.tar.bz2; - sha256 = "14svyxw4nizdcz4vqk9nizlgy32d8ngpvcca34jjbdjjg77xdvkc"; + src = fetchzip { + name = name + "-source"; + url = "http://git.uclibc.org/uClibc/snapshot/uClibc-${rev}.tar.bz2"; + sha256 = "1kgylzpid7da5i7wz7slh5q9rnq1m8bv5h9ilm76g0xwc2iwlhbw"; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91ab805f12b..66b2619ec7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10268,7 +10268,7 @@ let uclibc = callPackage ../os-specific/linux/uclibc { }; uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc { - inherit fetchurl stdenv libiconvReal; + inherit fetchzip stdenv libiconvReal; linuxHeaders = linuxHeadersCross; gccCross = gccCrossStageStatic; cross = assert crossSystem != null; crossSystem; From 2066ac2956b138222537379cf9c4172895e60e9a Mon Sep 17 00:00:00 2001 From: Kevin Quick Date: Wed, 19 Aug 2015 10:15:38 -0700 Subject: [PATCH 50/58] Specify no-tests cabal flag for vty-ui under ghc 7.10.x --- pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 8c8498b7a13..87b1d34f7ed 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -268,4 +268,7 @@ self: super: { # https://github.com/haskell/haddock/issues/427 haddock = dontCheck super.haddock; + # The tests in vty-ui do not build, but vty-ui itself builds. + vty-ui = enableCabalFlag super.vty-ui "no-tests"; + } From 62b589a54f842a72c80fb481b24451be7f9823ae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Aug 2015 10:42:48 -0700 Subject: [PATCH 51/58] libressl: 2.2.1 -> 2.2.2 --- pkgs/development/libraries/libressl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 093f644c096..a56d4ead823 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0bapzvxrg09p4hlzdhsvk0ljc3gsjj4ixjpf09dn0fzwmd81fcsg"; + sha256 = "0551i4jbs81ark3jy6nycqpyqn7rg30nvcdjvdg58s6l6fgv1570"; }; enableParallelBuilding = true; From e53e1c7070a431af250d8b15ed51ff16229f31bb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 19 Aug 2015 20:04:08 +0200 Subject: [PATCH 52/58] nixos xfs_quota: simplify restartTriggers --- nixos/modules/programs/xfs_quota.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix index 129e23b7f1d..d30a85922cf 100644 --- a/nixos/modules/programs/xfs_quota.nix +++ b/nixos/modules/programs/xfs_quota.nix @@ -96,7 +96,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ ((replaceChars [ "/" ] [ "-" ] opts.fileSystem) + ".mount") ]; - restartTriggers = [ (pkgs.writeText "xfs_quota-project-trigger-${name}" (builtins.toJSON opts)) ]; + restartTriggers = [ config.environment.etc.projects.source ]; serviceConfig = { Type = "oneshot"; From 8f59f4c78c44be83600d4a9e3dfbb87ff602c261 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 31 May 2015 14:40:26 +0300 Subject: [PATCH 53/58] firefox: build with pulseaudio support (close #8087) --- pkgs/applications/networking/browsers/firefox/default.nix | 7 +++---- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index a9e4bc39f62..326f39515fc 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -3,7 +3,7 @@ , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc +, cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio , enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu libpng - jemalloc + gstreamer gst_plugins_base icu libpng jemalloc + libpulseaudio # only headers are needed ] ++ lib.optional enableGTK3 gtk3; @@ -65,7 +65,6 @@ stdenv.mkDerivation rec { "--disable-necko-wifi" # maybe we want to enable this at some point "--disable-installer" "--disable-updater" - "--disable-pulseaudio" "--enable-jemalloc" ] ++ lib.optional enableGTK3 "--enable-default-toolkit=cairo-gtk3" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66b2619ec7c..8b05a124ce0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13282,7 +13282,8 @@ let ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]) - ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash; + ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash + ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; gtk_modules = [ libcanberra ]; }; From f683031df22332e372ec8bae5883a21b416ba073 Mon Sep 17 00:00:00 2001 From: Paulus Esterhazy Date: Wed, 19 Aug 2015 20:50:58 +0200 Subject: [PATCH 54/58] pass: Fix for Darwin --- pkgs/tools/security/pass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 0480962fb96..3315683967c 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -3,7 +3,7 @@ , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null -, x11Support ? true +, x11Support ? !stdenv.isDarwin }: assert x11Support -> xclip != null From 88b1d7e5d97fedc3d26b39fec84464886b902d9d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Aug 2015 13:23:56 -0700 Subject: [PATCH 55/58] logstash-forwarder: 20141216 -> 0.4.0 --- .../tools/misc/logstash-forwarder/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index a20b1d57775..44fa1cb7cfb 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,15 +1,21 @@ -{ stdenv, fetchgit, go_1_3 }: -stdenv.mkDerivation { - name = "logstash-forwarder-20141216"; - src = fetchgit { - url = https://github.com/elasticsearch/logstash-forwarder.git; - rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b"; - sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292"; +{ stdenv, fetchFromGitHub, go }: + +stdenv.mkDerivation rec { + name = "logstash-forwarder-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "elasticsearch"; + repo = "logstash-forwarder"; + rev = "v${version}"; + sha256 = "05g7366w8f7h75n1ia7njdpmparr6sfvn45xxfh5412zigqidz6l"; }; - buildInputs = [ go_1_3 ]; + + buildInputs = [ go ]; + installPhase = '' mkdir -p $out/bin - cp build/bin/logstash-forwarder $out/bin + find . -name logstash-forwarder -type f -exec cp {} $out/bin \; ''; meta = { From e27567cff107ae7d44ccc0bf76292cf0644d27d6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Aug 2015 12:57:41 -0700 Subject: [PATCH 56/58] golang: Remove old, unused compilers --- pkgs/development/compilers/go/1.0.nix | 95 --------------- pkgs/development/compilers/go/1.1-darwin.nix | 79 ------------ pkgs/development/compilers/go/1.1.nix | 101 ---------------- pkgs/development/compilers/go/1.2.nix | 92 -------------- pkgs/development/compilers/go/1.3.nix | 113 ------------------ pkgs/development/compilers/go/1.4.nix | 2 +- .../compilers/go/1_0-gcc-bug.patch | 19 --- .../compilers/go/1_0-opt-error.patch | 12 -- .../compilers/go/R_386_GOT32.patch | 46 ------- .../development/compilers/go/cacert-1.2.patch | 15 --- pkgs/development/compilers/go/cacert.patch | 15 --- pkgs/development/compilers/go/gox.nix | 28 ----- ...ove-tools.patch => remove-tools-1.4.patch} | 0 pkgs/top-level/all-packages.nix | 14 +-- 14 files changed, 2 insertions(+), 629 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.0.nix delete mode 100644 pkgs/development/compilers/go/1.1-darwin.nix delete mode 100644 pkgs/development/compilers/go/1.1.nix delete mode 100644 pkgs/development/compilers/go/1.2.nix delete mode 100644 pkgs/development/compilers/go/1.3.nix delete mode 100644 pkgs/development/compilers/go/1_0-gcc-bug.patch delete mode 100644 pkgs/development/compilers/go/1_0-opt-error.patch delete mode 100644 pkgs/development/compilers/go/R_386_GOT32.patch delete mode 100644 pkgs/development/compilers/go/cacert-1.2.patch delete mode 100644 pkgs/development/compilers/go/cacert.patch delete mode 100644 pkgs/development/compilers/go/gox.nix rename pkgs/development/compilers/go/{remove-tools.patch => remove-tools-1.4.patch} (100%) diff --git a/pkgs/development/compilers/go/1.0.nix b/pkgs/development/compilers/go/1.0.nix deleted file mode 100644 index b16ce93a3c5..00000000000 --- a/pkgs/development/compilers/go/1.0.nix +++ /dev/null @@ -1,95 +0,0 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}: - -let - loader386 = "${glibc}/lib/ld-linux.so.2"; - loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; - loaderArm = "${glibc}/lib/ld-linux.so.3"; -in - -stdenv.mkDerivation { - name = "go-1.0.3"; - - src = fetchurl { - url = http://go.googlecode.com/files/go1.0.3.src.tar.gz; - sha256 = "1pz31az3icwqfqfy3avms05jnqr0qrbrx9yqsclkdwbjs4rkbfkz"; - }; - - buildInputs = [ bison glibc bash makeWrapper ]; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - cd .. - if [ ! -d go ]; then - mv * go - fi - cd go - - patchShebangs ./ # replace /bin/bash - # !!! substituteInPlace does not seems to be effective. - sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go - - #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ - # -e 's,/bin/echo,${coreutils}/bin/echo,' \ - # src/pkg/exec/exec_test.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} - # The os test wants to read files in an existing path. Just it don't be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/pkg/os/os_test.go - ''; - - patches = [ ./cacert.patch ./1_0-opt-error.patch ./1_0-gcc-bug.patch ]; - - GOOS = "linux"; - GOARCH = if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "armv5tel-linux" then "arm" - else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - cd - - - # Wrap the tools to define the location of the - # libraries. - for a in go gofmt godoc; do - wrapProgram "$out/bin/$a" \ - --set "GOROOT" $out/share/go \ - ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} - done - - # Copy the emacs configuration for Go files. - mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ - ''; - - meta = { - branch = "1.0"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [ pierron viric ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/go/1.1-darwin.nix b/pkgs/development/compilers/go/1.1-darwin.nix deleted file mode 100644 index 776c1e04f08..00000000000 --- a/pkgs/development/compilers/go/1.1-darwin.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl, bison, bash, makeWrapper }: - -stdenv.mkDerivation { - name = "go-1.1.2"; - - src = fetchurl { - url = http://go.googlecode.com/files/go1.1.2.src.tar.gz; - sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz"; - }; - - buildInputs = [ bison bash makeWrapper ]; - - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - cd .. - if [ ! -d go ]; then - mv * go - fi - cd go - - patchShebangs ./ # replace /bin/bash - rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} - # The os test wants to read files in an existing path. Just it don't be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go - # Disable some tests - sed -i '/TestHostname/areturn' src/pkg/os/os_test.go - sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go - - ''; - - # Unfortunately we have to use Mac OS X's own GCC - preBuild = '' - export PATH=/usr/bin:$PATH - ''; - - #patches = [ ./cacert.patch ]; - - GOOS = "darwin"; - GOARCH = if stdenv.system == "x86_64-darwin" then "amd64" else "386"; - - installPhase = '' - mkdir -p "$out/bin" - - # CGO is broken on Maverick. See: http://code.google.com/p/go/issues/detail?id=5926 - # Reevaluate once go 1.1.3 is out - export CGO_ENABLED=0 - - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - cd - - - # Wrap the tools to define the location of the - # libraries. - for a in go gofmt godoc; do - wrapProgram "$out/bin/$a" \ - --set "GOROOT" $out/share/go - done - - # Copy the emacs configuration for Go files. - mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ - ''; - - meta = with stdenv.lib; { - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ zef ]; - platforms = platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix deleted file mode 100644 index de34e3e3cda..00000000000 --- a/pkgs/development/compilers/go/1.1.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc -, removeGodocExternals ? false }: - -let - loader386 = "${glibc}/lib/ld-linux.so.2"; - loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; - loaderArm = "${glibc}/lib/ld-linux.so.3"; -in - -stdenv.mkDerivation { - name = "go-1.1.2"; - - src = fetchurl { - url = http://go.googlecode.com/files/go1.1.2.src.tar.gz; - sha256 = "0w7bchhb4b053az3wjp6z342rs9lp9nxf4w2mnfd1b89d6sb7izz"; - }; - - buildInputs = [ bison glibc bash makeWrapper ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - cd .. - if [ ! -d go ]; then - mv * go - fi - cd go - - patchShebangs ./ # replace /bin/bash - # !!! substituteInPlace does not seems to be effective. - sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go - - #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ - # -e 's,/bin/echo,${coreutils}/bin/echo,' \ - # src/pkg/exec/exec_test.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} - # The os test wants to read files in an existing path. Just it don't be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/pkg/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go - '' + stdenv.lib.optionalString removeGodocExternals '' - sed -i -e '/googleapi/d' -e '/javascript">$/,+6d' lib/godoc/godoc.html - ''; - - patches = [ ./cacert.patch ]; - - GOOS = "linux"; - GOARCH = if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "armv5tel-linux" then "arm" - else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - cd - - - # Wrap the tools to define the location of the - # libraries. - for a in go gofmt godoc; do - wrapProgram "$out/bin/$a" \ - --set "GOROOT" $out/share/go \ - ${if stdenv.system == "armv5tel-linux" then "--set GOARM $GOARM" else ""} - done - - # Copy the emacs configuration for Go files. - mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ - ''; - - meta = with stdenv.lib; { - branch = "1.1"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ pierron viric ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix deleted file mode 100644 index 7aaedcb365d..00000000000 --- a/pkgs/development/compilers/go/1.2.nix +++ /dev/null @@ -1,92 +0,0 @@ -{ stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc -, libgpgerror }: - -let - loader386 = "${glibc}/lib/ld-linux.so.2"; - loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; - loaderArm = "${glibc}/lib/ld-linux.so.3"; -in - -stdenv.mkDerivation { - name = "go-1.2.2"; - - src = fetchurl { - url = https://storage.googleapis.com/golang/go1.2.2.src.tar.gz; - sha1 = "3ce0ac4db434fc1546fec074841ff40dc48c1167"; - }; - - buildInputs = [ bison glibc bash makeWrapper libgpgerror ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - - prePatch = '' - cd .. - if [ ! -d go ]; then - mv * go - fi - cd go - - patchShebangs ./ # replace /bin/bash - # !!! substituteInPlace does not seems to be effective. - sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.3,${loaderArm},' src/cmd/5l/asm.c - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go - - #sed -i -e 's,/bin/cat,${coreutils}/bin/cat,' \ - # -e 's,/bin/echo,${coreutils}/bin/echo,' \ - # src/pkg/exec/exec_test.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} - # The os test wants to read files in an existing path. Just it don't be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/pkg/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/pkg/time/time_test.go - ''; - - patches = [ ./cacert-1.2.patch ]; - - GOOS = "linux"; - GOARCH = if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "armv5tel-linux" then "arm" - else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - - installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - cd - - - # Copy the emacs configuration for Go files. - mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ - ''; - - meta = with stdenv.lib; { - branch = "1.2"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ pierron viric ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix deleted file mode 100644 index 65b80a7f3af..00000000000 --- a/pkgs/development/compilers/go/1.3.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }: - -let - loader386 = "${glibc}/lib/ld-linux.so.2"; - loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; - loaderArm = "${glibc}/lib/ld-linux.so.3"; - srcs = { - golang = fetchurl { - url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz; - sha1 = "b54b7deb7b7afe9f5d9a3f5dd830c7dede35393a"; - }; - tools = fetchhg { - url = https://code.google.com/p/go.tools/; - rev = "e1c276c4e679"; - sha256 = "0x62njflwkd99i2ixbksg6mjppl1wfg86f0g3swn350l1h0xzp76"; - }; - }; -in - -stdenv.mkDerivation { - name = "go-1.3.3"; - - src = srcs.golang; - - # perl is used for testing go vet - buildInputs = [ bison bash makeWrapper perl ] ++ lib.optionals stdenv.isLinux [ glibc ] ; - - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - mkdir -p $out/share - cd $out/share - ''; - postUnpack = '' - mkdir -p $out/share/go/src/pkg/code.google.com/p/ - cp -rv --no-preserve=mode,ownership ${srcs.tools} $out/share/go/src/pkg/code.google.com/p/go.tools - ''; - - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - cd go - patchShebangs ./ # replace /bin/bash - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/pkg/net/{multicast_test.go,parse_test.go,port_test.go} - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/pkg/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/pkg/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/pkg/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/pkg/os/os_test.go - sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/pkg/net/lookup_unix.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/pkg/time/format_test.go - '' + lib.optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/pkg/time/zoneinfo_unix.go - sed -i 's,/lib/ld-linux.so.3,${loaderArm},' src/cmd/5l/asm.c - sed -i 's,/lib64/ld-linux-x86-64.so.2,${loaderAmd64},' src/cmd/6l/asm.c - sed -i 's,/lib/ld-linux.so.2,${loader386},' src/cmd/8l/asm.c - ''; - - patches = [ ./cacert-1.2.patch ./R_386_GOT32.patch ]; - - GOOS = if stdenv.isDarwin then "darwin" else "linux"; - GOARCH = if stdenv.isDarwin then "amd64" - else if stdenv.system == "i686-linux" then "386" - else if stdenv.system == "x86_64-linux" then "amd64" - else if stdenv.system == "armv5tel-linux" then "arm" - else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = if stdenv.isDarwin then 0 else 1; - - installPhase = '' - export CC=cc - mkdir -p "$out/bin" - unset GOPATH - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - ./all.bash - cd - - - # Build extra tooling - # TODO: Fix godoc tests - TOOL_ROOT=code.google.com/p/go.tools/cmd - go install -v $TOOL_ROOT/cover $TOOL_ROOT/vet $TOOL_ROOT/godoc - go test -v $TOOL_ROOT/cover $TOOL_ROOT/vet # $TOOL_ROOT/godoc - - # Copy the emacs configuration for Go files. - mkdir -p "$out/share/emacs/site-lisp" - cp ./misc/emacs/* $out/share/emacs/site-lisp/ - ''; - - setupHook = ./setup-hook.sh; - - meta = with stdenv.lib; { - branch = "1.3"; - homepage = http://golang.org/; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix index d42873ab975..559bd9b01c3 100644 --- a/pkgs/development/compilers/go/1.4.nix +++ b/pkgs/development/compilers/go/1.4.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { patches = [ ./cacert-1.4.patch - ./remove-tools.patch + ./remove-tools-1.4.patch ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/pkgs/development/compilers/go/1_0-gcc-bug.patch b/pkgs/development/compilers/go/1_0-gcc-bug.patch deleted file mode 100644 index 34cf7ab7456..00000000000 --- a/pkgs/development/compilers/go/1_0-gcc-bug.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://code.google.com/p/go/source/detail?r=8b13b2ec6b18 ---- a/src/cmd/cgo/gcc.go 2014-07-02 12:00:12.171796197 +0200 -+++ b/src/cmd/cgo/gcc.go 2014-07-02 12:01:57.844472754 +0200 -@@ -840,6 +840,15 @@ - func (p *Package) gccErrors(stdin []byte) string { - // TODO(rsc): require failure - args := p.gccCmd() -+ -+ // GCC 4.8.0 has a bug: it sometimes does not apply -+ // -Wunused-value to values that are macros defined in system -+ // headers. See issue 5118. Adding -Wsystem-headers avoids -+ // that problem. This will produce additional errors, but it -+ // doesn't matter because we will ignore all errors that are -+ // not marked for the cgo-test file. -+ args = append(args, "-Wsystem-headers") -+ - if *debugGcc { - fmt.Fprintf(os.Stderr, "$ %s <sym); o++) -+ for(o=0; osym); o++) - f->sym[o] = S; - - t->funct = f; diff --git a/pkgs/development/compilers/go/R_386_GOT32.patch b/pkgs/development/compilers/go/R_386_GOT32.patch deleted file mode 100644 index c029d50168a..00000000000 --- a/pkgs/development/compilers/go/R_386_GOT32.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 609d996fac7f68b34032572b7bde627f658b95f2 Mon Sep 17 00:00:00 2001 -From: Russ Cox -Date: Mon, 6 Oct 2014 14:17:48 -0400 -Subject: [PATCH] cmd/8l: accept R_386_GOT32 in push instruction - -Fixes #8382. - -LGTM=iant -R=iant -CC=golang-codereviews -https://golang.org/cl/149540045 ---- - src/cmd/8l/asm.c | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c -index c135dce..98c0424 100644 ---- a/src/cmd/8l/asm.c -+++ b/src/cmd/8l/asm.c -@@ -117,13 +117,21 @@ adddynrel(LSym *s, Reloc *r) - case 256 + R_386_GOT32: - if(targ->type != SDYNIMPORT) { - // have symbol -- // turn MOVL of GOT entry into LEAL of symbol itself -- if(r->off < 2 || s->p[r->off-2] != 0x8b) { -- diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name); -+ if(r->off >= 2 && s->p[r->off-2] == 0x8b) { -+ // turn MOVL of GOT entry into LEAL of symbol address, relative to GOT. -+ s->p[r->off-2] = 0x8d; -+ r->type = R_GOTOFF; - return; - } -- s->p[r->off-2] = 0x8d; -- r->type = R_GOTOFF; -+ if(r->off >= 2 && s->p[r->off-2] == 0xff && s->p[r->off-1] == 0xb3) { -+ // turn PUSHL of GOT entry into PUSHL of symbol itself. -+ // use unnecessary SS prefix to keep instruction same length. -+ s->p[r->off-2] = 0x36; -+ s->p[r->off-1] = 0x68; -+ r->type = R_ADDR; -+ return; -+ } -+ diag("unexpected GOT reloc for non-dynamic symbol %s", targ->name); - return; - } - addgotsym(ctxt, targ); diff --git a/pkgs/development/compilers/go/cacert-1.2.patch b/pkgs/development/compilers/go/cacert-1.2.patch deleted file mode 100644 index 1ad6910915f..00000000000 --- a/pkgs/development/compilers/go/cacert-1.2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Go comes with hardcoded cacert. We add the usual in NixOS, -for easier NixOS life. - -diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go -index 76e79f4..6ef1dd3 100644 ---- a/src/pkg/crypto/x509/root_unix.go -+++ b/src/pkg/crypto/x509/root_unix.go -@@ -15,6 +15,7 @@ var certFiles = []string{ - "/etc/ssl/ca-bundle.pem", // OpenSUSE - "/etc/ssl/cert.pem", // OpenBSD - "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly -+ "/etc/ssl/certs/ca-bundle.crt", // NixOS - } - - func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { diff --git a/pkgs/development/compilers/go/cacert.patch b/pkgs/development/compilers/go/cacert.patch deleted file mode 100644 index 42a44313835..00000000000 --- a/pkgs/development/compilers/go/cacert.patch +++ /dev/null @@ -1,15 +0,0 @@ -Go comes with hardcoded cacert. We add the usual in NixOS, -for easier NixOS life. - -diff --git a/src/pkg/crypto/x509/root_unix.go b/src/pkg/crypto/x509/root_unix.go -index 76e79f4..6ef1dd3 100644 ---- a/src/pkg/crypto/x509/root_unix.go -+++ b/src/pkg/crypto/x509/root_unix.go -@@ -15,6 +15,7 @@ var certFiles = []string{ - "/etc/ssl/ca-bundle.pem", // OpenSUSE - "/etc/ssl/cert.pem", // OpenBSD - "/usr/local/share/certs/ca-root-nss.crt", // FreeBSD -+ "/etc/ssl/certs/ca-bundle.crt", // NixOS - } - - func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { diff --git a/pkgs/development/compilers/go/gox.nix b/pkgs/development/compilers/go/gox.nix deleted file mode 100644 index 1833ca37d0e..00000000000 --- a/pkgs/development/compilers/go/gox.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "c7329055e2aeb253a947e5cc876586ff4ca19199"; - name = "gox-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/mitchellh/gox"; - src = fetchFromGitHub { - inherit rev; - owner = "mitchellh"; - repo = "gox"; - sha256 = "0zhb88jjxqn3sdc4bpzvajqvgi9igp5gk03q12gaksaxhy2wl4jy"; - }; - - buildInputs = [ iochan ]; - - propagatedBuildInputs = [ go ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "A simple, no-frills tool for Go cross compilation that behaves a lot like standard go build"; - homepage = https://github.com/mitchellh/gox; - maintainers = with maintainers; [ cstrahan ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/compilers/go/remove-tools.patch b/pkgs/development/compilers/go/remove-tools-1.4.patch similarity index 100% rename from pkgs/development/compilers/go/remove-tools.patch rename to pkgs/development/compilers/go/remove-tools-1.4.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b05a124ce0..95dd3cadd1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4039,18 +4039,6 @@ let dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix { inherit stdenv fetchNuGet; }); - go_1_0 = callPackage ../development/compilers/go/1.0.nix { }; - - go_1_1 = - if stdenv.isDarwin then - callPackage ../development/compilers/go/1.1-darwin.nix { } - else - callPackage ../development/compilers/go/1.1.nix { }; - - go_1_2 = callPackage ../development/compilers/go/1.2.nix { }; - - go_1_3 = callPackage ../development/compilers/go/1.3.nix { }; - go_1_4 = callPackage ../development/compilers/go/1.4.nix { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -4059,7 +4047,7 @@ let go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; - gox = callPackage ../development/compilers/go/gox.nix { }; + gox = goPackages.gox; gprolog = callPackage ../development/compilers/gprolog { }; From c3592084cf17865ba460a1be0e7af97c6c3571c5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Aug 2015 13:50:09 -0700 Subject: [PATCH 57/58] golint: Update to 2015-06-23 --- pkgs/development/tools/golint/default.nix | 28 ----------------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/go-packages.nix | 11 +++++++++ 3 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/tools/golint/default.nix diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix deleted file mode 100644 index 7be4f84680a..00000000000 --- a/pkgs/development/tools/golint/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, goPackages, fetchFromGitHub }: - -with goPackages; - -buildGoPackage rec { - rev = "8ca23475bcb43213a55dd8210b69363f6b0e09c1"; - name = "golint-${lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/golang/lint"; - - src = fetchFromGitHub { - inherit rev; - owner = "golang"; - repo = "lint"; - sha256 = "16wbykik6dw3x9s7iqi4ln8kvzsh3g621wb8mk4nfldw7lyqp3cs"; - }; - - subPackages = [ "golint" ]; - - dontInstallSrc = true; - - meta = with lib; { - description = "Linter for Go source code"; - homepage = https://github.com/golang/lint; - license = licenses.mit; - maintainers = with maintainers; [ offline ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95dd3cadd1a..7064ad1855f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10043,7 +10043,7 @@ let gotags = callPackage ../development/tools/gotags { }; - golint = callPackage ../development/tools/golint { goPackages = go13Packages; }; + golint = goPackages.lint; godep = callPackage ../development/tools/godep { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 826aa90e8d1..231d2c81272 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1298,6 +1298,17 @@ let sha256 = "0v6g14ygnjl1l2fykyfjyvnab82a70jy0zzmsn5swlyy45b9gq2d"; }; + lint = buildFromGitHub { + rev = "7b7f4364ff76043e6c3610281525fabc0d90f0e4"; + date = "2015-06-23"; + owner = "golang"; + repo = "lint"; + sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9"; + excludedPackages = "testdata"; + dontInstallSrc = true; + buildInputs = [ tools ]; + }; + goquery = buildGoPackage rec { rev = "f065786d418c9d22a33cad33decd59277af31471"; #tag v.0.3.2 name = "goquery-${stdenv.lib.strings.substring 0 7 rev}"; From ef07bd04dca43a3ea5902a62d729cc2cc91999d1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Aug 2015 13:50:43 -0700 Subject: [PATCH 58/58] golang: Remove the last references to go-1.3 --- pkgs/top-level/all-packages.nix | 10 ---------- pkgs/top-level/go-packages.nix | 4 ---- 2 files changed, 14 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7064ad1855f..66ea5265047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8619,16 +8619,6 @@ let ### DEVELOPMENT / GO MODULES - go13Packages = recurseIntoAttrs (callPackage ./go-packages.nix { - go = go_1_3; - buildGoPackage = import ../development/go-modules/generic { - go = go_1_3; - govers = go13Packages.govers; - inherit lib; - }; - overrides = (config.goPackageOverrides or (p: {})) pkgs; - }); - go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix { go = go_1_4; buildGoPackage = import ../development/go-modules/generic { diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 231d2c81272..fa1d71621a3 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -4,7 +4,6 @@ , fetchgit, fetchhg, fetchurl, fetchFromGitHub, fetchFromBitbucket, fetchbzr, pkgs }: let - isGo13 = go.meta.branch == "1.3"; isGo14 = go.meta.branch == "1.4"; buildFromGitHub = { rev, owner, repo, sha256, name ? repo, goPackagePath ? "github.com/${owner}/${repo}", ... }@args: buildGoPackage (args // { @@ -21,7 +20,6 @@ let crypto = buildFromGitHub { rev = "4d48e5fa3d62b5e6e71260571bf76c767198ca02"; - disabled = isGo13; owner = "golang"; repo = "crypto"; sha256 = "0plvjv56afb02p7l3c2zfwffnhscmc3f0ckj1gls9ay6vj85y7l8"; @@ -1014,7 +1012,6 @@ let rev = "4734e7aca379f0d7fcdf04fbb2101696a4b45ce8"; name = "go-etcd-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-etcd"; - disabled = isGo13; src = fetchFromGitHub { inherit rev; @@ -1255,7 +1252,6 @@ let rev = "2688e91251d9d8e404e86dd8f096e23b2f086958"; name = "go-systemd-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/coreos/go-systemd"; - disabled = isGo13; excludedPackages = "examples";