From c002b886c05271f891383b466e6810359776443c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 01:43:38 +0200 Subject: [PATCH 01/26] faustCompressors: 1.1.1 -> 1.2 --- .../audio/magnetophonDSP/faustCompressors/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix index 05e2b335f82..e526e40a1e3 100644 --- a/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/faustCompressors/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: stdenv.mkDerivation rec { name = "faustCompressors-v${version}"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "magnetophon"; repo = "faustCompressors"; rev = "v${version}"; - sha256 = "0mkram2hm7i5za7pfn5crh2arbajk8praksxzgjx90rrxwl1y3d1"; + sha256 = "144f6g17q4m50kxzdncsfzdyycdfprnpwdaxcwgxj4jky1xsha1d"; }; buildInputs = [ faust2jaqt faust2lv2 ]; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { buildPhase = '' for f in *.dsp; do + echo "compiling standalone from" $f faust2jaqt -time -double -t 99999 $f done @@ -22,6 +23,7 @@ stdenv.mkDerivation rec { for f in *.dsp; do + echo "compiling plugin from" $f faust2lv2 -time -double -gui -t 99999 $f done ''; @@ -30,6 +32,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib/lv2 mv *.lv2/ $out/lib/lv2 mkdir -p $out/bin + rm newlib.sh for f in $(find . -executable -type f); do cp $f $out/bin/ From 3ed9546312d81f961b207d810f00dcaa0f7feb38 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 01:43:57 +0200 Subject: [PATCH 02/26] x42-plugins: 20161230 -> 20170428 --- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index a0fcfe81102..75368c6633b 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20161230"; + version = "20170428"; name = "x42-plugins-${version}"; src = fetchurl { url = "http://gareus.org/misc/x42-plugins/${name}.tar.xz"; - sha256 = "1yni9c17kl2pi9lqxip07b6g6lyfii1pch5czp183113gk54fwj5"; + sha256 = "0yi82rak2277x4nzzr5zwbsnha5pi61w975c8src2iwar2b6m0xg"; }; buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; From 075f43c8e6fa3eb8dd8eca8276a54f71711da941 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 01:44:46 +0200 Subject: [PATCH 03/26] zynaddsubfx: 2.5.4 -> 3.0.1 --- pkgs/applications/audio/zynaddsubfx/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index ec803f2a9c5..42fe3e34cd4 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, alsaLib, cmake, libjack2, fftw, fltk13, libjpeg -, minixml, pkgconfig, zlib, liblo +{ stdenv, fetchurl, alsaLib, cairo, cmake, libjack2, fftw, fltk13, lash, libjpeg +, libXpm, minixml, ntk, pkgconfig, zlib, liblo }: stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "2.5.4"; + version = "3.0.1"; src = fetchurl { url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.bz2"; - sha256 = "16llaa2wg2gbgjhwp3632b2vx9jvanj4csv7d41k233ms6d1sjq1"; + sha256 = "1qijvlbv41lnqaqbp6gh1i42xzf1syviyxz8wr39xbz55cw7y0d8"; }; - buildInputs = [ alsaLib libjack2 fftw fltk13 libjpeg minixml zlib liblo ]; + buildInputs = [ alsaLib cairo libjack2 fftw fltk13 lash libjpeg libXpm minixml ntk zlib liblo ]; nativeBuildInputs = [ cmake pkgconfig ]; hardeningDisable = [ "format" ]; From 33b08423057fce82a19f8da29f868db2c2fa751f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 12:40:24 +0200 Subject: [PATCH 04/26] artyFX: 2015-05-07 -> 1.3 --- pkgs/applications/audio/artyFX/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/artyFX/default.nix b/pkgs/applications/audio/artyFX/default.nix index 39edf18b056..568195c1dba 100644 --- a/pkgs/applications/audio/artyFX/default.nix +++ b/pkgs/applications/audio/artyFX/default.nix @@ -1,13 +1,14 @@ -{ stdenv, fetchgit, cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: +{ stdenv, fetchFromGitHub , cairomm, cmake, libjack2, libpthreadstubs, libXdmcp, libxshmfence, libsndfile, lv2, ntk, pkgconfig }: stdenv.mkDerivation rec { - name = "artyFX-git-${version}"; - version = "2015-05-07"; + name = "artyFX-${version}"; + version = "1.3"; - src = fetchgit { - url = "https://github.com/harryhaaren/openAV-ArtyFX.git"; - rev = "3a8cb9a5e4ffaf27a497a31cc9cd6f2e79622d5b"; - sha256 = "0nsmycm64a686ysfnmdvnaazijvfj90z5wyp96kyr81nsrbcv2ij"; + src = fetchFromGitHub { + owner = "openAVproductions"; + repo = "openAV-ArtyFX"; + rev = "release-${version}"; + sha256 = "012hcy1mxl7gs2lipfcqp5x0xv1azb9hjrwf0h59yyxnzx96h7c9"; }; buildInputs = [ cairomm cmake libjack2 libpthreadstubs libXdmcp libxshmfence libsndfile lv2 ntk pkgconfig ]; From 082563fe9e81a4a798e64ddbacbce45da5677cc5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 12:42:40 +0200 Subject: [PATCH 05/26] eq10q: 2.1 -> 2.2 --- pkgs/applications/audio/eq10q/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index a546441996e..35079ea2738 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; - version = "2.1"; + version = "2.2"; src = fetchurl { url = "mirror://sourceforge/project/eq10q/${name}.tar.gz"; - sha256 = "0brrr6ydsppi4zzn3vcgl0zgq5r8jmlcap1hpr3k43yvlwggb880"; + sha256 = "16mhcav8gwkp29k9ki4dlkajlcgh1i2wvldabxb046d37dq4qzrk"; }; buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; From c3399e5934b8a9b6dbee6fdef61897df8ab769f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Jun 2017 13:34:17 +0200 Subject: [PATCH 06/26] haskell-hastache: don't install the internal mkReadme tool --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index ec6e723db0d..ed99118850f 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -305,7 +305,6 @@ self: super: { haeredes = dontCheck super.haeredes; hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; - hastache = dontCheck super.hastache; hath = dontCheck super.hath; haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; @@ -861,4 +860,11 @@ self: super: { # build liquidhaskell with the proper (old) aeson version liquidhaskell = super.liquidhaskell.override { aeson = self.aeson_0_11_3_0; }; + # Test suite fails: https://github.com/lymar/hastache/issues/46. + # Don't install internal mkReadme tool. + hastache = overrideCabal super.hastache (drv: { + doCheck = false; + postInstall = "rm $out/bin/mkReadme && rmdir $out/bin"; + }); + } From 9f399c40e92c452d6133c04c46c0a41196db1f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Jun 2017 11:08:07 +0100 Subject: [PATCH 07/26] dino: 2017-05-31 -> 2017-06-13 --- .../networking/instant-messengers/dino/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 94adef2dda8..611146080bd 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -13,13 +13,13 @@ }: stdenv.mkDerivation rec { - name = "dino-unstable-2017-05-31"; + name = "dino-unstable-2017-06-13"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "2480c1ec26a8e0ccef3ea76e3c29566221405ffb"; - sha256 = "0wdjj38gbr2j6yklna3pd8nsfpdfp1j936dy8s49pzayw4pxs2g2"; + rev = "7bbbb738fdb233f4ad91ffdd7d9247b28849d715"; + sha256 = "09w26c6b5rkrrz7wvm629cncpdmd5n0d0805h8hw69bbzirpjjh2"; fetchSubmodules = true; }; From d0e6dcca4e352df6323e05774a8547adcba6ad7b Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 12:43:13 +0200 Subject: [PATCH 08/26] jalv: 1.4.6 -> 1.6.0 --- pkgs/applications/audio/jalv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index bcec085887a..e2c86256ce6 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jalv-${version}"; - version = "1.4.6"; + version = "1.6.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9"; + sha256 = "1x2wpzzx2cgvz3dgdcgsj8dr0w3zsasy62mvl199bsdj5fbjaili"; }; buildInputs = [ From 65ce8aa99229ff6b1c8c474441f77dc1d4e684c4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 12:43:33 +0200 Subject: [PATCH 09/26] lv2bm: git-2015-04-10 -> git-2015-11-29 --- pkgs/applications/audio/lv2bm/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix index 32a4f255abe..a7c8098dd79 100644 --- a/pkgs/applications/audio/lv2bm/default.nix +++ b/pkgs/applications/audio/lv2bm/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "lv2bm-${version}"; - version = "git-2015-04-10"; + version = "git-2015-11-29"; src = fetchFromGitHub { - owner = "portalmod"; + owner = "moddevices"; repo = "lv2bm"; - rev = "08681624fc13eb700ec2b5cabedbffdf095e28b3"; - sha256 = "11pi97jy4f4c3vsaizc8a6sw9hnhnanj6y1fil33yd9x7f8f0kbj"; + rev = "e844931503b7597f45da6d61ff506bb9fca2e9ca"; + sha256 = "1rrz5sp04zjal6v34ldkl6fjj9xqidb8xm1iscjyljf6z4l516cx"; }; buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ]; From 94c6b321e9ad229ebdb87a3b11eb421077f2038e Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 12:44:16 +0200 Subject: [PATCH 10/26] sorcer: 1.1.1 -> 1.1.3 --- pkgs/applications/audio/sorcer/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/sorcer/default.nix b/pkgs/applications/audio/sorcer/default.nix index ef28180cc3b..979f15d4006 100644 --- a/pkgs/applications/audio/sorcer/default.nix +++ b/pkgs/applications/audio/sorcer/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: +{ stdenv, fetchFromGitHub , boost, cairomm, cmake, libsndfile, lv2, ntk, pkgconfig, python }: stdenv.mkDerivation rec { name = "sorcer-${version}"; - version = "1.1.1"; + version = "1.1.3"; - src = fetchurl { - url = "https://github.com/harryhaaren/openAV-Sorcer/archive/release-${version}.tar.gz"; - sha256 = "1jkhs2rhn4givac7rlbj8067r7qq6jnj3ixabb346nw7pd6gn1wn"; + src = fetchFromGitHub { + owner = "openAVproductions"; + repo = "openAV-Sorcer"; + rev = "release-${version}"; + sha256 = "1x7pi77nal10717l02qpnhrx6d7w5nqrljkn9zx5w7gpb8fpb3vp"; }; buildInputs = [ boost cairomm cmake libsndfile lv2 ntk pkgconfig python ]; From 6c3459772beabbbc5dbaf208a9c427f562f64fb8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 12:44:41 +0200 Subject: [PATCH 11/26] ntk: 2014-10-18 -> 2017-04-22 --- pkgs/development/libraries/audio/ntk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/audio/ntk/default.nix b/pkgs/development/libraries/audio/ntk/default.nix index 4f58adefdf3..35144862ce9 100644 --- a/pkgs/development/libraries/audio/ntk/default.nix +++ b/pkgs/development/libraries/audio/ntk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ntk-${version}"; - version = "2014-10-18"; + version = "2017-04-22"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/non/fltk.git"; - rev = "5719b0044d9f267de5391fab006370cc7f4e70bd"; - sha256 = "1wpqy5kk6sk31qyx1c6gdslcqcbczgji6lk8w1l8kri0s908ywyj"; + rev = "92365eca0f9a6f054abc70489c009aba0fcde0ff"; + sha256 = "0pph7hf07xaa011zr40cs62f3f7hclfbv5kcrl757gcp2s5pi2iq"; }; buildInputs = [ From b3f1f88175e8e33e7195da126407e6f4e5729345 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 17:00:16 +0200 Subject: [PATCH 12/26] qjackctl: 0.4.4 -> 0.4.5 --- pkgs/applications/audio/qjackctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 857f77bbdaf..c5a977d741a 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: stdenv.mkDerivation rec { - version = "0.4.4"; + version = "0.4.5"; name = "qjackctl-${version}"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${name}.tar.gz"; - sha256 = "19bbljb3iz5ss4s5fmra1dxabg2fnp61sa51d63zsm56xkvv47ak"; + sha256 = "1dsavjfzz5bpzc80mvfs940w9f9f47cf4r9cqxnaqrl4xilsa3f5"; }; buildInputs = [ From 37bd5d40f92fb4c5ce586e5ec6e9930c8d2ec275 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Thu, 15 Jun 2017 17:00:55 +0200 Subject: [PATCH 13/26] qmidinet: 0.4.2 -> 0.4.3 --- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 89f1682592a..132e4a0fca2 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt5, alsaLib, libjack2 }: stdenv.mkDerivation rec { - version = "0.4.2"; + version = "0.4.3"; name = "qmidinet-${version}"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${name}.tar.gz"; - sha256 = "1sdnd189db44xhl9p8pd8h4bsy8s0bn1y64lrdq7nb21mwg8ymcs"; + sha256 = "1qhxhlvi6bj2a06i48pw81zf5vd36idxbq04g30794yhqcimh6vw"; }; hardeningDisable = [ "format" ]; From 38b3e42f54ba1fc26f347829b69bd6dc563df0cc Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 16 Jun 2017 09:14:38 -0300 Subject: [PATCH 14/26] tint2: 0.14.5 -> 0.14.6 --- pkgs/applications/misc/tint2/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 4b6f286351c..3edc9b73bb5 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { name = "tint2-${version}"; - version = "0.14.5"; + version = "0.14.6"; src = fetchFromGitLab { owner = "o9000"; repo = "tint2"; rev = version; - sha256 = "1nfvcw95wggih7pxh53cx4nlamny73nh88ggfh6a0ajjhafrd2j2"; + sha256 = "0v7i8araj85cbl45icinvmsz5741cx2ybjgkx72m3xfcb9fqg69l"; }; enableParallelBuilding = true; @@ -28,8 +28,7 @@ stdenv.mkDerivation rec { ''; prePatch = '' - for f in ./src/tint2conf/properties.c \ - ./src/launcher/apps-common.c \ + for f in ./src/launcher/apps-common.c \ ./src/launcher/icon-theme-common.c \ ./themes/*tint2rc do From c42d603910ae21f09a1a22792c60c5f03af8ce39 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Fri, 16 Jun 2017 12:03:23 +0200 Subject: [PATCH 15/26] lilv: 0.24.0 -> 0.24.2 --- pkgs/development/libraries/audio/lilv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index 101322f3f53..87ff0bdb0b6 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.24.0"; + version = "0.24.2"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "17pv4wdaj7m5ghpfs7h7d8jd105xfzyn2lj438xslj1ndm9xwq7s"; + sha256 = "08m5a372pr1l7aii9s3pic5nm68gynx1n1bc7bnlswziq6qnbv7p"; }; buildInputs = [ lv2 pkgconfig python serd sord sratom ]; From 7d126080695d2f84c440953735c6be087074e7c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 Jun 2017 16:21:48 +0100 Subject: [PATCH 16/26] llvmPackages_3.7: fix libnames output of llvm-config see also 4c4f50ce76aeeaa5fb66b66012f67dd878d1fbc7 --- .../compilers/llvm/3.7/fix-llvm-config.patch | 13 +++++++++++++ pkgs/development/compilers/llvm/3.7/llvm.nix | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch diff --git a/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch new file mode 100644 index 00000000000..772c4960927 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch @@ -0,0 +1,13 @@ +diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py +index eacefdf60bf..40d25f5cef8 100644 +--- a/utils/llvm-build/llvmbuild/main.py ++++ b/utils/llvm-build/llvmbuild/main.py +@@ -412,7 +412,7 @@ subdirectories = %s + if library_name is None: + library_name_as_cstr = '0' + else: +- library_name_as_cstr = '"lib%s.a"' % library_name ++ library_name_as_cstr = '"lib%s.so"' % library_name + f.write(' { "%s", %s, %d, { %s } },\n' % ( + name, library_name_as_cstr, is_installed, + ', '.join('"%s"' % dep diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index d4e7c73ad0d..1bdefd214f9 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -53,6 +53,11 @@ in stdenv.mkDerivation rec { ln -sv $PWD/lib $out ''; + patches = stdenv.lib.optionals (!stdenv.isDarwin) [ + # llvm-config --libfiles returns (non-existing) static libs + ./fix-llvm-config.patch + ]; + cmakeFlags = with stdenv; [ "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc From 672d2dfbb83890200224a90c6155f3c1d6019190 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Jun 2017 19:17:22 +0200 Subject: [PATCH 17/26] aws-sdk-cpp: Fix credentials test These require a home directory. http://hydra.nixos.org/build/54519006 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index c80abd5f3a0..95041097665 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -43,6 +43,8 @@ in stdenv.mkDerivation rec { for i in testing-resources aws-cpp-sdk-*; do export ${loaderVar}=$(pwd)/$i:''${${loaderVar}} done + + export HOME=$TMPDIR ''; NIX_LDFLAGS = lib.concatStringsSep " " ( From ac8451508b7dc04a045a6825f5e1c0cad449e7a4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 16 Jun 2017 19:15:41 +0200 Subject: [PATCH 18/26] aws-sdk-cpp: 1.0.127 -> 1.0.153 --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 95041097665..434c685e823 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -14,13 +14,13 @@ let else throw "Unsupported system!"; in stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.127"; + version = "1.0.153"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1p06rkvi6mm4jylk5j7gji2c52qbls3i0yqg3hgs9iys4nd1p14r"; + sha256 = "0mglg9a6klmsam8r9va7y5x2s8xylhljwcg93sr8152rvhxnjv08"; }; # FIXME: might be nice to put different APIs in different outputs From 0bb2f9af5e6d654ad0d75adbcaf245ad77f35a18 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Jun 2017 11:33:15 +0200 Subject: [PATCH 19/26] LTS Haskell 8.18 --- .../configuration-hackage2nix.yaml | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 42334b380b7..a9769e73f30 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 8.17 + # LTS Haskell 8.18 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -348,7 +348,7 @@ default-package-overrides: - check-email ==1.0.2 - checkers ==0.4.6 - chell ==0.4.0.1 - - choice ==0.2.0 + - choice ==0.2.1 - chunked-data ==0.3.0 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.3 @@ -403,7 +403,7 @@ default-package-overrides: - concurrent-output ==1.7.9 - concurrent-split ==0.0.1 - concurrent-supply ==0.1.8 - - conduit ==1.2.10 + - conduit ==1.2.11 - conduit-combinators ==1.1.1 - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.16 @@ -497,7 +497,7 @@ default-package-overrides: - data-inttrie ==0.1.2 - data-lens-light ==0.1.2.2 - data-memocombinators ==0.5.1 - - data-msgpack ==0.0.9 + - data-msgpack ==0.0.10 - data-or ==1.0.0.5 - data-ordlist ==0.4.7.0 - data-ref ==0.0.1.1 @@ -526,7 +526,7 @@ default-package-overrides: - diagrams-core ==1.4 - diagrams-gtk ==1.4 - diagrams-html5 ==1.4 - - diagrams-lib ==1.4.1 + - diagrams-lib ==1.4.1.2 - diagrams-postscript ==1.4 - diagrams-rasterific ==1.4 - diagrams-solve ==0.1.0.1 @@ -601,7 +601,7 @@ default-package-overrides: - ekg-statsd ==0.2.1.0 - ekg-wai ==0.1.0.1 - elerea ==2.9.0 - - elm-bridge ==0.4.0 + - elm-bridge ==0.4.1 - elm-core-sources ==1.0.0 - elm-export ==0.6.0.1 - elm-export-persistent ==0.1.2 @@ -705,7 +705,7 @@ default-package-overrides: - format-numbers ==0.1.0.0 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - - foundation ==0.0.9 + - foundation ==0.0.10 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 @@ -740,7 +740,7 @@ default-package-overrides: - ghc-mod ==5.7.0.0 - ghc-paths ==0.1.0.9 - ghc-prof ==1.3.0.2 - - ghc-syb-utils ==0.2.3 + - ghc-syb-utils ==0.2.3.1 - ghc-tcplugins-extra ==0.2 - ghc-typelits-extra ==0.2.3 - ghc-typelits-knownnat ==0.2.4 @@ -757,7 +757,7 @@ default-package-overrides: - gi-gio ==2.0.12 - gi-glib ==2.0.12 - gi-gobject ==2.0.12 - - gi-gtk ==3.0.14 + - gi-gtk ==3.0.15 - gi-javascriptcore ==3.0.12 - gi-pango ==1.0.13 - gi-soup ==2.4.12 @@ -920,7 +920,7 @@ default-package-overrides: - haddock-library ==1.4.3 - hailgun ==0.4.1.3 - hailgun-simple ==0.1.0.0 - - hakyll ==4.9.5.1 + - hakyll ==4.9.7.0 - half ==0.2.2.3 - hamilton ==0.1.0.0 - hamlet ==1.2.0 @@ -991,7 +991,7 @@ default-package-overrides: - hedis ==0.9.8 - here ==1.2.11 - heredoc ==0.2.0.0 - - heterocephalus ==1.0.4.0 + - heterocephalus ==1.0.5.0 - hex ==0.1.2 - hexml ==0.3.2 - hexpat ==0.20.10 @@ -1068,7 +1068,7 @@ default-package-overrides: - hslua-aeson ==0.1.0.4 - hsndfile ==0.8.0 - hsndfile-vector ==0.5.2 - - HsOpenSSL ==0.11.4.8 + - HsOpenSSL ==0.11.4.9 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - hspec ==2.4.3 @@ -1232,7 +1232,7 @@ default-package-overrides: - jwt ==0.7.2 - kan-extensions ==5.0.2 - kansas-comet ==0.4 - - katip ==0.3.1.4 + - katip ==0.3.1.5 - katip-elasticsearch ==0.3.0.2 - kawhi ==0.2.3 - kdt ==0.2.4 @@ -1254,7 +1254,7 @@ default-package-overrides: - language-glsl ==0.2.0 - language-haskell-extract ==0.2.4 - language-java ==0.2.8 - - language-javascript ==0.6.0.9 + - language-javascript ==0.6.0.10 - language-lua2 ==0.1.0.5 - language-puppet ==1.3.7 - language-python ==0.5.4 @@ -1355,7 +1355,7 @@ default-package-overrides: - median-stream ==0.7.0.0 - mega-sdist ==0.3.0.2 - megaparsec ==5.2.0 - - memory ==0.14.5 + - memory ==0.14.6 - MemoTrie ==0.6.7 - mersenne-random ==1.0.0.1 - mersenne-random-pure64 ==0.2.2.0 @@ -1555,7 +1555,7 @@ default-package-overrides: - parsec ==3.1.11 - parsec-numeric ==0.1.0.0 - ParsecTools ==0.0.2.0 - - parsers ==0.12.4 + - parsers ==0.12.5 - partial-handler ==1.0.2 - partial-isomorphisms ==0.2.2.1 - patat ==0.5.2.0 @@ -1590,7 +1590,7 @@ default-package-overrides: - picoparsec ==0.1.2.3 - pid1 ==0.1.0.1 - pinboard ==0.9.12.4 - - pinch ==0.3.1.0 + - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - pipes ==4.3.4 - pipes-attoparsec ==0.5.1.5 @@ -1667,12 +1667,12 @@ default-package-overrides: - prometheus-client ==0.1.1 - prometheus-metrics-ghc ==0.1.1 - prompt ==0.1.1.2 - - proto-lens ==0.2.0.1 + - proto-lens ==0.2.1.0 - proto-lens-arbitrary ==0.1.0.2 - - proto-lens-combinators ==0.1.0.6 - - proto-lens-descriptors ==0.2.0.1 + - proto-lens-combinators ==0.1.0.7 + - proto-lens-descriptors ==0.2.1.0 - proto-lens-optparse ==0.1.0.2 - - proto-lens-protoc ==0.2.0.1 + - proto-lens-protoc ==0.2.1.0 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - protocol-buffers ==2.4.0 @@ -1747,7 +1747,7 @@ default-package-overrides: - reform-happstack ==0.2.5.1 - reform-hsp ==0.2.7.1 - RefSerialize ==0.4.0 - - regex ==1.0.1.0 + - regex ==1.0.1.3 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1759,7 +1759,7 @@ default-package-overrides: - regex-posix ==0.95.2 - regex-tdfa ==1.2.2 - regex-tdfa-text ==1.0.0.3 - - regex-with-pcre ==1.0.1.0 + - regex-with-pcre ==1.0.1.3 - reinterpret-cast ==0.1.0 - relational-query ==0.8.4.0 - relational-query-HDBC ==0.6.0.3 @@ -1819,7 +1819,7 @@ default-package-overrides: - scalpel ==0.5.1 - scalpel-core ==0.5.1 - scanner ==0.2 - - scientific ==0.3.4.13 + - scientific ==0.3.4.15 - scotty ==0.11.0 - scrape-changes ==0.1.0.5 - scrypt ==0.5.0 @@ -2061,7 +2061,7 @@ default-package-overrides: - temporary ==1.2.0.4 - temporary-rc ==1.2.0.3 - termcolor ==0.2.0.0 - - terminal-progress-bar ==0.1.1 + - terminal-progress-bar ==0.1.1.1 - terminal-size ==0.3.2.1 - terminfo ==0.4.1.0 - test-fixture ==0.5.0.1 @@ -2124,7 +2124,7 @@ default-package-overrides: - timemap ==0.0.4 - timerep ==2.0.0.2 - timespan ==0.3.0.0 - - timezone-olson ==0.1.7 + - timezone-olson ==0.1.8 - timezone-series ==0.1.6.1 - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 @@ -2145,7 +2145,7 @@ default-package-overrides: - true-name ==0.1.0.2 - tsv2csv ==0.1.0.2 - ttrie ==0.1.2.1 - - tttool ==1.7.0.2 + - tttool ==1.7.0.3 - tuple ==0.3.0.2 - tuple-th ==0.2.5 - tuples-homogenous-h98 ==0.1.1.0 @@ -2174,6 +2174,7 @@ default-package-overrides: - tzdata ==0.1.20161123.0 - ua-parser ==0.7.3 - uglymemo ==0.1.0.1 + - unagi-chan ==0.4.0.0 - unbound ==0.5.1 - unbound-generics ==0.3.1 - unbounded-delays ==0.1.1.0 @@ -2208,7 +2209,7 @@ default-package-overrides: - unlit ==0.4.0.0 - unordered-containers ==0.2.8.0 - unsafe ==0.0 - - uri-bytestring ==0.2.3.2 + - uri-bytestring ==0.2.3.3 - uri-encode ==1.5.0.5 - uri-templater ==0.2.1.0 - url ==2.1.3 @@ -2376,12 +2377,12 @@ default-package-overrides: - YampaSynth ==0.2 - yes-precure5-command ==5.5.3 - yesod ==1.4.5 - - yesod-auth ==1.4.17.1 + - yesod-auth ==1.4.17.2 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - yesod-auth-hashdb ==1.6.1 - yesod-bin ==1.5.2.3 - - yesod-core ==1.4.33 + - yesod-core ==1.4.35 - yesod-eventsource ==1.4.1 - yesod-fay ==0.8.0 - yesod-form ==1.4.12 @@ -2392,10 +2393,10 @@ default-package-overrides: - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.2 - yesod-sitemap ==1.4.0.1 - - yesod-static ==1.5.2 + - yesod-static ==1.5.3 - yesod-static-angular ==0.1.8 - yesod-table ==2.0.3 - - yesod-test ==1.5.5 + - yesod-test ==1.5.6 - yesod-websockets ==0.2.6 - yi-core ==0.13.5 - yi-frontend-vty ==0.13.5 @@ -2416,10 +2417,10 @@ default-package-overrides: - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - zip ==0.1.11 - - zip-archive ==0.3.0.6 + - zip-archive ==0.3.1 - zippers ==0.2.3 - - ziptastic-client ==0.3.0.2 - - ziptastic-core ==0.2.0.2 + - ziptastic-client ==0.3.0.3 + - ziptastic-core ==0.2.0.3 - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 From 46f8242d89bce76a0d2b7b0ed276262e1ee9f797 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Jun 2017 14:27:39 +0200 Subject: [PATCH 20/26] hackage2nix: disable broken 'trasa-reflex' package Depends on insecure webkitgtk-2.4.11. --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9769e73f30..e4741017b1f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8330,6 +8330,7 @@ dont-distribute-packages: transient-universe-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] translatable-intset: [ i686-linux, x86_64-linux, x86_64-darwin ] translate: [ i686-linux, x86_64-linux, x86_64-darwin ] + trasa-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] travis-meta-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] From 0335b93284b156291d77ff121ea51a01c07527c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 12 Jun 2017 11:31:57 +0200 Subject: [PATCH 21/26] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.2.1-10-g4e4961f from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/e2c9a8916e8d005f3c9e6a55f7fc717fdaf4394c. --- .../haskell-modules/hackage-packages.nix | 3052 ++++++++++------- 1 file changed, 1879 insertions(+), 1173 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 057df5adf58..a384a682757 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -7674,6 +7674,8 @@ self: { pname = "HJavaScript"; version = "0.4.7"; sha256 = "0sb2wqbf6kml5d414xi6jk0gr31673djqxa5wg1mxl40vwn14pvh"; + revision = "1"; + editedCabalFile = "05m2kgz0laxv9jl1qfc1sxndan9503010y3aadvfcsxi9cyg3j1j"; libraryHaskellDepends = [ base pretty ]; description = "HJavaScript is an abstract syntax for a typed subset of JavaScript"; license = stdenv.lib.licenses.bsd3; @@ -8698,6 +8700,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "HaRe_0_8_4_1" = callPackage + ({ mkDerivation, attoparsec, base, base-prelude, Cabal + , cabal-helper, case-insensitive, containers, conversion + , conversion-case-insensitive, conversion-text, Diff, directory + , filepath, foldl, ghc, ghc-exactprint, ghc-mod, ghc-syb-utils + , gitrev, hslogger, hspec, HUnit, monad-control, mtl + , optparse-applicative, optparse-simple, parsec + , Strafunski-StrategyLib, syb, syz, turtle + }: + mkDerivation { + pname = "HaRe"; + version = "0.8.4.1"; + sha256 = "16ld7lrdf6vjmxam4kfc6zyy2g4baw7mr9ha39nrxjq0p8d4hn3v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cabal-helper containers directory filepath ghc ghc-exactprint + ghc-mod ghc-syb-utils hslogger monad-control mtl + Strafunski-StrategyLib syb syz + ]; + executableHaskellDepends = [ + base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple + ]; + testHaskellDepends = [ + attoparsec base base-prelude case-insensitive containers conversion + conversion-case-insensitive conversion-text Diff directory foldl + ghc ghc-exactprint ghc-mod ghc-syb-utils hslogger hspec HUnit mtl + parsec turtle + ]; + homepage = "https://github.com/RefactoringTools/HaRe/wiki"; + description = "the Haskell Refactorer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HaTeX" = callPackage ({ mkDerivation, base, bytestring, containers, matrix, parsec , QuickCheck, tasty, tasty-quickcheck, text, transformers @@ -9729,26 +9766,6 @@ self: { }) {Judy = null;}; "HsOpenSSL" = callPackage - ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network - , openssl, time - }: - mkDerivation { - pname = "HsOpenSSL"; - version = "0.11.4.8"; - sha256 = "07r190anfnrcy51xy6fqxcpn16sq3jazhjiidkix33kq4w40akfc"; - setupHaskellDepends = [ base Cabal ]; - libraryHaskellDepends = [ - base bytestring integer-gmp network time - ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ base bytestring ]; - homepage = "https://github.com/vshabanov/HsOpenSSL"; - description = "Partial OpenSSL binding for Haskell"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; - - "HsOpenSSL_0_11_4_9" = callPackage ({ mkDerivation, base, bytestring, Cabal, integer-gmp, network , openssl, time }: @@ -9939,6 +9956,26 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "Hydrogen" = callPackage + ({ mkDerivation, aeson, base, binary, directory, HFitUI, MissingH + , shakespeare, yaml + }: + mkDerivation { + pname = "Hydrogen"; + version = "0.1.0.0"; + sha256 = "10n45j8ri1svxhplpfj88riqk4qigzl02cqxkk3mrsahhgn6bkmp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary directory HFitUI MissingH shakespeare yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/iqsf/Hydrogen.git"; + description = "The library for generating a WebGL scene for the web"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "IDynamic" = callPackage ({ mkDerivation, base, containers, directory }: mkDerivation { @@ -10078,8 +10115,8 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.0"; - sha256 = "029qhw6h9vhzdcqbvm0km2fkijr20c0k4gk4ry5p9f3157d5pj0k"; + version = "0.2.1"; + sha256 = "1730whn02k1d9w6znfiibz8slwwnbrm1z47s544c24vdziwfh54v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -10094,7 +10131,7 @@ self: { testHaskellDepends = [ aeson base hspec http-client http-types vector ]; - homepage = "https://github.com/MichelBoucey/IPv6DB"; + homepage = "http://ipv6db.cybervisible.com"; description = "A RESTful Web Service for IPv6-related data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -13288,6 +13325,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Only" = callPackage + ({ mkDerivation, base, deepseq }: + mkDerivation { + pname = "Only"; + version = "0.1"; + sha256 = "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb"; + libraryHaskellDepends = [ base deepseq ]; + description = "The 1-tuple type or single-value \"collection\""; + license = stdenv.lib.licenses.bsd3; + }) {}; + "OpenAFP" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, hashable, hashtables, mtl, process, regex-compat @@ -14542,6 +14590,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_10_0_1" = callPackage + ({ mkDerivation, base, containers, deepseq, random + , template-haskell, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.10.0.1"; + sha256 = "0bml00g26vyky6mhfhkzh0rsafcxfkrdvk1imvlb2l4mrli0bm80"; + libraryHaskellDepends = [ + base containers deepseq random template-haskell tf-random + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -20936,7 +21003,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_2_0_0" = callPackage + "aeson_1_2_1_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, directory , dlist, filepath, generic-deriving, ghc-prim, hashable @@ -20948,8 +21015,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.2.0.0"; - sha256 = "0q0awch81kmq7k8p26wr6h1z31zkfyfxia8386vmsy0bgbcki8fb"; + version = "1.2.1.0"; + sha256 = "0wwa2i8jy3q7i8mys8hmy1nhis2a7hbs1bbfpmbj7xcvxpdhy5wn"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -21382,6 +21449,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-pretty_0_8_5" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , cmdargs, scientific, text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-pretty"; + version = "0.8.5"; + sha256 = "1yd98972srlbkn0f2jhrb3f443j9wnq2fnw5gbxjxzmkcinfh5yx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring scientific text + unordered-containers vector + ]; + executableHaskellDepends = [ + aeson attoparsec base bytestring cmdargs + ]; + homepage = "http://github.com/informatikr/aeson-pretty"; + description = "JSON pretty-printing library and command-line tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-qq" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim , haskell-src-meta, hspec, parsec, scientific, template-haskell @@ -21404,6 +21494,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-qq_0_8_2" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, ghc-prim + , haskell-src-meta, hspec, parsec, scientific, template-haskell + , text, vector + }: + mkDerivation { + pname = "aeson-qq"; + version = "0.8.2"; + sha256 = "0ln13jqyfh5726hdrk1rad9a6cgrrj201plmwcfcpvq18v4m5ckd"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat haskell-src-meta parsec + scientific template-haskell text vector + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat ghc-prim haskell-src-meta hspec + parsec scientific template-haskell text vector + ]; + homepage = "https://github.com/sol/aeson-qq#readme"; + description = "JSON quasiquoter for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-quick" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, microlens, tasty, tasty-hunit, text @@ -21928,15 +22041,17 @@ self: { }) {}; "aivika" = callPackage - ({ mkDerivation, array, base, containers, mtl, random, vector }: + ({ mkDerivation, array, base, binary, containers, deepseq, mtl + , random, vector + }: mkDerivation { pname = "aivika"; - version = "5.0.1"; - sha256 = "0myayp5z77qwcjlvphiigd4sw3mbsxcgn1hm7izr8nn0fh0djpgc"; + version = "5.1"; + sha256 = "1mmpqmcvsx3qygwm8iszhcdnafp09vbnnklkskd1qsg55nisp0ps"; libraryHaskellDepends = [ - array base containers mtl random vector + array base binary containers deepseq mtl random vector ]; - homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "A multi-method simulation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21947,12 +22062,12 @@ self: { }: mkDerivation { pname = "aivika-branches"; - version = "0.1.3"; - sha256 = "1cqzyhc1chzn9bsr3k2s5z2z9jqhg7k7ic2frwdfba2r7lpsqkfi"; + version = "0.2"; + sha256 = "0riavp8jvsxmlqxjljm0dsijvrc0vknhkrjgf9g501g5yypd6byy"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl random ]; - homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21964,30 +22079,30 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.3.1"; - sha256 = "0lp80khb8nw335nwfnn5ik2qzbw4mgijra3p2wyqgakqllflxnz5"; + version = "0.5"; + sha256 = "0ghsnq1a9jfrdgaf4gqplka53ywnr8jbabz4ikdzvrh80nnf3gpc"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl random stm time ]; - homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Parallel distributed discrete event simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; "aivika-experiment" = callPackage - ({ mkDerivation, aivika, base, containers, directory, filepath, mtl - , network-uri, parallel-io, split + ({ mkDerivation, aivika, aivika-transformers, base, containers + , directory, filepath, mtl, network-uri, parallel-io, split }: mkDerivation { pname = "aivika-experiment"; - version = "4.0.3"; - sha256 = "1v0x37kmav87b3mxvribw6658glf5hbk7npipkabp1qbfz5sp7zv"; + version = "5.0"; + sha256 = "1bcmkpzdmca0xcnvmbvsb5g0gsrxbrhf7lc3nig472w0pxa0xhg9"; libraryHaskellDepends = [ - aivika base containers directory filepath mtl network-uri - parallel-io split + aivika aivika-transformers base containers directory filepath mtl + network-uri parallel-io split ]; - homepage = "http://github.com/dsorokin/aivika-experiment"; + homepage = "http://www.aivikasoft.com"; description = "Simulation experiments for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -21998,13 +22113,13 @@ self: { }: mkDerivation { pname = "aivika-experiment-cairo"; - version = "4.3.1"; - sha256 = "0p54ssbl0ack51gwlj962x45954v4h22mqq6zqa5r8xrbcig2pdb"; + version = "5.0"; + sha256 = "1ybynnr9yiv9vi3v1zww9hlf7klm6kggs56basgpn7lzv5qdaz07"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-cairo ]; - homepage = "http://github.com/dsorokin/aivika-experiment-cairo"; - description = "Cairo backend for the Aivika simulation library"; + homepage = "http://www.aivikasoft.com"; + description = "Cairo-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22015,13 +22130,13 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "4.3.2"; - sha256 = "1ndysamwsxqna1qrk4wps1adms7vjvp1dj3ri48dzk9n1hymz7l1"; + version = "5.0"; + sha256 = "0hmdb6bk8iy3y4dq5pkf1yqwgxl3mjyhl4lqjj0pz24bxxwlg33z"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split ]; - homepage = "http://github.com/dsorokin/aivika-experiment-chart"; + homepage = "http://www.aivikasoft.com"; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22032,14 +22147,14 @@ self: { }: mkDerivation { pname = "aivika-experiment-diagrams"; - version = "4.3.1"; - sha256 = "1plb44bcjnawg3fsb9crmlyzwzyiz802ldsk559ni9sb590ywr7n"; + version = "5.0"; + sha256 = "013l4zp8pxz34xjkl7q9hwy4sk75k8gdwhg5kc5hsmw9nm47xa72"; libraryHaskellDepends = [ aivika-experiment aivika-experiment-chart base Chart Chart-diagrams containers filepath ]; - homepage = "http://github.com/dsorokin/aivika-experiment-diagrams"; - description = "Diagrams backend for the Aivika simulation library"; + homepage = "http://www.aivikasoft.com"; + description = "Diagrams-based charting backend for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22049,12 +22164,12 @@ self: { }: mkDerivation { pname = "aivika-lattice"; - version = "0.1.1"; - sha256 = "1mz1a1jdqf5609mfivr8vr9jk3q6jql99kaapjjrkgsdaszdsrv8"; + version = "0.2"; + sha256 = "0bd3xwga4cq2qibywq20rnl7fhhxs7ax1dl13ylcaxbg0sxyd0cj"; libraryHaskellDepends = [ aivika aivika-transformers base containers mtl random ]; - homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22065,13 +22180,13 @@ self: { }: mkDerivation { pname = "aivika-realtime"; - version = "0.1.2"; - sha256 = "0yny61yskyvb5n4m32iwxdyq0qmhbijiz68mx529zh33cl9ajq7v"; + version = "0.2"; + sha256 = "0dbbhf55w1i2wfr8lw3y5k2a51kw3223gnfhbamzz2283g5n80pg"; libraryHaskellDepends = [ aivika aivika-transformers async base containers mtl random stm time ]; - homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Soft real-time simulation module for the Aivika library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22082,12 +22197,12 @@ self: { }: mkDerivation { pname = "aivika-transformers"; - version = "5.0.1"; - sha256 = "1n9kfdyhwx0rylnsrxfx9x7cjbmb0l7cr6mb2faq2hln92400kks"; + version = "5.1"; + sha256 = "0ihwgql0ilavwx81f3z902r51p180b4facicd4sximnyg6qankdr"; libraryHaskellDepends = [ aivika array base containers mtl random vector ]; - homepage = "http://www.aivikasoft.com/en/products/aivika.html"; + homepage = "http://www.aivikasoft.com"; description = "Transformers for the Aivika simulation library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22172,8 +22287,8 @@ self: { }: mkDerivation { pname = "alerta"; - version = "0.1.0.3"; - sha256 = "0phw1l11v1dhim7njc5rrxlkacmk5wwm2vw9jcvkyh2j1bz5gx5g"; + version = "0.1.0.4"; + sha256 = "107qdab0wag38qj5j5wl0r3zp7zyhm2zj3c12zmksq4g5bzki8cb"; libraryHaskellDepends = [ aeson aeson-pretty base containers data-default http-api-data http-client servant servant-client servant-server text time @@ -25249,8 +25364,8 @@ self: { }: mkDerivation { pname = "antigate"; - version = "2.0.1"; - sha256 = "0vd2f4kq2zkngyqpnw3lcvjkn8335gs9rdfr7kb8442p8dhps139"; + version = "2.0.2"; + sha256 = "1s1m0k2r18jvz14nqy07m1jm87cdk0n5x2r1xznyfbcik7081ywb"; libraryHaskellDepends = [ base bytestring data-default deepseq exceptions failure http-client http-conduit resourcet safe text transformers @@ -25346,6 +25461,8 @@ self: { pname = "anydbm"; version = "1.0.7"; sha256 = "1rxk36r6i065m0qiq4g5xlrk2yjsds7j896cbddbsyddbzy10d6k"; + revision = "1"; + editedCabalFile = "1iny2zl44lbyv266al9047mkj51510vany6nfyq0xi7h7ak3wb13"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers MissingH mtl ]; @@ -26062,8 +26179,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.3.0.1"; - sha256 = "0578ql80fzkbjiw589v4498qd9jd7l2sz626imkdybxr1lqbsm0p"; + version = "0.4.0.0"; + sha256 = "1s25nlkbfzjr6b5psii3n7hmwvg7lgvaljp1ilq5y82rq8sfyxps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26130,19 +26247,19 @@ self: { }) {}; "approximate" = callPackage - ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, doctest, filepath, ghc-prim, hashable, hashable-extras - , lens, log-domain, pointed, safecopy, semigroupoids, semigroups - , simple-reflect, vector + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, directory, doctest, filepath, ghc-prim + , hashable, lens, log-domain, pointed, safecopy, semigroupoids + , semigroups, simple-reflect, vector }: mkDerivation { pname = "approximate"; - version = "0.2.2.3"; - sha256 = "1b1b61an77k0dxz60w8f07mw7s36i39nnnrcdqn5kg9npmnc3z90"; + version = "0.3"; + sha256 = "0zg94yqbm6iasjkf8bxz1bnwc3gx5lh6603cvab8rrxz4xm7k27j"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq ghc-prim hashable - hashable-extras lens log-domain pointed safecopy semigroupoids - semigroups vector + base binary bytes cereal comonad deepseq ghc-prim hashable lens + log-domain pointed safecopy semigroupoids semigroups vector ]; testHaskellDepends = [ base directory doctest filepath semigroups simple-reflect @@ -26857,6 +26974,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arrowp-qq" = callPackage + ({ mkDerivation, array, base, containers, haskell-src + , template-haskell, transformers + }: + mkDerivation { + pname = "arrowp-qq"; + version = "0.1"; + sha256 = "05cj6drvnk74bcjkr1pqj65c57y09gwmribii887jvg6p77abkgv"; + libraryHaskellDepends = [ + array base containers haskell-src template-haskell transformers + ]; + homepage = "http://www.haskell.org/arrows/"; + description = "quasiquoter translating arrow notation into Haskell 98"; + license = "GPL"; + }) {}; + "arrows" = callPackage ({ mkDerivation, base, Stream }: mkDerivation { @@ -27547,6 +27680,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-timer" = callPackage + ({ mkDerivation, base, containers, criterion, HUnit, lifted-async + , lifted-base, monad-control, safe-exceptions, test-framework + , test-framework-hunit, transformers-base + }: + mkDerivation { + pname = "async-timer"; + version = "0.1.4.0"; + sha256 = "00kdhxq0wpml4f7gdjvr2h8km8i3yj68bawpa229rzpp0y0yp3k3"; + libraryHaskellDepends = [ + base lifted-async lifted-base monad-control safe-exceptions + transformers-base + ]; + testHaskellDepends = [ + base containers criterion HUnit lifted-async test-framework + test-framework-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "asynchronous-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -27764,7 +27919,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "atom-conduit_0_4_0_2" = callPackage + "atom-conduit_0_4_0_3" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators , data-default, hlint, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty @@ -27773,8 +27928,8 @@ self: { }: mkDerivation { pname = "atom-conduit"; - version = "0.4.0.2"; - sha256 = "1zrrx3vd9y3r34ghfl5zn8k58y6w87r7zca00h9846wn01hd19fw"; + version = "0.4.0.3"; + sha256 = "0pl5p9zj33fjjgrxkyj2y45r3qyl5p8z9g17zg19gvqzszsk3vr1"; libraryHaskellDepends = [ base blaze-builder conduit conduit-combinators lens-simple mono-traversable parsers safe-exceptions text time timerep @@ -28279,6 +28434,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "audacity_0_0_1_2" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory + , explicit-exception, filepath, non-empty, storable-record + , storablevector, tagchup, transformers, utility-ht, xml-basic + }: + mkDerivation { + pname = "audacity"; + version = "0.0.1.2"; + sha256 = "1df9vk6f1gj0jpj3rmq63s3xjqc5p02hprfvq1nqgws0vfnp5lab"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq directory explicit-exception filepath + non-empty storable-record storablevector tagchup transformers + utility-ht xml-basic + ]; + homepage = "http://hub.darcs.net/thielema/audacity"; + description = "Interchange with the Audacity sound signal editor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "audiovisual" = callPackage ({ mkDerivation, base, boundingboxes, colors, deepseq, directory , filepath, free, freetype2, hashable, JuicyPixels @@ -28921,6 +29098,8 @@ self: { pname = "aws"; version = "0.16"; sha256 = "1710jajfla76igqrb2hv455gqhr4wap8225z1bffvjgk4w1cddc4"; + revision = "1"; + editedCabalFile = "0q4nbmi6s2zzp9jc4hwvdml101xskgindv0scyjjzcvl2cfa0zk9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -30915,6 +31094,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bench_1_0_5" = callPackage + ({ mkDerivation, base, criterion, optparse-applicative, silently + , text, turtle + }: + mkDerivation { + pname = "bench"; + version = "1.0.5"; + sha256 = "0fm92vwavgnh7pm0491vy5x21wylckga4a2n765nbw5hzmk9pz92"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base criterion optparse-applicative silently text turtle + ]; + homepage = "http://github.com/Gabriel439/bench"; + description = "Command-line benchmark tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "benchmark-function" = callPackage ({ mkDerivation, base, process, random, time }: mkDerivation { @@ -33176,6 +33374,8 @@ self: { pname = "bitarray"; version = "0.0.1.1"; sha256 = "00nqd62cbh42qqqvcl6iv1i9kbv0f0mkiygv4j70wfh5cl86yzxj"; + revision = "1"; + editedCabalFile = "10fk92v9afjqk43zi621jxl0n8kci0xjj32lz3vqa9xbh67zjz45"; libraryHaskellDepends = [ array base ]; homepage = "http://code.haskell.org/~bkomuves/"; description = "Mutable and immutable bit arrays"; @@ -35297,6 +35497,8 @@ self: { pname = "bound"; version = "2"; sha256 = "0z63k6kkj43rvwzsy7rbrxz97f8clq87ajbdv7768xziw4mb022x"; + revision = "1"; + editedCabalFile = "1sdsshbvhv955ncgxygzl4mfkkk76rdkilwc70w04j9jmbvj5p6j"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq hashable mmorph @@ -35601,6 +35803,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_18" = callPackage + ({ mkDerivation, base, containers, contravariant, data-clist + , deepseq, dlist, microlens, microlens-mtl, microlens-th, stm + , template-haskell, text, text-zipper, transformers, vector, vty + }: + mkDerivation { + pname = "brick"; + version = "0.18"; + sha256 = "1qk3ds8h1krqhl8gk3c6akblybq2zvs9686ispj14im88mzjma8r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers contravariant data-clist deepseq dlist microlens + microlens-mtl microlens-th stm template-haskell text text-zipper + transformers vector vty + ]; + homepage = "https://github.com/jtdaugherty/brick/"; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brillig" = callPackage ({ mkDerivation, base, binary, cmdargs, containers, directory , filepath, ListZipper, text @@ -36011,8 +36235,8 @@ self: { }: mkDerivation { pname = "buildbox"; - version = "2.1.9.2"; - sha256 = "1kjk237ap86qwrxrwywwi8w80i6bb5im5nhixq630b9vcj13v6kz"; + version = "2.1.9.3"; + sha256 = "1ffvf82qmf05vxzxi70jm1yq8apv5s62nms529n6x1p5lyrwwdr5"; libraryHaskellDepends = [ base bytestring containers directory exceptions mtl old-locale pretty process stm temporary text time @@ -38700,8 +38924,8 @@ self: { }: mkDerivation { pname = "canteven-log"; - version = "2.0.0.1"; - sha256 = "1jajfk7n6c0d42d2ciqn6x16dz7mzybh12jza4rdsp9bj6s23k8i"; + version = "2.0.1.0"; + sha256 = "0w7hzhb13g62l08ggld3rj9aamw1jhjkir1bpzc73bl59ls4gdgy"; libraryHaskellDepends = [ aeson base bytestring directory fast-logger filepath monad-logger template-haskell text time transformers yaml @@ -38952,6 +39176,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "carray_0_1_6_7" = callPackage + ({ mkDerivation, array, base, binary, bytestring, ix-shapable + , QuickCheck, syb + }: + mkDerivation { + pname = "carray"; + version = "0.1.6.7"; + sha256 = "0b5zabyfzi60llvimk2hfw93r38qfl3z5kjhp71rdgqj0alaxmx9"; + libraryHaskellDepends = [ + array base binary bytestring ix-shapable QuickCheck syb + ]; + testHaskellDepends = [ array base ix-shapable QuickCheck ]; + benchmarkHaskellDepends = [ array base ]; + description = "A C-compatible array library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "carte" = callPackage ({ mkDerivation, base, filepath, mtl, network, optparse-applicative , random, semigroups, time, transformers, tuple @@ -40975,20 +41217,6 @@ self: { }) {}; "choice" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "choice"; - version = "0.2.0"; - sha256 = "0bppl551b384c28fqzww73lddzhfdgs10qcf2wd8xk2awna0i9w9"; - revision = "1"; - editedCabalFile = "1bv77nhabm33jfaqhpl77jdcbfl7zxz4daphsmqb0pi6z85man7p"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mboes/choice#readme"; - description = "A solution to boolean blindness"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "choice_0_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "choice"; @@ -40998,7 +41226,6 @@ self: { homepage = "https://github.com/mboes/choice#readme"; description = "A solution to boolean blindness"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "choose" = callPackage @@ -43689,8 +43916,8 @@ self: { }: mkDerivation { pname = "coin"; - version = "1.2"; - sha256 = "01vryj8i55yfwf47m35yzh9b18xq31an41s5fi0ic4djzdacainh"; + version = "1.2.1"; + sha256 = "0076dvka5c0m3smppp58lklnf26ry9kibzyiy4yx1ygw5rn7m7pc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -44660,23 +44887,22 @@ self: { }) {}; "compensated" = callPackage - ({ mkDerivation, base, bifunctors, binary, bytes, cereal, comonad - , deepseq, directory, distributive, doctest, filepath + ({ mkDerivation, base, bifunctors, binary, bytes, Cabal + , cabal-doctest, cereal, comonad, deepseq, distributive, doctest , generic-deriving, hashable, lens, log-domain, safecopy , semigroupoids, semigroups, simple-reflect, vector }: mkDerivation { pname = "compensated"; - version = "0.7"; - sha256 = "1cp9nnagsnqkq3lmgg9khyg0dsi247gpy8afss25635q45cj8smg"; + version = "0.7.1"; + sha256 = "05vpx3jqb8m1naz1ka88kl2jfcf9snfhizb5mg6z2vf1w4axj7w6"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bifunctors binary bytes cereal comonad deepseq distributive - generic-deriving hashable lens log-domain safecopy semigroupoids - semigroups vector + hashable lens log-domain safecopy semigroupoids semigroups vector ]; testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect + base doctest generic-deriving semigroups simple-reflect ]; homepage = "http://github.com/analytics/compensated/"; description = "Compensated floating-point arithmetic"; @@ -45201,8 +45427,8 @@ self: { }: mkDerivation { pname = "concrete-haskell"; - version = "0.1.0.7"; - sha256 = "1v076bi2fk6a5sm4bjrxlah8hglbgbr2gcbsh3017h2hkkhl8gdv"; + version = "0.1.0.8"; + sha256 = "10pr4c48kdgbm365y4jjwk5ba3xvi90p1n8m94161y1j4bs1zzvm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45592,33 +45818,6 @@ self: { }) {}; "conduit" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq, exceptions - , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, split - , transformers, transformers-base, vector - }: - mkDerivation { - pname = "conduit"; - version = "1.2.10"; - sha256 = "1paqps8sc5ilx2nj98svvv5y9p26cl02d2a16qk9m16slzg7l5ni"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph monad-control mtl primitive - resourcet transformers transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - split transformers - ]; - benchmarkHaskellDepends = [ - base containers criterion deepseq hspec kan-extensions mwc-random - transformers vector - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit_1_2_11" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, exceptions , hspec, kan-extensions, lifted-base, mmorph, monad-control, mtl , mwc-random, primitive, QuickCheck, resourcet, safe, split @@ -45643,7 +45842,6 @@ self: { homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-audio" = callPackage @@ -45907,6 +46105,29 @@ self: { license = "unknown"; }) {}; + "conduit-parse_0_1_2_1" = callPackage + ({ mkDerivation, base, conduit, conduit-combinators, dlist, hlint + , mtl, parsers, resourcet, safe, safe-exceptions, tasty + , tasty-hunit, text, transformers + }: + mkDerivation { + pname = "conduit-parse"; + version = "0.1.2.1"; + sha256 = "0yc3mkg3fic5bpjsffghidk51sx5dhzvyc1h94ppic9mym985fwd"; + libraryHaskellDepends = [ + base conduit conduit-combinators dlist mtl parsers safe + safe-exceptions text transformers + ]; + testHaskellDepends = [ + base conduit hlint mtl parsers resourcet safe-exceptions tasty + tasty-hunit + ]; + homepage = "https://github.com/k0ral/conduit-parse"; + description = "Parsing framework based on conduit"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-resumablesink" = callPackage ({ mkDerivation, base, bytestring, conduit, hspec, transformers , void @@ -49664,8 +49885,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.2.0"; - sha256 = "1lnnjwc4hvy54q1q8vdbjl1baz8psqfaivjkb0hfc36y0bgishsl"; + version = "5.2.1"; + sha256 = "1an6m2090xjrraibmbxagbwlakmg83d1d0wasr7njv3cihms2dbq"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -49711,16 +49932,16 @@ self: { "csound-expression-typed" = callPackage ({ mkDerivation, base, Boolean, colour, containers , csound-expression-dynamic, data-default, deepseq, ghc-prim - , hashable, temporal-media, transformers, wl-pprint + , hashable, NumInstances, temporal-media, transformers, wl-pprint }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.0.0"; - sha256 = "1ihwl9mjbm8nr91nh9laxqgx4mx6i63kvykn6dmzawhj7bz20bi8"; + version = "0.2.0.1"; + sha256 = "1hihdgar789kbdb17a63h9cwsy4xz8mqlxq3919zj6cny87xl1af"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic - data-default deepseq ghc-prim hashable temporal-media transformers - wl-pprint + data-default deepseq ghc-prim hashable NumInstances temporal-media + transformers wl-pprint ]; homepage = "https://github.com/anton-k/csound-expression-typed"; description = "typed core for the library csound-expression"; @@ -52146,35 +52367,6 @@ self: { }) {}; "data-msgpack" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck - , text, unordered-containers, vector, void - }: - mkDerivation { - pname = "data-msgpack"; - version = "0.0.9"; - sha256 = "0p2bn29z7cdfc10sd0f34qqhyswhg5rwnfdicnqprzpv3hziwas3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers data-binary-ieee754 deepseq - hashable QuickCheck text unordered-containers vector void - ]; - executableHaskellDepends = [ base bytestring groom ]; - testHaskellDepends = [ - base bytestring containers hashable hspec QuickCheck text - unordered-containers vector void - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq QuickCheck - ]; - homepage = "http://msgpack.org/"; - description = "A Haskell implementation of MessagePack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "data-msgpack_0_0_10" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck , text, unordered-containers, vector, void @@ -54266,19 +54458,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_0_7_0_1" = callPackage + "dejafu_0_7_0_2" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, monad-loops, mtl, random, ref-fd, semigroups - , transformers, transformers-base + , leancheck, mtl, random, ref-fd, semigroups, transformers + , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.7.0.1"; - sha256 = "0cdkf5qgcwy4sapvingi0s37s0k9d5v8crskaj5wjy1pwl9vs8kq"; + version = "0.7.0.2"; + sha256 = "0l2as53zmsr94sf2kh1h5mj1ra1gpnzik2yqj0nj56cxys6sm6iy"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck - monad-loops mtl random ref-fd semigroups transformers - transformers-base + base concurrency containers deepseq exceptions leancheck mtl random + ref-fd semigroups transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; @@ -55482,40 +55673,8 @@ self: { }: mkDerivation { pname = "diagrams-lib"; - version = "1.4.1"; - sha256 = "0x7v0j27ydizb6lw89q7wilalzwyl545nqdwkxwnzg0fdnnhkz5w"; - libraryHaskellDepends = [ - active adjunctions array base bytestring cereal colour containers - data-default-class diagrams-core diagrams-solve directory - distributive dual-tree exceptions filepath fingertree fsnotify - hashable intervals JuicyPixels lens linear monoid-extras mtl - optparse-applicative process profunctors semigroups tagged text - transformers unordered-containers - ]; - testHaskellDepends = [ - base deepseq diagrams-solve lens numeric-extras tasty tasty-hunit - tasty-quickcheck - ]; - benchmarkHaskellDepends = [ base criterion diagrams-core ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-lib_1_4_1_1" = callPackage - ({ mkDerivation, active, adjunctions, array, base, bytestring - , cereal, colour, containers, criterion, data-default-class - , deepseq, diagrams-core, diagrams-solve, directory, distributive - , dual-tree, exceptions, filepath, fingertree, fsnotify, hashable - , intervals, JuicyPixels, lens, linear, monoid-extras, mtl - , numeric-extras, optparse-applicative, process, profunctors - , semigroups, tagged, tasty, tasty-hunit, tasty-quickcheck, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.4.1.1"; - sha256 = "1sgpmxs8n05bl9cq4fmbgwyqra5kr69di2ngwlc2vqf1fpymis9a"; + version = "1.4.1.2"; + sha256 = "0w16cljv9jcvn46hd19qvw1bfvxijlak286nap9qbvyavq2qhvjb"; libraryHaskellDepends = [ active adjunctions array base bytestring cereal colour containers data-default-class diagrams-core diagrams-solve directory @@ -55532,7 +55691,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-pandoc" = callPackage @@ -58176,6 +58334,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doctest_0_11_3" = callPackage + ({ mkDerivation, base, base-compat, code-page, deepseq, directory + , filepath, ghc, ghc-paths, hspec, HUnit, mockery, process + , QuickCheck, setenv, silently, stringbuilder, syb, transformers + , with-location + }: + mkDerivation { + pname = "doctest"; + version = "0.11.3"; + sha256 = "0j3qbcvsc389g2y5k5xyln3cik7wfy8ii9c3jp665fywp28r1iys"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + process syb transformers + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base base-compat code-page deepseq directory filepath ghc ghc-paths + hspec HUnit mockery process QuickCheck setenv silently + stringbuilder syb transformers with-location + ]; + homepage = "https://github.com/sol/doctest#readme"; + description = "Test interactive Haskell examples"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "doctest-discover" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, doctest , filepath @@ -58482,6 +58668,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dotenv_0_3_4_0" = callPackage + ({ mkDerivation, base, base-compat, exceptions, hspec + , hspec-megaparsec, megaparsec, optparse-applicative, process, text + , transformers + }: + mkDerivation { + pname = "dotenv"; + version = "0.3.4.0"; + sha256 = "0rbz73wfsw89pc4l06xqk3x9m5r43r0w1swbmnciwy238v9w7bz8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base-compat exceptions megaparsec text transformers + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + transformers + ]; + testHaskellDepends = [ + base base-compat exceptions hspec hspec-megaparsec megaparsec text + transformers + ]; + homepage = "https://github.com/stackbuilders/dotenv-hs"; + description = "Loads environment variables from dotenv files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -61181,23 +61395,6 @@ self: { }) {}; "elm-bridge" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, QuickCheck - , template-haskell, text - }: - mkDerivation { - pname = "elm-bridge"; - version = "0.4.0"; - sha256 = "1n8znpk75ms50c433lgc594xh6761rx0l65bkjdirch6wig1swj5"; - libraryHaskellDepends = [ aeson base template-haskell ]; - testHaskellDepends = [ - aeson base containers hspec QuickCheck text - ]; - homepage = "https://github.com/agrafix/elm-bridge"; - description = "Derive Elm types from Haskell types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "elm-bridge_0_4_1" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text }: @@ -61214,7 +61411,6 @@ self: { homepage = "https://github.com/agrafix/elm-bridge"; description = "Derive Elm types and Json code from Haskell types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-build-lib" = callPackage @@ -63597,20 +63793,20 @@ self: { "eventful-core" = callPackage ({ mkDerivation, aeson, base, containers, hlint, hspec - , http-api-data, HUnit, path-pieces, template-haskell, text - , transformers, uuid + , http-api-data, HUnit, path-pieces, sum-type-boilerplate + , template-haskell, text, transformers, uuid }: mkDerivation { pname = "eventful-core"; - version = "0.1.1"; - sha256 = "10s5qqc1amqn3zy6grdl6zbx8kfk6ny7q6dla7v743aiv4yi4zga"; + version = "0.1.2"; + sha256 = "0vlhn54qiwi6cvvf9r4nwgnlp747y3i1nh9y2dxr8g9zkpj0wcyn"; libraryHaskellDepends = [ - aeson base containers http-api-data path-pieces template-haskell - text transformers uuid + aeson base containers http-api-data path-pieces + sum-type-boilerplate template-haskell text transformers uuid ]; testHaskellDepends = [ aeson base containers hlint hspec http-api-data HUnit path-pieces - template-haskell text transformers uuid + sum-type-boilerplate template-haskell text transformers uuid ]; homepage = "https://github.com/jdreaver/eventful#readme"; description = "Core module for eventful"; @@ -63625,8 +63821,8 @@ self: { }: mkDerivation { pname = "eventful-dynamodb"; - version = "0.1.1"; - sha256 = "14fc76dzfg1ngg89k92fylyd8j3ym0xgvicl75mxrixpb40zcc9l"; + version = "0.1.2"; + sha256 = "0q8wvnxcprh4gz74d4jsia5ripgn87lb2mw037mrf817g0w63dgl"; libraryHaskellDepends = [ aeson amazonka amazonka-dynamodb base bytestring conduit eventful-core lens safe text unordered-containers vector @@ -63644,19 +63840,19 @@ self: { }) {}; "eventful-memory" = callPackage - ({ mkDerivation, async, base, containers, eventful-core + ({ mkDerivation, base, containers, eventful-core , eventful-test-helpers, hlint, hspec, HUnit, mtl, safe, stm }: mkDerivation { pname = "eventful-memory"; - version = "0.1.1"; - sha256 = "1rj2hhw9qrkkakg87xznamr2fnam5y6dl4gmd7bc06jpja8b3lzg"; + version = "0.1.2"; + sha256 = "0kq8f6x7q19vlwgfz7mwlisik0j5wi8pxwlliyv2ispa37rlmvgx"; libraryHaskellDepends = [ - async base containers eventful-core mtl safe stm + base containers eventful-core mtl safe stm ]; testHaskellDepends = [ - async base containers eventful-core eventful-test-helpers hlint - hspec HUnit mtl safe stm + base containers eventful-core eventful-test-helpers hlint hspec + HUnit mtl safe stm ]; homepage = "https://github.com/jdreaver/eventful#readme"; description = "In-memory implementations for eventful"; @@ -63670,11 +63866,11 @@ self: { }: mkDerivation { pname = "eventful-postgresql"; - version = "0.1.1"; - sha256 = "14icv9h1hjxj15r37xjldii21xpw7cfyinh38ch4045d3lldyals"; + version = "0.1.2"; + sha256 = "0aim6907mkjxlwiwkhmjmmfcbagkaq7z633447xr4mw931v8k84l"; libraryHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common mtl - persistent persistent-postgresql text + persistent text ]; testHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common @@ -63689,15 +63885,15 @@ self: { "eventful-sql-common" = callPackage ({ mkDerivation, aeson, base, bytestring, eventful-core, mtl - , persistent, persistent-template, split, text, uuid + , persistent, persistent-template, text, uuid }: mkDerivation { pname = "eventful-sql-common"; - version = "0.1.1"; - sha256 = "1xk6i34wd0drba7mj7pgd7ynb7mr1bp64jbahnbqc21sck0br8b0"; + version = "0.1.2"; + sha256 = "05q1v64l007saazflvp70sz4579dpzpr08qcgzhg2b1m2ga3pwhn"; libraryHaskellDepends = [ aeson base bytestring eventful-core mtl persistent - persistent-template split text uuid + persistent-template text uuid ]; homepage = "https://github.com/jdreaver/eventful#readme"; description = "Common library for SQL event stores"; @@ -63711,11 +63907,11 @@ self: { }: mkDerivation { pname = "eventful-sqlite"; - version = "0.1.1"; - sha256 = "0bnwvk86rjcjy8i2ng4j7v29c75jz9q41x1ks2niq3pnc7kx3sz4"; + version = "0.1.2"; + sha256 = "191c8fcw7wyr9bvviz1h9nbwcyrh5sl31arv4s9b3rjw847zg50j"; libraryHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common mtl - persistent persistent-sqlite text uuid + persistent text uuid ]; testHaskellDepends = [ aeson base bytestring eventful-core eventful-sql-common @@ -63733,8 +63929,8 @@ self: { }: mkDerivation { pname = "eventful-test-helpers"; - version = "0.1.1"; - sha256 = "0mj3cmm4nn4clr52q8glzn85x9qsdgq3vhsjbb67wvx6j2i3bs9g"; + version = "0.1.2"; + sha256 = "17i55zi9npjj7c97lc6fzad5aak46agcr73d5lv3yycm4lk2hj1g"; libraryHaskellDepends = [ aeson aeson-casing base eventful-core extra hspec monad-logger ]; @@ -64115,8 +64311,8 @@ self: { pname = "exceptions"; version = "0.8.3"; sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd"; - revision = "1"; - editedCabalFile = "06qrs9vdscwy6bs9isfyc3b2x9n05xzpas04sq88d6rrc4a2c4zw"; + revision = "2"; + editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -64848,6 +65044,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_5_3" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.5.3"; + sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base clock directory filepath QuickCheck time unix + ]; + homepage = "https://github.com/ndmitchell/extra#readme"; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -66397,6 +66613,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + "fft_0_1_8_6" = callPackage + ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable + , QuickCheck, storable-complex, syb, transformers + }: + mkDerivation { + pname = "fft"; + version = "0.1.8.6"; + sha256 = "0hjv3r09imb2ypgbz3qj9hf4f36v977z38gdcad3qa0334qdin1f"; + libraryHaskellDepends = [ + array base carray ix-shapable storable-complex syb transformers + ]; + libraryPkgconfigDepends = [ fftw fftwFloat ]; + testHaskellDepends = [ base carray QuickCheck storable-complex ]; + description = "Bindings to the FFTW library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; + "fftwRaw" = callPackage ({ mkDerivation, base, fftw }: mkDerivation { @@ -68159,8 +68393,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.2.4"; - sha256 = "196hfy2sw2ikgfnlwycmyn9bm8aykaqh05c67bjr03cgi42rnixk"; + version = "0.5.2.6"; + sha256 = "1krjwrwhfjyp80anb8y79a5rgfcs3qdlw6mgwdid5hfpddjbc1nd"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -68524,6 +68758,29 @@ self: { hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; + "foldl-statistics_0_1_4_6" = callPackage + ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random + , profunctors, quickcheck-instances, statistics, tasty + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "foldl-statistics"; + version = "0.1.4.6"; + sha256 = "05ibj8gw86n5jspn5qnvvqyihb1fanmk86xxrm04sghxbfc9szzy"; + libraryHaskellDepends = [ base foldl math-functions profunctors ]; + testHaskellDepends = [ + base foldl profunctors quickcheck-instances statistics tasty + tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base criterion foldl mwc-random statistics vector + ]; + homepage = "http://github.com/Data61/foldl-statistics#readme"; + description = "Statistical functions from the statistics package implemented as Folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foldl-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , criterion, doctest, foldl, free, lens-family-core @@ -69236,8 +69493,8 @@ self: { }: mkDerivation { pname = "foundation"; - version = "0.0.9"; - sha256 = "15ji4pr81na7q4d1v5jlrd3sczvhqscndfma43kcblvrgg0p55nv"; + version = "0.0.10"; + sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -69249,14 +69506,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "foundation_0_0_10" = callPackage + "foundation_0_0_11" = callPackage ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "foundation"; - version = "0.0.10"; - sha256 = "0ihrdgsn4ivpyhck0qqcfqx2xza1spqv81sd071i151yfyvl1a5p"; + version = "0.0.11"; + sha256 = "0jgxcr532vb7376h43l88g0rjgbil2caqnknmznfsprawy6a9s1v"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base mtl QuickCheck tasty tasty-hunit tasty-quickcheck @@ -71833,6 +72090,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-lens" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-lens"; + version = "0.2.0.0"; + sha256 = "05p53pqx0an32zdjj9x7dj4l04yh0p8rww32i8hh2ymg3h616apl"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/kcsongor/generic-lens"; + description = "Generic data-structure operations exposed as lenses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -72037,14 +72306,12 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "generics-sop_0_3_0_0" = callPackage + "generics-sop_0_3_1_0" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, template-haskell }: mkDerivation { pname = "generics-sop"; - version = "0.3.0.0"; - sha256 = "0flirwxbkxq1fl4xnnmn166qivm9j1cc5vmqyyb684nxdz2d1g03"; - revision = "1"; - editedCabalFile = "0znmanm560ig69ba9hfaj42j91mqn0jifig8ld4d84s4jpprk9rm"; + version = "0.3.1.0"; + sha256 = "1bazlhgmxcwv7vd44jhdx74cnhmaz6yy47jxfycapjj4mjrnp0x7"; libraryHaskellDepends = [ base deepseq ghc-prim template-haskell ]; testHaskellDepends = [ base ]; description = "Generic Programming using True Sums of Products"; @@ -73254,6 +73521,53 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "ghc-mod_5_8_0_0" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper + , containers, criterion, deepseq, directory, djinn-ghc, doctest + , extra, fclabels, filepath, ghc, ghc-boot, ghc-paths + , ghc-syb-utils, haskell-src-exts, hlint, hspec, monad-control + , monad-journal, mtl, old-time, optparse-applicative, pipes + , process, safe, semigroups, shelltest, split, syb + , template-haskell, temporary, text, time, transformers + , transformers-base + }: + mkDerivation { + pname = "ghc-mod"; + version = "5.8.0.0"; + sha256 = "1yf4fkg1xj1b66jg6kikzc6djad1xi44y7ark7ghgif0ab0g6rn3"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ + base Cabal containers directory filepath process template-haskell + transformers + ]; + libraryHaskellDepends = [ + base binary bytestring cabal-helper containers deepseq directory + djinn-ghc extra fclabels filepath ghc ghc-boot ghc-paths + ghc-syb-utils haskell-src-exts hlint monad-control monad-journal + mtl old-time optparse-applicative pipes process safe semigroups + split syb template-haskell temporary text time transformers + transformers-base + ]; + executableHaskellDepends = [ + base binary deepseq directory fclabels filepath ghc monad-control + mtl old-time optparse-applicative process semigroups split time + ]; + testHaskellDepends = [ + base cabal-helper containers directory doctest fclabels filepath + ghc ghc-boot hspec monad-journal mtl process split temporary + transformers + ]; + testToolDepends = [ shelltest ]; + benchmarkHaskellDepends = [ + base criterion directory filepath temporary + ]; + homepage = "https://github.com/DanielG/ghc-mod"; + description = "Happy Haskell Hacking"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {shelltest = null;}; + "ghc-mtl" = callPackage ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl }: @@ -73529,17 +73843,32 @@ self: { }) {}; "ghc-syb-utils" = callPackage - ({ mkDerivation, base, ghc, syb }: + ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: mkDerivation { pname = "ghc-syb-utils"; - version = "0.2.3"; - sha256 = "0rxwdivpcppwzbqglbrz8rm9f4g1gmba9ij7p7aj3di9x37kzxky"; + version = "0.2.3.1"; + sha256 = "13gazr6ydlxrj5yfg9pqhrgm7az9a36m7cfxmmvv1hkq2plfgw7y"; libraryHaskellDepends = [ base ghc syb ]; + testHaskellDepends = [ base directory filepath ghc ghc-paths ]; homepage = "http://github.com/nominolo/ghc-syb"; description = "Scrap Your Boilerplate utilities for the GHC API"; license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-syb-utils_0_2_3_2" = callPackage + ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }: + mkDerivation { + pname = "ghc-syb-utils"; + version = "0.2.3.2"; + sha256 = "1h05blm311cg0ricd9skb0m115512mmrrp7g6qh4bbihjmy0l5nb"; + libraryHaskellDepends = [ base ghc syb ]; + testHaskellDepends = [ base directory filepath ghc ghc-paths ]; + homepage = "http://github.com/nominolo/ghc-syb"; + description = "Scrap Your Boilerplate utilities for the GHC API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tcplugins-extra" = callPackage ({ mkDerivation, base, ghc }: mkDerivation { @@ -73905,16 +74234,18 @@ self: { }) {}; "ghcjs-dom-hello" = callPackage - ({ mkDerivation, base, ghcjs-dom, jsaddle-warp, jsaddle-webkit2gtk - , mtl + ({ mkDerivation, base, ghcjs-dom, jsaddle, jsaddle-warp + , jsaddle-webkit2gtk, mtl }: mkDerivation { pname = "ghcjs-dom-hello"; - version = "5.0.0.0"; - sha256 = "0v6xdbax9p6q1r5rmrkamnzfhscv9x2bv33jw9848glsxj966ppa"; + version = "6.0.0.0"; + sha256 = "16f69w53a3vcfnb805nyn257465gvyv2981gsggvpkzvyqklsp74"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base ghcjs-dom mtl ]; + libraryHaskellDepends = [ + base ghcjs-dom jsaddle jsaddle-warp mtl + ]; executableHaskellDepends = [ base ghcjs-dom jsaddle-warp jsaddle-webkit2gtk mtl ]; @@ -74440,29 +74771,6 @@ self: { }) {inherit (pkgs.gst_all_1) gst-plugins-base;}; "gi-gtk" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk - , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject - , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-gtk"; - version = "3.0.14"; - sha256 = "0q5yf54idrrkgcc6mx53cvlc8qd7c6hgv491g60vc8i3559nfx20"; - setupHaskellDepends = [ base Cabal haskell-gi ]; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Gtk bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; - - "gi-gtk_3_0_15" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-pango, gtk3, haskell-gi, haskell-gi-base, text, transformers @@ -74492,8 +74800,8 @@ self: { }: mkDerivation { pname = "gi-gtk-hs"; - version = "0.3.4.2"; - sha256 = "13p8sda776v5svsz0kilidb3j2284jwf8a4n6dd79jjh84fn90s3"; + version = "0.3.4.3"; + sha256 = "0ypvb5iklmw7k7j1jzd62arbn875hwyg0lcx1z24csyin6gl7zda"; libraryHaskellDepends = [ base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers @@ -75117,8 +75425,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20170519"; - sha256 = "0avp6f07nsy7hb0334b33dng7hh20qqvaxbrzqyzsbcc9crnlq18"; + version = "6.20170520"; + sha256 = "05r701gd7jqjcxcvm8l11fb04z8rqjalf4z8id693q9c2x29pkzq"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -75315,8 +75623,8 @@ self: { }: mkDerivation { pname = "git-mediate"; - version = "1.0.2"; - sha256 = "0v1h53fyblq3br3jaga3ajaiywa0qhgysvqknrjga4basaqi220v"; + version = "1.0.3"; + sha256 = "01lvw1lb2xfp9yyvj1053cczi1jfzvcxn5q5ls3jzc4g979grw18"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -84495,8 +84803,8 @@ self: { }: mkDerivation { pname = "hail"; - version = "0.1.0.2"; - sha256 = "0n1h1wf8vxkyqfa8sw9gh30zmj6akl9ycphy7x5ssrzymj8zkvj3"; + version = "0.1.0.3"; + sha256 = "1nh76kk3bfnx802kc6afj6iw1xkj5s4sz07zwmhq32fvqbkmw889"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -84709,6 +85017,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hakka" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "hakka"; + version = "0.2.0"; + sha256 = "02rd2sw4a6ayr4kqqvkr14gxbpd3y9m92m9kvkk5m5701l1nz0xq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base transformers ]; + executableHaskellDepends = [ base ]; + description = "Minimal akka-inspired actor library"; + license = stdenv.lib.licenses.mit; + }) {}; + "hako" = callPackage ({ mkDerivation, base, haskell-src-meta, parsec, QuickCheck , template-haskell, text, transformers @@ -84739,8 +85061,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.5.1"; - sha256 = "1rngwb75sm8z0mhfms8rkgs2mc505bldynbm4b574wvi74ws7v4d"; + version = "4.9.7.0"; + sha256 = "1zy2328lj7k6j0h7nrcd998sk1hbcl67yzaiysaxyif5c60l05ab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84769,50 +85091,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; - "hakyll_4_9_6_0" = callPackage - ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring - , containers, cryptohash, data-default, deepseq, directory - , filepath, fsnotify, http-conduit, http-types, lrucache, mtl - , network, network-uri, optparse-applicative, pandoc - , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base - , regex-tdfa, resourcet, scientific, system-filepath, tagsoup - , tasty, tasty-hunit, tasty-quickcheck, text, time - , time-locale-compat, unordered-containers, utillinux, vector, wai - , wai-app-static, warp, yaml - }: - mkDerivation { - pname = "hakyll"; - version = "4.9.6.0"; - sha256 = "0qkwa8fs5wpqg4gvk19cg5jsjhwyirvwbah1hk7a5b8yfrbsm08c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory filepath fsnotify - http-conduit http-types lrucache mtl network network-uri - optparse-applicative pandoc pandoc-citeproc parsec process random - regex-base regex-tdfa resourcet scientific system-filepath tagsoup - text time time-locale-compat unordered-containers vector wai - wai-app-static warp yaml - ]; - executableHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ - base binary blaze-html blaze-markup bytestring containers - cryptohash data-default deepseq directory filepath fsnotify - http-conduit http-types lrucache mtl network network-uri - optparse-applicative pandoc pandoc-citeproc parsec process - QuickCheck random regex-base regex-tdfa resourcet scientific - system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text - time time-locale-compat unordered-containers vector wai - wai-app-static warp yaml - ]; - testToolDepends = [ utillinux ]; - homepage = "http://jaspervdj.be/hakyll"; - description = "A static website compiler library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) utillinux;}; - "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -85701,15 +85979,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hapistrano_0_3_2_1" = callPackage + "hapistrano_0_3_2_2" = callPackage ({ mkDerivation, aeson, async, base, directory, filepath, hspec , mtl, optparse-applicative, path, path-io, process, stm, temporary , time, transformers, yaml }: mkDerivation { pname = "hapistrano"; - version = "0.3.2.1"; - sha256 = "0iafa8ina7c78dqhyql8k625s9ibjb15mpw7yizl7mg2rxj2ksb4"; + version = "0.3.2.2"; + sha256 = "0yb0www1nab0nybg0nxs64cni9j2n8sw1l5c8byfnivagqz428w7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86758,6 +87036,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hasbolt_0_1_1_3" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , data-binary-ieee754, data-default, hex, hspec, network + , network-simple, QuickCheck, text, transformers + }: + mkDerivation { + pname = "hasbolt"; + version = "0.1.1.3"; + sha256 = "1ba85bq8p6cjrxajinb3ykqyffq0h2xcsq80q26y9iy18ys7mcbr"; + libraryHaskellDepends = [ + base binary bytestring containers data-binary-ieee754 data-default + hex network network-simple text transformers + ]; + testHaskellDepends = [ + base bytestring containers hex hspec QuickCheck text + ]; + homepage = "https://github.com/zmactep/hasbolt#readme"; + description = "Haskell driver for Neo4j 3+ (BOLT protocol)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hascal" = callPackage ({ mkDerivation, base, data-default, split }: mkDerivation { @@ -87378,8 +87678,8 @@ self: { }: mkDerivation { pname = "haskdogs"; - version = "0.4.5"; - sha256 = "1k1ihdyj6xm2956xw5fjjrjcf4rb908g2q6hk5fr74yhi72l604i"; + version = "0.5.0"; + sha256 = "16ba13qihpxfvb65szzs5ajhk854c0yii939xavwq76dk0cr01w3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -90108,6 +90408,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskus-system-build" = callPackage + ({ mkDerivation, base, directory, filepath, hashable, haskus-utils + , optparse-applicative, optparse-simple, process, simple-download + , temporary, text, yaml + }: + mkDerivation { + pname = "haskus-system-build"; + version = "0.7.0.0"; + sha256 = "1wfl4n7manfwgwjccvrsfwjb3la7sjg1zpzgj8v6r5sv2zdyl86g"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath hashable haskus-utils optparse-applicative + optparse-simple process simple-download temporary text yaml + ]; + homepage = "http://www.haskus.org/system"; + description = "Haskus system build tool"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskus-utils" = callPackage ({ mkDerivation, base, containers, extra, file-embed, list-t, mtl , stm, stm-containers, tasty, tasty-quickcheck, template-haskell @@ -90115,8 +90435,8 @@ self: { }: mkDerivation { pname = "haskus-utils"; - version = "0.6.0.0"; - sha256 = "0hph5305ykz9qbc0dbm043q6m4x9bxzgwdnjqby7f6rir6ks995w"; + version = "0.7.0.0"; + sha256 = "0s28m6bhc5a1q3z7r1pd9f1l0nhsk5lnsi8y9zqadyg8j4jcv9kx"; libraryHaskellDepends = [ base containers extra file-embed list-t mtl stm stm-containers template-haskell transformers vector @@ -90162,14 +90482,15 @@ self: { }) {}; "hasmin" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers, doctest - , doctest-discover, gitrev, hopfli, hspec, hspec-attoparsec, matrix - , mtl, numbers, optparse-applicative, parsers, QuickCheck, text + ({ mkDerivation, attoparsec, base, bytestring, containers + , criterion, directory, doctest, doctest-discover, gitrev, hopfli + , hspec, hspec-attoparsec, matrix, mtl, numbers + , optparse-applicative, parsers, QuickCheck, text }: mkDerivation { pname = "hasmin"; - version = "0.3.2"; - sha256 = "16w52fsiw5ahrlyna9q9bs4f7wkkb15ksigshnjsbdbh32qp751f"; + version = "0.3.2.2"; + sha256 = "0522rp8cicvizvr183vfr07a5c8a98hz7g6m6pjjk1vzf95b7w20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -90184,6 +90505,7 @@ self: { attoparsec base doctest doctest-discover hspec hspec-attoparsec mtl QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion directory text ]; homepage = "https://github.com/contivero/hasmin#readme"; description = "\"A CSS Minifier\""; license = stdenv.lib.licenses.bsd3; @@ -91134,6 +91456,8 @@ self: { pname = "hbayes"; version = "0.5.2"; sha256 = "1x8nwh3ba9qvrbcxd2fdb3lv9b94w6lkvdg4vrqm7vbns9yyk162"; + revision = "2"; + editedCabalFile = "19nclaq6y157gn8k4sl79rm30ws5gcykiq4zjmcnm7d5c1rm4dhn"; libraryHaskellDepends = [ array base binary boxes containers directory filepath gamma HUnit mtl mwc-random parsec pretty QuickCheck random split statistics @@ -92115,8 +92439,8 @@ self: { }: mkDerivation { pname = "hedgehog"; - version = "0.2.2"; - sha256 = "1lnqqjfvqajkav42pcw6dd9cirg6fz900wv6pr2zwq1al21hw32s"; + version = "0.3"; + sha256 = "0navcrq51wy7040a8vh9izzln61qpk06z4r4g33j7v6qk2hflwb7"; libraryHaskellDepends = [ ansi-terminal async base bytestring concurrent-output containers directory exceptions mmorph mtl pretty-show primitive random @@ -93083,24 +93407,6 @@ self: { }) {}; "heterocephalus" = callPackage - ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist - , doctest, Glob, parsec, shakespeare, template-haskell, text - }: - mkDerivation { - pname = "heterocephalus"; - version = "1.0.4.0"; - sha256 = "0alqdw8d41v9ih3crf4lxhz4h9wqy27yv2r31kqpadasy4q8h82a"; - libraryHaskellDepends = [ - base blaze-html blaze-markup containers dlist parsec shakespeare - template-haskell text - ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/arowM/heterocephalus#readme"; - description = "A type-safe template engine for working with popular front end development tools"; - license = stdenv.lib.licenses.mit; - }) {}; - - "heterocephalus_1_0_5_0" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text , transformers @@ -93117,7 +93423,6 @@ self: { homepage = "https://github.com/arowM/heterocephalus#readme"; description = "A type-safe template engine for working with popular front end development tools"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heterolist" = callPackage @@ -93853,8 +94158,8 @@ self: { }: mkDerivation { pname = "hgis"; - version = "0.1.3.4"; - sha256 = "07p2n9nyzispgbdlra5fvr87iglsny9rhch4mkcw95qr74qcw87m"; + version = "0.1.3.5"; + sha256 = "1vmx21s0q9w21118m60hzrfk1p704m7675k7idrqlwd4da54ib7c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94449,8 +94754,8 @@ self: { }: mkDerivation { pname = "hills"; - version = "0.1.2.4"; - sha256 = "0hsnal3agzy4d5y52yyaxscyw3zp7w754glxksz6kzn6n2djg1nq"; + version = "0.1.2.5"; + sha256 = "02zmjc056phi8xcdx8i86xms5204q1zkcg9c5dbd8phm11a5n3iz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -94740,6 +95045,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hint_0_7_0" = callPackage + ({ mkDerivation, base, directory, exceptions, extensible-exceptions + , filepath, ghc, ghc-paths, HUnit, mtl, random, unix + }: + mkDerivation { + pname = "hint"; + version = "0.7.0"; + sha256 = "0mc17qdq0wb57zgh755viwcnby2jkmyv9r7fvq5jwsxx91c776i9"; + libraryHaskellDepends = [ + base directory exceptions filepath ghc ghc-paths mtl random unix + ]; + testHaskellDepends = [ + base directory exceptions extensible-exceptions filepath HUnit + ]; + homepage = "https://github.com/mvdan/hint"; + description = "Runtime Haskell interpreter (GHC API wrapper)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hint-server" = callPackage ({ mkDerivation, base, eprocess, exceptions, hint, monad-loops, mtl }: @@ -95847,7 +96172,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_2_0_8" = callPackage + "hlint_2_0_9" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, directory, extra, filepath, haskell-src-exts , hscolour, process, refact, text, transformers, uniplate @@ -95855,8 +96180,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.0.8"; - sha256 = "1zdwlyj913cwdi0gfv5wmbqbgsxjg4ypggmkmlzj006sj7qpbn2z"; + version = "2.0.9"; + sha256 = "1bd5nizx1dbzhrfcr9mgpjvg4b6f6z73jvslkbialp7g9pkr6a95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96540,13 +96865,15 @@ self: { , attoparsec-iso8601, base, bytestring, conduit , conduit-combinators, conduit-extra, containers, criterion , deepseq, directory, hspec, hspec-attoparsec, hspec-core - , hspec-expectations, ip, optparse-applicative, permute, random - , resourcet, text, time, unordered-containers, word8, yaml + , hspec-expectations, ip, lifted-base, monad-control, monad-loops + , mtl, optparse-applicative, permute, random, resourcet, text, time + , transformers-base, unix, unordered-containers, word8, yaml + , zeromq4-conduit, zeromq4-haskell }: mkDerivation { pname = "hnormalise"; - version = "0.3.3.0"; - sha256 = "1rrriy9i6bfh1l6q9iwsc9zfcaif3d3f1vmkzm353gprf7vg8fnk"; + version = "0.4.1.0"; + sha256 = "0mmkd0nidkffp80nn8yn9i1x7cqsi8qs2qyfgp36sjay58y92744"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96556,7 +96883,9 @@ self: { executableHaskellDepends = [ aeson aeson-pretty attoparsec attoparsec-iso8601 base bytestring conduit conduit-combinators conduit-extra containers directory ip - optparse-applicative resourcet text time word8 yaml + lifted-base monad-control monad-loops mtl optparse-applicative + resourcet text time transformers-base unix word8 yaml + zeromq4-conduit zeromq4-haskell ]; testHaskellDepends = [ aeson attoparsec attoparsec-iso8601 base conduit-extra hspec @@ -98092,7 +98421,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hpack" = callPackage + "hpack_0_17_1" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , containers, deepseq, directory, filepath, Glob, hspec , interpolate, mockery, QuickCheck, temporary, text @@ -98120,6 +98449,37 @@ self: { homepage = "https://github.com/sol/hpack#readme"; description = "An alternative format for Haskell packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "hpack" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring + , containers, deepseq, directory, filepath, Glob, hspec + , interpolate, mockery, QuickCheck, temporary, text + , unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.18.0"; + sha256 = "1z738mw0kzic4wx5dpihh1c1gimpjkl14wl6w2nmmdfx2bdjm5rv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base-compat bytestring containers deepseq directory + filepath Glob text unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base base-compat bytestring containers deepseq directory + filepath Glob text unordered-containers yaml + ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring containers deepseq + directory filepath Glob hspec interpolate mockery QuickCheck + temporary text unordered-containers yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; }) {}; "hpack-convert" = callPackage @@ -101276,6 +101636,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_4_4" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.4.4"; + sha256 = "08fg8w38xbhidw3pfn13ag3mnpp3rb1lzp7xpq47cncwv92k46mh"; + libraryHaskellDepends = [ + base call-stack hspec-core hspec-discover hspec-expectations HUnit + QuickCheck transformers + ]; + testHaskellDepends = [ + base call-stack directory hspec-core hspec-discover + hspec-expectations hspec-meta HUnit QuickCheck stringbuilder + transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -101348,6 +101732,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_4_4" = callPackage + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, hspec-meta + , HUnit, process, QuickCheck, quickcheck-io, random, setenv + , silently, temporary, tf-random, time, transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.4.4"; + sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0"; + libraryHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv tf-random time transformers + ]; + testHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations hspec-meta HUnit process QuickCheck + quickcheck-io random setenv silently temporary tf-random time + transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { @@ -101364,6 +101775,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_4_4" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta }: + mkDerivation { + pname = "hspec-discover"; + version = "2.4.4"; + sha256 = "0isx9nc59nw8pkh4r6ynd55dghqnzgrzn9pvrq6ail1y5z3knhkn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ base directory filepath hspec-meta ]; + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { @@ -103465,8 +103893,8 @@ self: { }: mkDerivation { pname = "http-conduit-browser"; - version = "2.0.0.0"; - sha256 = "1swgsb14mwsfrwhw2ggydi2wm24hrqlisslh5q46qll7rl2gx19q"; + version = "2.0.0.1"; + sha256 = "0h8kqjpw859q8kafplbxz5hn7zva71ym25z7vf5vz0pwiw2587wv"; libraryHaskellDepends = [ base bytestring conduit containers cookie data-default exceptions http-client http-conduit http-types lifted-base monad-control @@ -106199,20 +106627,21 @@ self: { }) {}; "hyperloglog" = callPackage - ({ mkDerivation, approximate, base, binary, bits, bytes, cereal - , cereal-vector, comonad, deepseq, directory, distributive, doctest - , filepath, generic-deriving, hashable, hashable-extras, lens + ({ mkDerivation, approximate, base, binary, bits, bytes, Cabal + , cabal-doctest, cereal, cereal-vector, comonad, deepseq, directory + , distributive, doctest, filepath, generic-deriving, hashable, lens , reflection, safecopy, semigroupoids, semigroups, simple-reflect , siphash, tagged, vector }: mkDerivation { pname = "hyperloglog"; - version = "0.4.0.4"; - sha256 = "0iwqkgrvk7p9qmfbfld7cpparbc2j674i8vzmcwbr06n63ds5mrl"; + version = "0.4.1"; + sha256 = "08r0yrnfjcfv0p14p69dqjrsmff4alx5yykkq06mig0wycl4v4q0"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ approximate base binary bits bytes cereal cereal-vector comonad - deepseq distributive hashable hashable-extras lens reflection - safecopy semigroupoids semigroups siphash tagged vector + deepseq distributive hashable lens reflection safecopy + semigroupoids semigroups siphash tagged vector ]; testHaskellDepends = [ base directory doctest filepath generic-deriving semigroups @@ -112282,16 +112711,17 @@ self: { ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, containers, deepseq, filepath, ghc-prim, http-types , lens, primitive, process, ref-tf, scientific, stm, text, time - , transformers, unordered-containers, vector + , transformers, unordered-containers, uuid, uuid-types, vector }: mkDerivation { pname = "jsaddle"; - version = "0.9.0.0"; - sha256 = "1g61chx063m8n3yvs4z6awmdksvkr0yp5vwd4ffkhl94yczqh0q8"; + version = "0.9.2.0"; + sha256 = "0ymq70kwwi60f1rgjnjz914xv465zrnbbw5z351439qg572f8mvg"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring containers deepseq filepath ghc-prim http-types lens primitive process ref-tf - scientific stm text time transformers unordered-containers vector + scientific stm text time transformers unordered-containers uuid + uuid-types vector ]; description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; @@ -112346,18 +112776,19 @@ self: { "jsaddle-warp" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , doctest, filepath, ghc-prim, http-types, jsaddle, lens, network - , primitive, process, QuickCheck, ref-tf, stm, text, time - , transformers, uuid, uuid-types, wai, wai-websockets, warp + , doctest, filepath, foreign-store, ghc-prim, http-types, jsaddle + , lens, network, primitive, process, QuickCheck, ref-tf, stm, text + , time, transformers, uuid, uuid-types, wai, wai-websockets, warp , webdriver, websockets }: mkDerivation { pname = "jsaddle-warp"; - version = "0.9.1.0"; - sha256 = "0d7q3dr05j81zx13qvl0kxhdmkk9bpka4cc2db8ck4wfnv7nj3yq"; + version = "0.9.2.0"; + sha256 = "08r9nzx8yvdw7klv7n19znqfp5r5585fvhz9jsk5mcinpkc7yvyv"; libraryHaskellDepends = [ - aeson base bytestring containers http-types jsaddle stm text time - transformers uuid uuid-types wai wai-websockets warp websockets + aeson base bytestring containers foreign-store http-types jsaddle + stm text time transformers uuid uuid-types wai wai-websockets warp + websockets ]; testHaskellDepends = [ aeson base bytestring containers deepseq doctest filepath ghc-prim @@ -113983,42 +114414,6 @@ self: { }) {}; "katip" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , exceptions, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , semigroups, string-conv, tasty, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.3.1.4"; - sha256 = "14w43fcfqpsammhq8hb7yh9jychrglfcqjkg43aalsj4p53q8xq4"; - libraryHaskellDepends = [ - aeson auto-update base bytestring containers either exceptions - hostname microlens microlens-th monad-control mtl old-locale - resourcet semigroups string-conv template-haskell text time - transformers transformers-base transformers-compat unix - unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring directory microlens quickcheck-instances - regex-tdfa tasty tasty-golden tasty-hunit tasty-quickcheck - template-haskell text time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq text time - transformers unix - ]; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "katip_0_3_1_5" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , bytestring, containers, criterion, deepseq, directory, either , exceptions, hostname, microlens, microlens-th, monad-control, mtl @@ -114616,12 +115011,12 @@ self: { , keera-hails-mvc-solutions-config, keera-hails-mvc-solutions-gtk , keera-hails-mvc-view-gtk, keera-hails-reactive-gtk , keera-hails-reactivevalues, MissingK, mtl, network, process, SDL - , SDL-mixer, setlocale, time, utf8-string + , SDL-mixer, SDL_mixer, setlocale, time, utf8-string }: mkDerivation { pname = "keera-posture"; - version = "0.2.4.1"; - sha256 = "1gcc4hxcvhaaqgz0q5l1mr7938m1wwl7sky8x1qcg82q8mdvl8vx"; + version = "0.2.4.3"; + sha256 = "0kaka302qgax29583kvzhyl6fffzmywh3fk398xhzvixmza9k7sl"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114635,11 +115030,12 @@ self: { keera-hails-reactivevalues MissingK mtl network process SDL SDL-mixer setlocale time utf8-string ]; + executableSystemDepends = [ SDL_mixer ]; homepage = "http://keera.co.uk/projects/keera-posture"; description = "Get notifications when your sitting posture is inappropriate"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs) SDL_mixer;}; "keiretsu" = callPackage ({ mkDerivation, aeson, ansi-terminal, async, base, bytestring @@ -116867,28 +117263,6 @@ self: { }) {}; "language-javascript" = callPackage - ({ mkDerivation, alex, array, base, blaze-builder, bytestring - , Cabal, containers, happy, hspec, mtl, QuickCheck, text - , utf8-light, utf8-string - }: - mkDerivation { - pname = "language-javascript"; - version = "0.6.0.9"; - sha256 = "1k1ji4iia6wpzls5999hirypxsng5bgfrvbv9zjvn9wczga9hsx8"; - libraryHaskellDepends = [ - array base blaze-builder bytestring containers mtl text utf8-string - ]; - libraryToolDepends = [ alex happy ]; - testHaskellDepends = [ - array base blaze-builder bytestring Cabal containers hspec mtl - QuickCheck utf8-light utf8-string - ]; - homepage = "https://github.com/erikd/language-javascript"; - description = "Parser for JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-javascript_0_6_0_10" = callPackage ({ mkDerivation, alex, array, base, blaze-builder, bytestring , Cabal, containers, happy, hspec, mtl, QuickCheck, text , utf8-light, utf8-string @@ -116908,7 +117282,6 @@ self: { homepage = "https://github.com/erikd/language-javascript"; description = "Parser for JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-kort" = callPackage @@ -120189,18 +120562,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "linear-accelerate_0_3" = callPackage - ({ mkDerivation, accelerate, base, Cabal, distributive, filepath - , lens, linear + "linear-accelerate_0_4" = callPackage + ({ mkDerivation, accelerate, base, Cabal, cabal-doctest + , distributive, doctest, lens, linear }: mkDerivation { pname = "linear-accelerate"; - version = "0.3"; - sha256 = "1aa2vfdhfdvyxnis4xkdjar15ircg2zsp6ljfc2nafwy0l20rvrs"; - setupHaskellDepends = [ base Cabal filepath ]; + version = "0.4"; + sha256 = "03pma42zkk6cfisyfsjmb8496jkfqiab3my4wdahk8z9shmqa3rg"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear ]; + testHaskellDepends = [ base doctest ]; homepage = "http://github.com/ekmett/linear-accelerate/"; description = "Lifting linear vector spaces into Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -122220,6 +122594,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "log-domain_0_11_1" = callPackage + ({ mkDerivation, base, binary, bytes, Cabal, cabal-doctest, cereal + , comonad, deepseq, distributive, doctest, generic-deriving + , hashable, safecopy, semigroupoids, semigroups, simple-reflect + , vector + }: + mkDerivation { + pname = "log-domain"; + version = "0.11.1"; + sha256 = "0zbwnx6bs417g67m0hr9n4lk9iwpcm0ivmfhjgaz98hryxx3s8wc"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base binary bytes cereal comonad deepseq distributive hashable + safecopy semigroupoids semigroups vector + ]; + testHaskellDepends = [ + base doctest generic-deriving semigroups simple-reflect + ]; + homepage = "http://github.com/ekmett/log-domain/"; + description = "Log-domain arithmetic"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "log-effect" = callPackage ({ mkDerivation, base, bytestring, extensible-effects, fast-logger , time @@ -123153,18 +123551,20 @@ self: { "loup" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-swf, base, bytestring - , conduit, lifted-async, monad-control, optparse-generic, preamble - , shakers, time, turtle, uuid, yaml + , conduit, lifted-async, lifted-base, monad-control + , optparse-generic, preamble, shakers, time, turtle + , unordered-containers, uuid, yaml }: mkDerivation { pname = "loup"; - version = "0.0.2"; - sha256 = "1lfa20m67zncn9dpbbrdjq3qbv6qn2h1qb1iy0b5npan9sd85r5z"; + version = "0.0.5"; + sha256 = "1c42rp22r37l0fbmd5i463f9pfv7nqchi1rcchv7mcc3wwzyzymq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson amazonka amazonka-swf base bytestring conduit lifted-async - monad-control preamble time turtle uuid yaml + lifted-base monad-control preamble time turtle unordered-containers + uuid yaml ]; executableHaskellDepends = [ base optparse-generic shakers ]; homepage = "https://github.com/swift-nav/loup"; @@ -123256,6 +123656,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lrucaching_0_3_2" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , hspec, psqueues, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "lrucaching"; + version = "0.3.2"; + sha256 = "1vg6ip77vlqixj2ghvwm036yb4qhkif175k8gfd27nmr4w5rv2ns"; + libraryHaskellDepends = [ + base base-compat deepseq hashable psqueues vector + ]; + testHaskellDepends = [ + base containers deepseq hashable hspec QuickCheck transformers + ]; + homepage = "https://github.com/cocreature/lrucaching#readme"; + description = "LRU cache"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ls-usb" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols , cmdtheline, text, usb, usb-id-database, vector @@ -124645,13 +125065,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "makefile_1_0_0_3" = callPackage + "makefile_1_0_0_4" = callPackage ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, text }: mkDerivation { pname = "makefile"; - version = "1.0.0.3"; - sha256 = "0w36rxzx4ryhrmjayqm9fad2zpkxnq4dmpxshd8q2x8wa3wp8j5p"; + version = "1.0.0.4"; + sha256 = "17g8syj2l2fr2f22flcngxsnpprl4hbfqpanql1k55a0z19sjr5k"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base doctest Glob QuickCheck text @@ -127188,25 +127608,6 @@ self: { }) {}; "memory" = callPackage - ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim - , tasty, tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "memory"; - version = "0.14.5"; - sha256 = "01d1bg8pkhw9mpyd7nm5zzpqv9kh9cj2fkd2ywvkay7np2r14820"; - revision = "1"; - editedCabalFile = "01g68h3r1h15rrbfsbbk0195fyn93x256j8xwzlb11074sdwr0gy"; - libraryHaskellDepends = [ - base bytestring deepseq foundation ghc-prim - ]; - testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/vincenthz/hs-memory"; - description = "memory and related abstraction stuff"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "memory_0_14_6" = callPackage ({ mkDerivation, base, bytestring, deepseq, foundation, ghc-prim , tasty, tasty-hunit, tasty-quickcheck }: @@ -127223,7 +127624,6 @@ self: { homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memorypool" = callPackage @@ -127260,8 +127660,8 @@ self: { }: mkDerivation { pname = "mercury-api"; - version = "0.1.0.0"; - sha256 = "0pyrfwl0jzm8v25aviqflfw4q95hlkq9n6ps44shzb9l0bm5zls1"; + version = "0.1.0.1"; + sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -127967,6 +128367,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "midi-music-box_0_0_0_4" = callPackage + ({ mkDerivation, base, containers, diagrams-lib + , diagrams-postscript, event-list, midi, non-empty + , optparse-applicative, utility-ht + }: + mkDerivation { + pname = "midi-music-box"; + version = "0.0.0.4"; + sha256 = "0l8nv3bfbncjbh80dav7qps5aqd20g88sx00xhqr6j9m66znfg1p"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers diagrams-lib diagrams-postscript event-list midi + non-empty optparse-applicative utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/midi-music-box"; + description = "Convert MIDI file to music box punch tape"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "midi-simple" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion , generic-random, hspec, hspec-attoparsec, QuickCheck, tasty @@ -128185,17 +128606,18 @@ self: { "milena" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, digest, lens - , lifted-base, mtl, murmur-hash, network, QuickCheck, random - , resource-pool, semigroups, tasty, tasty-hspec, tasty-quickcheck - , transformers + , lifted-base, monad-control, mtl, murmur-hash, network, QuickCheck + , random, resource-pool, semigroups, tasty, tasty-hspec + , tasty-quickcheck, transformers, zlib }: mkDerivation { pname = "milena"; - version = "0.5.0.2"; - sha256 = "0jsw9zvilyk8c49g927wi535bx573hcnzf8nzgaxvjmhj6x0wxwf"; + version = "0.5.1.0"; + sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly"; libraryHaskellDepends = [ - base bytestring cereal containers digest lens lifted-base mtl - murmur-hash network random resource-pool semigroups transformers + base bytestring cereal containers digest lens lifted-base + monad-control mtl murmur-hash network random resource-pool + semigroups transformers zlib ]; testHaskellDepends = [ base bytestring lens mtl network QuickCheck semigroups tasty @@ -128993,6 +129415,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mockery_0_3_5" = callPackage + ({ mkDerivation, base, base-compat, bytestring, directory, filepath + , hspec, logging-facade, temporary + }: + mkDerivation { + pname = "mockery"; + version = "0.3.5"; + sha256 = "09ypgm3z69gq8mj6y66ss58kbjnk15r8frwcwbqcfbfksfnfv8dp"; + libraryHaskellDepends = [ + base base-compat bytestring directory filepath logging-facade + temporary + ]; + testHaskellDepends = [ + base base-compat bytestring directory filepath hspec logging-facade + temporary + ]; + description = "Support functions for automated testing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modbus-tcp" = callPackage ({ mkDerivation, base, bytestring, cereal, mtl, transformers }: mkDerivation { @@ -129470,6 +129913,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-control_1_0_2_0" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control"; + version = "1.0.2.0"; + sha256 = "1k5lgwdnbqmzzc7y29pfq7a35g428qivsp5cafdv0mbn5kc59aq5"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/basvandijk/monad-control"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -131227,6 +131687,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "morte_1_6_9" = callPackage + ({ mkDerivation, alex, array, base, binary, code-page, containers + , criterion, deepseq, Earley, http-client, http-client-tls + , microlens, microlens-mtl, mtl, optparse-applicative, pipes + , QuickCheck, system-fileio, system-filepath, tasty, tasty-hunit + , tasty-quickcheck, text, text-format, transformers + }: + mkDerivation { + pname = "morte"; + version = "1.6.9"; + sha256 = "1a0s0hj09rhgixs09ay7fjk12d3wrlhm2w957md7pkan412vx200"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary containers deepseq Earley http-client + http-client-tls microlens microlens-mtl pipes system-fileio + system-filepath text text-format transformers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ + base code-page optparse-applicative text text-format + ]; + testHaskellDepends = [ + base mtl QuickCheck system-filepath tasty tasty-hunit + tasty-quickcheck text transformers + ]; + benchmarkHaskellDepends = [ base criterion system-filepath text ]; + description = "A bare-bones calculus of constructions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mosaico-lib" = callPackage ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels @@ -133052,8 +133544,8 @@ self: { }: mkDerivation { pname = "mvc"; - version = "1.1.3"; - sha256 = "0cxnjw5pzxdpg25jw28a6wgjk61znbg90z8nniwdfmskldas6fqf"; + version = "1.1.4"; + sha256 = "0nx66swbca3c481abzbpgxfhs93y6bsm897dbk56v0dfdqn0inw4"; libraryHaskellDepends = [ async base contravariant foldl managed mmorph pipes pipes-concurrency transformers @@ -134079,6 +134571,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; + revision = "1"; + editedCabalFile = "1scwm1gs07znkj4ahfyxpwrksj4rdl1pa81xflcqhkqfgcndvgl3"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -136322,6 +136816,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nix-derivation" = callPackage + ({ mkDerivation, attoparsec, base, containers, criterion, deepseq + , QuickCheck, system-filepath, text, vector + }: + mkDerivation { + pname = "nix-derivation"; + version = "1.0.0"; + sha256 = "1qx37nk5fg7kqvy9pfvf1jhn9cyr8rkfgz4hm3xy8m92l0rprfw4"; + libraryHaskellDepends = [ + attoparsec base containers deepseq system-filepath text vector + ]; + testHaskellDepends = [ + attoparsec base QuickCheck system-filepath text vector + ]; + benchmarkHaskellDepends = [ attoparsec base criterion text ]; + description = "Parse and render *.drv files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nix-eval" = callPackage ({ mkDerivation, base, hindent, process, QuickCheck, strict, tasty , tasty-quickcheck @@ -137780,6 +138293,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "oanda-rest-api_0_4_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens + , old-locale, resourcet, scientific, text, thyme, transformers + , vector + }: + mkDerivation { + pname = "oanda-rest-api"; + version = "0.4.1"; + sha256 = "1r20vn0hbx1xca5jaq9djfhgrxgdyhj1m4i9708wd972h2h7q2vr"; + libraryHaskellDepends = [ + aeson base bytestring conduit containers Decimal http-client + http-conduit lens old-locale resourcet scientific text thyme + transformers vector + ]; + testHaskellDepends = [ + aeson base bytestring conduit containers Decimal hlint hspec + http-client http-conduit HUnit lens old-locale resourcet scientific + text thyme transformers vector + ]; + homepage = "https://github.com/jdreaver/oanda-rest-api#readme"; + description = "Client to the OANDA REST API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "oauth10a" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash, entropy, http-types, time, transformers @@ -138825,6 +139364,63 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {atomspace-cwrapper = null;}; + "opencv" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bindings-DSL + , bytestring, Cabal, containers, criterion, data-default, deepseq + , directory, Glob, haskell-src-exts, inline-c, inline-c-cpp + , JuicyPixels, lens, linear, opencv, primitive, QuickCheck, repa + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , transformers, vector + }: + mkDerivation { + pname = "opencv"; + version = "0.0.0.0"; + sha256 = "1y2mjb6a6iym6h6m7c214lwrmcjhm9snsqgf1jrbq27fr346mrkb"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base base64-bytestring bindings-DSL bytestring containers + data-default deepseq inline-c inline-c-cpp JuicyPixels linear + primitive repa template-haskell text transformers vector + ]; + libraryPkgconfigDepends = [ opencv ]; + testHaskellDepends = [ + base bytestring containers data-default directory Glob + haskell-src-exts JuicyPixels lens linear primitive QuickCheck repa + tasty tasty-hunit tasty-quickcheck template-haskell text + transformers vector + ]; + benchmarkHaskellDepends = [ base bytestring criterion repa ]; + hardeningDisable = [ "bindnow" ]; + homepage = "https://github.com/LumiGuide/haskell-opencv"; + description = "Haskell binding to OpenCV-3.x"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) opencv;}; + + "opencv-extra" = callPackage + ({ mkDerivation, base, bindings-DSL, bytestring, Cabal, containers + , data-default, directory, Glob, haskell-src-exts, inline-c + , inline-c-cpp, JuicyPixels, linear, opencv, primitive + , template-haskell, text, transformers, vector + }: + mkDerivation { + pname = "opencv-extra"; + version = "0.0.0.0"; + sha256 = "18r1y9ppw5i324fyfcbc3wm40gg16816javaxmsny5jc0vbl56gq"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + base bindings-DSL bytestring containers inline-c inline-c-cpp + linear opencv primitive template-haskell transformers vector + ]; + testHaskellDepends = [ + base bytestring containers data-default directory Glob + haskell-src-exts JuicyPixels linear opencv primitive + template-haskell text transformers vector + ]; + homepage = "https://github.com/LumiGuide/haskell-opencv"; + description = "Haskell binding to OpenCV-3.x extra modules"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "opencv-raw" = callPackage ({ mkDerivation, base, bindings-DSL, Cabal, opencv, vector }: mkDerivation { @@ -138948,17 +139544,18 @@ self: { }) {EGL = null; GLESv2 = null;}; "openid" = callPackage - ({ mkDerivation, base, bytestring, containers, HsOpenSSL, HTTP - , monadLib, network, time, xml + ({ mkDerivation, base, base-compat, bytestring, containers + , HsOpenSSL, HTTP, monadLib, network, network-uri, time, xml }: mkDerivation { pname = "openid"; - version = "0.2.0.2"; - sha256 = "0rhd2hz3ls9ifcrifxhd4qvd7axydnlk5gckxay55dp2lcfc4css"; + version = "0.2.1.0"; + sha256 = "1vwwwwcw03srgyr612gsnpv0gq8gvbykbwg6myrsn1k8c89f673d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring containers HsOpenSSL HTTP monadLib network time xml + base base-compat bytestring containers HsOpenSSL HTTP monadLib + network network-uri time xml ]; homepage = "http://github.com/elliottt/hsopenid"; description = "An implementation of the OpenID-2.0 spec."; @@ -139514,7 +140111,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "opml-conduit_0_6_0_2" = callPackage + "opml-conduit_0_6_0_3" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, hlint, lens-simple , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck @@ -139524,8 +140121,8 @@ self: { }: mkDerivation { pname = "opml-conduit"; - version = "0.6.0.2"; - sha256 = "09a19s0g2aimijrjlhs8hcwqcnna5nk7z3h5i5l47prgm45nrxmi"; + version = "0.6.0.3"; + sha256 = "1flzv6v1mds7w9v3ap3g7gfwlvq54z0j1w7g2b07d17x334lyhgb"; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers lens-simple mono-traversable monoid-subclasses safe-exceptions @@ -139774,14 +140371,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optparse-generic_1_2_0" = callPackage + "optparse-generic_1_2_1" = callPackage ({ mkDerivation, base, bytestring, optparse-applicative, semigroups , system-filepath, text, time, transformers, void }: mkDerivation { pname = "optparse-generic"; - version = "1.2.0"; - sha256 = "1zhvrwcrchnls5fhy4m0466hhz84whrc2xm7nxwk1xjnmaqrb4l7"; + version = "1.2.1"; + sha256 = "1dk945dp98mwk1v4y0cky3z0ngmd29nbg6fbaaxnigcrgpbvkjml"; libraryHaskellDepends = [ base bytestring optparse-applicative semigroups system-filepath text time transformers void @@ -142294,6 +142891,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "parser-combinators" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "parser-combinators"; + version = "0.1.0"; + sha256 = "18swiwkw5as3xqxqjw46rl07sgjsz5533ki9q3rngfciyzzdj1qv"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mrkkrp/parser-combinators"; + description = "Lightweight package providing commonly useful parser combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "parser-helper" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }: mkDerivation { @@ -142349,31 +142958,6 @@ self: { }) {}; "parsers" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , charset, containers, directory, doctest, filepath, parsec - , QuickCheck, quickcheck-instances, scientific, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "parsers"; - version = "0.12.4"; - sha256 = "07najh7f9y3ahh42z96sw4hnd0kc4x3wm0xlf739y0gh81ys5097"; - revision = "1"; - editedCabalFile = "1y63jydbb5jsxj66ac0wljk0dyg4prrn2ik1rm636v9g0s8lf2di"; - libraryHaskellDepends = [ - attoparsec base base-orphans charset containers parsec scientific - text transformers unordered-containers - ]; - testHaskellDepends = [ - attoparsec base bytestring containers directory doctest filepath - parsec QuickCheck quickcheck-instances - ]; - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing combinators"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "parsers_0_12_5" = callPackage ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal , cabal-doctest, charset, containers, directory, doctest, filepath , mtl, parsec, QuickCheck, quickcheck-instances, scientific, text @@ -142395,7 +142979,6 @@ self: { homepage = "http://github.com/ekmett/parsers/"; description = "Parsing combinators"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsestar" = callPackage @@ -142515,8 +143098,8 @@ self: { }: mkDerivation { pname = "partial-order"; - version = "0.1.2"; - sha256 = "1lgmrq2fl7jygy7lshzqpqza60xm5w2n4mdvl7cigmyx0rr3nd4s"; + version = "0.1.2.1"; + sha256 = "15y3593fl5gabcf0qzyfql30v80sninv1f79dz4v2ll89dzwfzg3"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HUnit test-framework test-framework-hunit @@ -142660,6 +143243,30 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "patat_0_5_2_2" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , bytestring, containers, directory, filepath, mtl, network + , network-uri, optparse-applicative, pandoc, skylighting + , terminal-size, text, time, unordered-containers, yaml + }: + mkDerivation { + pname = "patat"; + version = "0.5.2.2"; + sha256 = "01g74kw9qszz4781srqsjvf4vxf0rvb4q8yy5nbx3zyp4lwggv3j"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base bytestring containers + directory filepath mtl network network-uri optparse-applicative + pandoc skylighting terminal-size text time unordered-containers + yaml + ]; + homepage = "http://github.com/jaspervdj/patat"; + description = "Terminal-based presentations using Pandoc"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "patch-combinators" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -142736,6 +143343,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "path_0_6_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, deepseq, exceptions + , filepath, genvalidity, genvalidity-property, hashable, hspec, mtl + , QuickCheck, template-haskell, validity + }: + mkDerivation { + pname = "path"; + version = "0.6.0"; + sha256 = "107jkd0wz40njxbdmgvc51q6bjqz71wl0bi0sprjhvgm2bn64x2x"; + libraryHaskellDepends = [ + aeson base deepseq exceptions filepath hashable template-haskell + ]; + testHaskellDepends = [ + aeson base bytestring filepath genvalidity genvalidity-property + hspec mtl QuickCheck validity + ]; + description = "Support for well-typed paths"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "path-extra" = callPackage ({ mkDerivation, base, exceptions, path }: mkDerivation { @@ -142767,17 +143395,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_3_0" = callPackage - ({ mkDerivation, base, containers, directory, exceptions, filepath - , hspec, path, temporary, time, transformers, unix-compat + "path-io_1_3_1" = callPackage + ({ mkDerivation, base, containers, directory, dlist, exceptions + , filepath, hspec, path, temporary, time, transformers, unix-compat }: mkDerivation { pname = "path-io"; - version = "1.3.0"; - sha256 = "1s3rkhfqcrnb3yalwlzd6ldvqlvwgf0h8yzc85l5gld8mwjs2lif"; + version = "1.3.1"; + sha256 = "166wxidsfyyv609bjfrn204k7lia02hgb4kmmbfv716dplywsb0q"; libraryHaskellDepends = [ - base containers directory exceptions filepath path temporary time - transformers unix-compat + base containers directory dlist exceptions filepath path temporary + time transformers unix-compat ]; testHaskellDepends = [ base exceptions hspec path transformers unix-compat @@ -143785,8 +144413,8 @@ self: { }: mkDerivation { pname = "period"; - version = "0.1.0.5"; - sha256 = "1y6mijk8860nb0ln64iplnz4bjr4z3h3y25p8g7jdl092s7xwvmn"; + version = "0.1.0.6"; + sha256 = "0zk7ac5casyxgdx5895jap7sw0klys26b29kj4f4p1f75b1ga8lz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -144388,6 +145016,8 @@ self: { pname = "persistent-template"; version = "2.5.2"; sha256 = "04a0ifjidy7lv5ip0dipjgsvr3h9kkw37z03s5kaxyaqh405nsfy"; + revision = "1"; + editedCabalFile = "0jhcanaz680knzc45g594fa68ihh7mkkrhlyaxnj6rjwbrcwjp9x"; libraryHaskellDepends = [ aeson aeson-compat base bytestring containers ghc-prim http-api-data monad-control monad-logger path-pieces persistent @@ -144649,8 +145279,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.7"; - sha256 = "0wzy7g6xc8snkfciahahm3qnhg0k21y9535gd1bzz6zmpx113sg9"; + version = "10.8"; + sha256 = "127xgzx1j2d4flqykgb6vp57zjmyc6jkx8l2jak4df68wpcy1gwq"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -145300,28 +145930,6 @@ self: { }) {}; "pinch" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pinch"; - version = "0.3.1.0"; - sha256 = "1gw5bl9l7l6dj1bfnxgikhz8irxpdn4292wvdav4dgkgl90sm2vg"; - libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim hashable text - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck text - unordered-containers vector - ]; - homepage = "https://github.com/abhinav/pinch#readme"; - description = "An alternative implementation of Thrift for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pinch_0_3_2_0" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text , unordered-containers, vector @@ -145341,7 +145949,6 @@ self: { homepage = "https://github.com/abhinav/pinch#readme"; description = "An alternative implementation of Thrift for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinchot" = callPackage @@ -145565,6 +146172,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes-bytestring_2_1_5" = callPackage + ({ mkDerivation, base, bytestring, pipes, pipes-group, pipes-parse + , transformers + }: + mkDerivation { + pname = "pipes-bytestring"; + version = "2.1.5"; + sha256 = "10snjd1abl954gbcl2vxn5vsj830k4sb1jxs8z3h372has13ls9c"; + libraryHaskellDepends = [ + base bytestring pipes pipes-group pipes-parse transformers + ]; + description = "ByteString support for pipes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-bzip" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib , data-default, directory, hspec, MonadRandom, mtl, pipes @@ -146694,6 +147317,8 @@ self: { pname = "plan-b"; version = "0.2.1"; sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv"; + revision = "1"; + editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh"; libraryHaskellDepends = [ base exceptions path path-io transformers ]; @@ -147569,18 +148194,21 @@ self: { }) {}; "polynomial" = callPackage - ({ mkDerivation, base, deepseq, pretty, vector, vector-space - , vector-th-unbox + ({ mkDerivation, base, deepseq, HUnit, pretty, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , vector, vector-space, vector-th-unbox }: mkDerivation { pname = "polynomial"; - version = "0.7.2"; - sha256 = "1w1zpa2l7l7yzqdgr142mqhf73mq8kiz7h3ydpd84n4vawjzz7z1"; - revision = "1"; - editedCabalFile = "0davyhlqj2w92k0rnb0v6glkw0xrls90lry9i5lyrqzlypks5jws"; + version = "0.7.3"; + sha256 = "0wl9wdaqrs6hs83xi27m879j7i2q04v14jqkrwns2qy3f2yhq2rr"; libraryHaskellDepends = [ base deepseq pretty vector vector-space vector-th-unbox ]; + testHaskellDepends = [ + base HUnit QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 vector vector-space + ]; homepage = "https://github.com/mokus0/polynomial"; description = "Polynomials"; license = stdenv.lib.licenses.publicDomain; @@ -148400,6 +149028,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-named" = callPackage + ({ mkDerivation, base, bytestring, extra, generics-sop, hspec, mtl + , postgresql-libpq, postgresql-simple, utf8-string + }: + mkDerivation { + pname = "postgresql-named"; + version = "0.1.0"; + sha256 = "0b7a3i8mcp9xs2zga6qi1byy489cl33j3mcrkx3smrz926ahbz95"; + libraryHaskellDepends = [ + base bytestring extra generics-sop mtl postgresql-libpq + postgresql-simple utf8-string + ]; + testHaskellDepends = [ base generics-sop hspec postgresql-simple ]; + homepage = "https://github.com/cocreature/postgresql-named#readme"; + description = "Generic deserialization of PostgreSQL rows based on column names"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "postgresql-orm" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , bytestring-builder, directory, filepath, ghc-prim, mtl @@ -148552,16 +149198,17 @@ self: { }) {}; "postgresql-simple-opts" = callPackage - ({ mkDerivation, base, bytestring, hspec, markdown-unlit - , optparse-applicative, optparse-generic, postgresql-simple + ({ mkDerivation, base, bytestring, data-default, either, hspec + , markdown-unlit, optparse-applicative, optparse-generic + , postgresql-simple }: mkDerivation { pname = "postgresql-simple-opts"; - version = "0.1.0.4"; - sha256 = "1rb08900n21afs8vkmbhbma2jhlxw0a6mj4c67cpxgsidrysh174"; + version = "0.2.0.0"; + sha256 = "07zsykbxcl1rjbcnq21bw99r77jm743py9lcvk8grnqfjqyn43a7"; libraryHaskellDepends = [ - base bytestring markdown-unlit optparse-applicative - optparse-generic postgresql-simple + base bytestring data-default either markdown-unlit + optparse-applicative optparse-generic postgresql-simple ]; testHaskellDepends = [ base bytestring hspec optparse-applicative postgresql-simple @@ -148697,26 +149344,26 @@ self: { "postgrest" = callPackage ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async , auto-update, base, base64-bytestring, bytestring - , case-insensitive, cassava, configurator, containers + , case-insensitive, cassava, configurator-ng, containers , contravariant, cookie, either, hasql, hasql-pool , hasql-transaction, heredoc, hjsonpointer, hjsonschema, hspec , hspec-wai, hspec-wai-json, HTTP, http-types , insert-ordered-containers, interpolatedstring-perl6, jwt, lens , lens-aeson, monad-control, network-uri, optparse-applicative - , parsec, process, protolude, Ranged-sets, regex-tdfa, safe + , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe , scientific, swagger2, text, time, transformers-base, unix , unordered-containers, vector, wai, wai-cors, wai-extra , wai-middleware-static, warp }: mkDerivation { pname = "postgrest"; - version = "0.4.1.0"; - sha256 = "1g344xb9gg8n60wrk9chr0v7k32ryjn7bfcinwj7zydv5xis2j8l"; + version = "0.4.2.0"; + sha256 = "0256mjq9xc0shanyb54p1bhbpb68mdadc71c5p7lpr0q4cn91c0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base bytestring case-insensitive cassava - configurator containers contravariant cookie either hasql + configurator-ng containers contravariant cookie either hasql hasql-pool hasql-transaction heredoc HTTP http-types insert-ordered-containers interpolatedstring-perl6 jwt lens lens-aeson network-uri optparse-applicative parsec protolude @@ -148726,7 +149373,7 @@ self: { ]; executableHaskellDepends = [ auto-update base base64-bytestring bytestring hasql hasql-pool - protolude text time unix warp + protolude retry text time unix warp ]; testHaskellDepends = [ aeson aeson-qq async auto-update base base64-bytestring bytestring @@ -149792,6 +150439,8 @@ self: { pname = "prettyprinter"; version = "1.1"; sha256 = "0bksn65rvnc0f59mfzhyl9yaccfh5ap6jxj1r477izlnkfs0k03y"; + revision = "1"; + editedCabalFile = "0b3f3b55h49pini9fv01km1ydqwp6l687qmy193y8lcmrygnzbdy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text ]; @@ -150295,6 +150944,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "process-extras_0_7_2" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq + , generic-deriving, HUnit, ListLike, mtl, process, text + }: + mkDerivation { + pname = "process-extras"; + version = "0.7.2"; + sha256 = "0n79m1kj59w4s2a86m1hm98019452mhh06szn0jwsvb9xhqi0v77"; + libraryHaskellDepends = [ + base bytestring data-default deepseq generic-deriving ListLike mtl + process text + ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/seereason/process-extras"; + description = "Process extras"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "process-iterio" = callPackage ({ mkDerivation, base, bytestring, cpphs, iterIO, process , transformers @@ -151119,25 +151787,6 @@ self: { }) {inherit (pkgs) alsaLib;}; "proto-lens" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , data-default-class, lens-family, parsec, pretty, text - , transformers, void - }: - mkDerivation { - pname = "proto-lens"; - version = "0.2.0.1"; - sha256 = "1440kfxlwz8inbr68sml9najfb91yybmz5m93qz0fpf550p51h3k"; - libraryHaskellDepends = [ - attoparsec base bytestring containers data-default-class - lens-family parsec pretty text transformers void - ]; - homepage = "https://github.com/google/proto-lens"; - description = "A lens-based implementation of protocol buffers in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens_0_2_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , data-default-class, lens-family, parsec, pretty, text , transformers, void @@ -151174,29 +151823,6 @@ self: { }) {}; "proto-lens-combinators" = callPackage - ({ mkDerivation, base, data-default-class, HUnit, lens-family - , lens-family-core, proto-lens, proto-lens-protoc, test-framework - , test-framework-hunit, transformers - }: - mkDerivation { - pname = "proto-lens-combinators"; - version = "0.1.0.6"; - sha256 = "0zycwrfn2c6vdp3ld2pspn9d5br0jn4m8qgjaxn0n4h3ilfzrskc"; - libraryHaskellDepends = [ - base data-default-class lens-family proto-lens proto-lens-protoc - transformers - ]; - testHaskellDepends = [ - base HUnit lens-family lens-family-core proto-lens - proto-lens-protoc test-framework test-framework-hunit - ]; - homepage = "https://github.com/google/proto-lens"; - description = "Utilities functions to proto-lens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-combinators_0_1_0_7" = callPackage ({ mkDerivation, base, Cabal, data-default-class, HUnit , lens-family, lens-family-core, proto-lens, proto-lens-protoc , test-framework, test-framework-hunit, transformers @@ -151221,22 +151847,6 @@ self: { }) {}; "proto-lens-descriptors" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , lens-family, lens-labels, proto-lens, text - }: - mkDerivation { - pname = "proto-lens-descriptors"; - version = "0.2.0.1"; - sha256 = "1vjdp3n7fh8qwql9a8gpcgrkcgdpf0d2x4y1i7ghvd6f2gq77jmh"; - libraryHaskellDepends = [ - base bytestring containers data-default-class lens-family - lens-labels proto-lens text - ]; - description = "Protocol buffers for describing the definitions of messages"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "proto-lens-descriptors_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, lens-labels, proto-lens, text }: @@ -151250,7 +151860,6 @@ self: { ]; description = "Protocol buffers for describing the definitions of messages"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-optparse" = callPackage @@ -151268,6 +151877,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "proto-lens-optparse_0_1_0_3" = callPackage + ({ mkDerivation, base, optparse-applicative, proto-lens, text }: + mkDerivation { + pname = "proto-lens-optparse"; + version = "0.1.0.3"; + sha256 = "16wk5paba9p7rz1z614d9byszygkqvxca78zwxyzjgvyjw1yssyl"; + libraryHaskellDepends = [ + base optparse-applicative proto-lens text + ]; + homepage = "https://github.com/google/proto-lens"; + description = "Adapting proto-lens to optparse-applicative ReadMs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proto-lens-protobuf-types" = callPackage ({ mkDerivation, base, Cabal, proto-lens-protoc }: mkDerivation { @@ -151282,32 +151906,6 @@ self: { }) {}; "proto-lens-protoc" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers - , data-default-class, directory, filepath, haskell-src-exts - , lens-family, lens-labels, process, proto-lens - , proto-lens-descriptors, text - }: - mkDerivation { - pname = "proto-lens-protoc"; - version = "0.2.0.1"; - sha256 = "0zsd7gw6nirfsa5pg119a7pqcqmc005ynhqvw2r2ccvdppq5y26y"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers data-default-class directory - filepath haskell-src-exts lens-family lens-labels process - proto-lens proto-lens-descriptors text - ]; - executableHaskellDepends = [ - base bytestring containers data-default-class filepath - haskell-src-exts lens-family proto-lens proto-lens-descriptors text - ]; - description = "Protocol buffer compiler for the proto-lens library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "proto-lens-protoc_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers , data-default-class, directory, filepath, haskell-src-exts , lens-family, lens-labels, process, proto-lens @@ -152273,7 +152871,6 @@ self: { homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge" = callPackage @@ -152294,7 +152891,6 @@ self: { ]; description = "Generate PureScript data types from Haskell data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge_0_11_0_0" = callPackage @@ -153015,8 +153611,8 @@ self: { ({ mkDerivation, base, process, qtah-generator, qtbase }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.2.0"; - sha256 = "1npgfxz3m30lsknw1nw1apmhl40zsaps3ysci23iv92m720zdnnn"; + version = "0.3.1"; + sha256 = "0yy6q10lsjhjnvirs2d8pdivs9d0kdilwsm4j7s59jz5xhwzbqzl"; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; homepage = "http://khumba.net/projects/qtah"; @@ -153026,17 +153622,17 @@ self: { }) {inherit (pkgs.qt5) qtbase;}; "qtah-examples" = callPackage - ({ mkDerivation, base, binary, bytestring, filepath, hoppy-runtime - , qtah-qt5 + ({ mkDerivation, base, binary, bytestring, containers, filepath + , hoppy-runtime, qtah-qt5 }: mkDerivation { pname = "qtah-examples"; - version = "0.2.1"; - sha256 = "13rwb7vxi1clg5mw6l1qh97knp53prh0hxy9yq40pxpak7wknwd9"; + version = "0.3.0"; + sha256 = "0scb00dilgbiqzp1jq0jknx76qb0fc9l9wsv214k9x741q7cv71b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base binary bytestring filepath hoppy-runtime qtah-qt5 + base binary bytestring containers filepath hoppy-runtime qtah-qt5 ]; homepage = "http://khumba.net/projects/qtah"; description = "Example programs for Qtah Qt bindings"; @@ -153050,8 +153646,8 @@ self: { }: mkDerivation { pname = "qtah-generator"; - version = "0.2.1"; - sha256 = "1vrg9cbp9ipvm3c9flg0pdj3n11rw4z9jcnwfgivcsp46rbm6y74"; + version = "0.3.0"; + sha256 = "0zyhpb70lcp9r8skq6lzw4xqpa3fndbq4vxk098diqivknl064ff"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -153072,8 +153668,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.2.0"; - sha256 = "12n62sy7226r2bybppivjkaqywna31nnnmhsr4v984mvk53s6iw6"; + version = "0.3.0"; + sha256 = "0rrg0ymkhvgdhwcabr4n4alrqkzyyzyggdclygmjp7l2lq4md1ad"; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -153452,21 +154048,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_14" = callPackage - ({ mkDerivation, array, base, bytestring, case-insensitive - , containers, hashable, old-time, QuickCheck, scientific, tagged - , text, time, unordered-containers, uuid-types, vector + "quickcheck-instances_0_3_15" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, tagged, text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.14"; - sha256 = "1mq9zg7d0h275lhwqjq5z2hs4ql4v13q7c8x5n6rhp47rr07pcgr"; - revision = "1"; - editedCabalFile = "107xlrf2r0d11c4ig33p5rg3hr8di0mbhnzzvkw0q7ys1ik5v0qn"; + version = "0.3.15"; + sha256 = "02nwas0i2jlvjahlj5mayhpiy8pkb46xicypjw63kzp1xc6zs3ly"; libraryHaskellDepends = [ - array base bytestring case-insensitive containers hashable old-time - QuickCheck scientific tagged text time unordered-containers - uuid-types vector + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific tagged text time + transformers transformers-compat unordered-containers uuid-types + vector ]; testHaskellDepends = [ base containers QuickCheck tagged uuid-types @@ -153489,6 +154085,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quickcheck-io_0_2_0" = callPackage + ({ mkDerivation, base, HUnit, QuickCheck }: + mkDerivation { + pname = "quickcheck-io"; + version = "0.2.0"; + sha256 = "08k4v7pkgjf30pv5j2dfv1gqv6hclxlniyq2sps8zq4zswcr2xzv"; + libraryHaskellDepends = [ base HUnit QuickCheck ]; + homepage = "https://github.com/hspec/quickcheck-io#readme"; + description = "Use HUnit assertions as QuickCheck properties"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-poly" = callPackage ({ mkDerivation, base, haskell98, hint, MonadCatchIO-mtl , QuickCheck, regex-compat, regex-tdfa @@ -155242,6 +155851,8 @@ self: { pname = "rasterific-svg"; version = "0.3.2.1"; sha256 = "1pxgazmyl9ky08vx2nnf5k7bw183ljpvzggvddrdlpwzczm8fzki"; + revision = "1"; + editedCabalFile = "19w6f01qc1ahwfsqnqb6ajsgv4wqy5vfy54f6x15z1pivnyw37sk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157407,27 +158018,6 @@ self: { }) {}; "regex" = callPackage - ({ mkDerivation, array, base, base-compat, bytestring, containers - , hashable, regex-base, regex-tdfa, regex-tdfa-text - , template-haskell, text, time, time-locale-compat, transformers - , unordered-containers - }: - mkDerivation { - pname = "regex"; - version = "1.0.1.0"; - sha256 = "1kh4bh1yvpclx5f903pig034b2sjkvm3ijsrwmdh94ws9h0fdc9p"; - libraryHaskellDepends = [ - array base base-compat bytestring containers hashable regex-base - regex-tdfa regex-tdfa-text template-haskell text time - time-locale-compat transformers unordered-containers - ]; - homepage = "http://regex.uk"; - description = "Toolkit for regex-base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "regex_1_0_1_3" = callPackage ({ mkDerivation, array, base, base-compat, bytestring, containers , hashable, regex-base, regex-pcre-builtin, regex-tdfa , regex-tdfa-text, template-haskell, text, time, time-locale-compat @@ -157887,26 +158477,6 @@ self: { }) {}; "regex-with-pcre" = callPackage - ({ mkDerivation, base, base-compat, bytestring, containers, regex - , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa - , template-haskell, text, transformers, unordered-containers - }: - mkDerivation { - pname = "regex-with-pcre"; - version = "1.0.1.0"; - sha256 = "0r7fqh9mkbjdf21m9m1j9s21h27c1cm2xcmb3j1ai9ga7jhl4864"; - libraryHaskellDepends = [ - base base-compat bytestring containers regex regex-base - regex-pcre-builtin regex-pcre-text regex-tdfa template-haskell text - transformers unordered-containers - ]; - homepage = "http://regex.uk"; - description = "Toolkit for regex-base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "regex-with-pcre_1_0_1_3" = callPackage ({ mkDerivation, base, base-compat, bytestring, containers, regex , regex-base, regex-pcre-builtin, regex-pcre-text, regex-tdfa , template-haskell, text, transformers, unordered-containers @@ -159346,6 +159916,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "reproject" = callPackage + ({ mkDerivation, base, hspec, template-haskell }: + mkDerivation { + pname = "reproject"; + version = "0.2.0.0"; + sha256 = "1h1m5fdlhd2dxpk8bphcvbjybw40lw48b7j1bkk2grq3ljyvgmwl"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/agrafix/reproject#readme"; + description = "Define and combine \"materialized\" projections"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "req" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, blaze-builder , bytestring, case-insensitive, connection, data-default-class @@ -161686,7 +162269,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "rss-conduit_0_3_1_0" = callPackage + "rss-conduit_0_3_1_1" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , containers, data-default, hlint, lens-simple, mono-traversable , QuickCheck, quickcheck-instances, resourcet, safe @@ -161695,8 +162278,8 @@ self: { }: mkDerivation { pname = "rss-conduit"; - version = "0.3.1.0"; - sha256 = "1j9wxfadvhs4aaf84q4xy2p1x0ic7zhr22srrwzmw9qjjl4dy4is"; + version = "0.3.1.1"; + sha256 = "16pghxkk9pyskhp73sz43nw84w7qw62sdlwqpsrrfs2wr2ab71bd"; libraryHaskellDepends = [ base conduit conduit-combinators containers lens-simple mono-traversable safe safe-exceptions text time timerep @@ -162213,6 +162796,8 @@ self: { pname = "safe-exceptions"; version = "0.1.5.0"; sha256 = "068srl44q66iv939fhk3mxalmxdn7348f6xh46pwg5mjj4vfrvvh"; + revision = "1"; + editedCabalFile = "0m0m2bj8xmiqj1qxkl00p0fndn6aw54a4yf2kx2qhijgzc4f1hwl"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -163557,22 +164142,23 @@ self: { "schematic" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, hspec-core , hspec-discover, hspec-smallcheck, HUnit, regex-compat, scientific - , singletons, smallcheck, smallcheck-series, text + , singletons, smallcheck, smallcheck-series, tagged, text , unordered-containers, validationt, vector, vinyl }: mkDerivation { pname = "schematic"; - version = "0.1.1.0"; - sha256 = "1g0myq6rslzn4q611r6wvcfdpvvfw8f85rck3ha7qhaw7vmm5vyb"; + version = "0.1.4.0"; + sha256 = "11dc24f657wh5g5yx256qnwmajxs5f6pv2ydzdqig3a7al32kvfb"; libraryHaskellDepends = [ aeson base bytestring regex-compat scientific singletons smallcheck - smallcheck-series text unordered-containers validationt vector - vinyl + smallcheck-series tagged text unordered-containers validationt + vector vinyl ]; testHaskellDepends = [ aeson base bytestring hspec hspec-core hspec-discover hspec-smallcheck HUnit regex-compat singletons smallcheck - smallcheck-series text unordered-containers validationt vinyl + smallcheck-series tagged text unordered-containers validationt + vinyl ]; description = "JSON-biased spec and validation tool"; license = stdenv.lib.licenses.bsd3; @@ -163749,30 +164335,6 @@ self: { }) {}; "scientific" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, criterion - , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms - , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text, vector - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.13"; - sha256 = "0fpn0mwv4rvvn44dn2lm5nxws8w90jv9vlwjy85xsvhn5dvv7bhq"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp integer-logarithms text vector - ]; - testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - benchmarkHaskellDepends = [ base criterion ]; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scientific_0_3_4_15" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , deepseq, ghc-prim, hashable, integer-gmp, integer-logarithms , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit @@ -163794,7 +164356,6 @@ self: { homepage = "https://github.com/basvandijk/scientific"; description = "Numbers represented using scientific notation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scion" = callPackage @@ -164452,8 +165013,8 @@ self: { }: mkDerivation { pname = "sdl2-compositor"; - version = "1.2.0.6"; - sha256 = "055hafyp8xrdy00fyp9r263nh5ga077q7cv5acb48sagy4fwxyij"; + version = "1.2.0.7"; + sha256 = "1yfbqxrfhy951qdcf43vx9gxd4jj3l2dq5bz04blchpq4qzm4876"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164948,18 +165509,20 @@ self: { }) {sedna = null;}; "selda" = callPackage - ({ mkDerivation, base, exceptions, hashable, mtl, psqueues, text - , time, unordered-containers + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers }: mkDerivation { pname = "selda"; - version = "0.1.7.0"; - sha256 = "0mg21i8aw4vmiwnflcmg8qkvqz8fx0j50z67hr2k9pvqld13vr5s"; + version = "0.1.8.0"; + sha256 = "13ccbpwsd2w6l534a9l6d1mmssfy1q9lh6df14zf2am8ph184av7"; + revision = "1"; + editedCabalFile = "1lqq7ik4s1xvbc94knv57h2k08r8rk4nyhxq6nlfy23spb56r0a6"; libraryHaskellDepends = [ - base exceptions hashable mtl psqueues text time + base bytestring exceptions hashable mtl psqueues text time unordered-containers ]; - homepage = "https://github.com/valderman/selda"; + homepage = "https://selda.link"; description = "Type-safe, high-level EDSL for interacting with relational databases"; license = stdenv.lib.licenses.mit; }) {}; @@ -164970,8 +165533,8 @@ self: { }: mkDerivation { pname = "selda-postgresql"; - version = "0.1.4.0"; - sha256 = "1zld5pwgfsm9rp8wads0k8dmfn2lbz6y093nj31gv1pkb8w392vs"; + version = "0.1.5.0"; + sha256 = "1ziavpl33m82xfv7528nvfgmlamz2rzmdd73gs7zbrvqnizjq4b5"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -164986,8 +165549,8 @@ self: { }: mkDerivation { pname = "selda-sqlite"; - version = "0.1.4.0"; - sha256 = "0irx8j3akzyb325q75jlcjnkir0kp820knaqwn9j393g4v9g1i40"; + version = "0.1.5.0"; + sha256 = "10r0sqbps515qbcdfgsi9lkjx5axps02hbgrjgkc7djg01i3c6x1"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -165423,8 +165986,8 @@ self: { }: mkDerivation { pname = "sensu-run"; - version = "0.1.1"; - sha256 = "0gcwwb8w0rr0kjhp13afsszsb81qvnryb5qnhskyr9wpx8vvm9bk"; + version = "0.1.1.3"; + sha256 = "1zhhnddp81p42z243i10kma5jic283gqlg190lfifsg8kdg3yms1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -166899,6 +167462,8 @@ self: { pname = "servant-mock"; version = "0.8.2"; sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w"; + revision = "1"; + editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167422,6 +167987,8 @@ self: { pname = "servant-subscriber"; version = "0.6.0.0"; sha256 = "0pa0zwb8qqs6y2fcs8acwljym9jmha273gb2v5nyhhfyimdl8x8q"; + revision = "1"; + editedCabalFile = "16r1ry5zd67mj5f2mi2sv9ls3vvc6y78ryijp8fcw1rif7mynf7h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167993,6 +168560,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "setlocale_1_0_0_5" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "setlocale"; + version = "1.0.0.5"; + sha256 = "1w4zgpjjy56bpgjjcxh2fj3v4pqwmfhfwwvs5nhys12h8y8q8hsp"; + libraryHaskellDepends = [ base ]; + homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale"; + description = "Haskell bindings to setlocale"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "setoid" = callPackage ({ mkDerivation, base, containers, mtl, smallcheck, tasty , tasty-discover, tasty-hunit, tasty-quickcheck, tasty-smallcheck @@ -170767,21 +171347,21 @@ self: { "siphon" = callPackage ({ mkDerivation, attoparsec, base, bytestring, colonnade , contravariant, either, HUnit, pipes, profunctors, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, vector + , streaming, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, transformers, vector }: mkDerivation { pname = "siphon"; - version = "0.6"; - sha256 = "04959v1dmfn5x6gdng3w2dyapr9yr34yqxkzmdw249pldsfbjxjp"; + version = "0.7"; + sha256 = "1k03gzgi9d27yzcvmxzibpgc5l6k7g41048x1qxd3l67qpxxbsl9"; libraryHaskellDepends = [ - attoparsec base bytestring colonnade contravariant pipes text + attoparsec base bytestring colonnade streaming text transformers vector ]; testHaskellDepends = [ base bytestring colonnade contravariant either HUnit pipes - profunctors QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text + profunctors QuickCheck streaming test-framework + test-framework-hunit test-framework-quickcheck2 text ]; homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Encode and decode CSV files"; @@ -171709,6 +172289,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "smiles" = callPackage + ({ mkDerivation, base, hspec, megaparsec, QuickCheck, text }: + mkDerivation { + pname = "smiles"; + version = "0.1.0.1"; + sha256 = "1bmnzwb8i6l8frfwzac1lv6r2iwipd84pwchnl9pam6w7gj0ncck"; + libraryHaskellDepends = [ base megaparsec text ]; + testHaskellDepends = [ base hspec megaparsec QuickCheck text ]; + homepage = "https://github.com/zmactep/smiles#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "smoothie" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { @@ -173995,8 +174587,8 @@ self: { }: mkDerivation { pname = "sound-collage"; - version = "0.2"; - sha256 = "1hishmz0mccxxgz99pda1gykz8iqv7lwjqlxcks940j576mcy1sw"; + version = "0.2.0.1"; + sha256 = "0ywsy3q8f6y6k0vg4g21v6cm3n7662ngbzvfx502makdkf47i75a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -177532,6 +178124,8 @@ self: { pname = "storable-endian"; version = "0.2.6"; sha256 = "12allvahkgx1nr10z4gp07gwaxqf52n4yyzihdxiilsf127sqhrp"; + revision = "1"; + editedCabalFile = "12f8sscsvsarlwz3p6kk9vbvqsbyhs8lhafgn9h7c0z6pz1amrya"; libraryHaskellDepends = [ base byteorder ]; description = "Storable instances with endianness"; license = stdenv.lib.licenses.bsd3; @@ -177942,6 +178536,8 @@ self: { pname = "stream-fusion"; version = "0.1.2.5"; sha256 = "006fz03jdwd9d0kwf8ma3077xxmg6zym94pwbb4sx1xcn7zf4yc6"; + revision = "1"; + editedCabalFile = "1jyb8mc99ag72y4bqxw997klrikhnxqrbacmx2ag5kmwsd1v1p12"; libraryHaskellDepends = [ base ]; homepage = "http://hackage.haskell.org/trac/ghc/ticket/915"; description = "Faster Haskell lists using stream fusion"; @@ -178100,8 +178696,8 @@ self: { }: mkDerivation { pname = "streaming-conduit"; - version = "0.1.1.0"; - sha256 = "1cj2p3c6rs5cbz0jdj7k8mxfnslk96966dshfhjxi56mrpjxmzjy"; + version = "0.1.2.0"; + sha256 = "1vzw0lfj8l4ic1fcw0iqiwygg4zrfxw9xdjbl7qpkfsjsbjqyg2q"; libraryHaskellDepends = [ base bytestring conduit streaming streaming-bytestring transformers ]; @@ -180197,8 +180793,8 @@ self: { ({ mkDerivation, base, diagrams-cairo, diagrams-lib, sym }: mkDerivation { pname = "sym-plot"; - version = "0.2.0"; - sha256 = "0186i6c3dyvs5pa4fh0b284wgpm10pgwax9prahirnq8whph94p2"; + version = "0.3.0"; + sha256 = "1ppq86fv5knfdcfn3pfiyg7v9k1aq47xp0b6yn8bwkfhcxxmbbhp"; libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ]; homepage = "http://github.com/akc/sym-plot"; description = "Plot permutations; an addition to the sym package"; @@ -182681,6 +183277,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_9" = callPackage + ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged + , tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.9"; + sha256 = "00h7vvmadiq07bzd9dpi8maw1apshz66si9vkkqzxmgvnv9src33"; + libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + homepage = "http://documentup.com/feuerbach/tasty"; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-rerun" = callPackage ({ mkDerivation, base, containers, mtl, optparse-applicative , reducers, split, stm, tagged, tasty, transformers @@ -183105,6 +183717,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "teardown" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, criterion, doctest, Glob + , protolude, QuickCheck, tasty, tasty-hspec, tasty-hunit + , tasty-rerun, tasty-smallcheck, text, time + }: + mkDerivation { + pname = "teardown"; + version = "0.0.0.2"; + sha256 = "0d28sxx2krf3p5alj8gn8gs98slfs9fqwbaf6lyimayy2fx9d5jf"; + libraryHaskellDepends = [ + ansi-wl-pprint base protolude text time + ]; + testHaskellDepends = [ + base doctest Glob protolude QuickCheck tasty tasty-hspec + tasty-hunit tasty-rerun tasty-smallcheck text time + ]; + benchmarkHaskellDepends = [ base criterion protolude text time ]; + homepage = "https://github.com/roman/Haskell-teardown#readme"; + description = "Build composable, idempotent & transparent application cleanup sub-routines"; + license = stdenv.lib.licenses.mit; + }) {}; + "teeth" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -183549,6 +184183,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "temporary_1_2_1" = callPackage + ({ mkDerivation, base, base-compat, directory, exceptions, filepath + , tasty, tasty-hunit, transformers, unix + }: + mkDerivation { + pname = "temporary"; + version = "1.2.1"; + sha256 = "1y54fx183sfmpd3xj94c74z9v42y1d7ski3jqrfrd7pnbh38ikwy"; + libraryHaskellDepends = [ + base directory exceptions filepath transformers unix + ]; + testHaskellDepends = [ + base base-compat directory filepath tasty tasty-hunit unix + ]; + homepage = "https://github.com/feuerbach/temporary"; + description = "Portable temporary file and directory support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "temporary-rc" = callPackage ({ mkDerivation, base, directory, exceptions, filepath , transformers, unix @@ -183886,8 +184540,8 @@ self: { }: mkDerivation { pname = "terminal-progress-bar"; - version = "0.1.1"; - sha256 = "107kr4yii14fg1330i3n8w0hqhxswys4f945x1m8ldqkj6naflr0"; + version = "0.1.1.1"; + sha256 = "1y9mpmnbc12bbybaqq7cqwhvbbdbx31zxkb63mymiaz1bnhi58fp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base stm stm-chans ]; @@ -185048,6 +185702,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-metrics_0_3_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hspec + , QuickCheck, text, vector, weigh + }: + mkDerivation { + pname = "text-metrics"; + version = "0.3.0"; + sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; + libraryHaskellDepends = [ base containers text vector ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; + homepage = "https://github.com/mrkkrp/text-metrics"; + description = "Calculate various string metrics efficiently"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-normal" = callPackage ({ mkDerivation, base, deepseq, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -185198,6 +185869,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "text-short" = callPackage + ({ mkDerivation, base, binary, bytestring, deepseq, hashable + , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "text-short"; + version = "0.1"; + sha256 = "0zlkvzh99dyrvvk4i9pbhwkj2kf8akc8j1g3z06saprl7kjz6sn0"; + libraryHaskellDepends = [ + base binary bytestring deepseq hashable text + ]; + testHaskellDepends = [ + base binary quickcheck-instances tasty tasty-hunit tasty-quickcheck + text + ]; + description = "Memory-efficient representation of Unicode text strings"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "text-show" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant @@ -185249,6 +185939,8 @@ self: { pname = "text-show"; version = "3.6"; sha256 = "0gvg1fpgvws75zhvxdkcg03m6sy5rv4m77fynjh8v6rakbiy7gb4"; + revision = "1"; + editedCabalFile = "052zp68y3fbwvg9xigngaqfv7afjw9prfns5qlx6s7mv3i8dc2mk"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -185323,6 +186015,8 @@ self: { pname = "text-show-instances"; version = "3.6.1"; sha256 = "1ws5gkmb7y21aw6lrakjq760lgg7j8r5rfm45sdfalhgasxh54lz"; + revision = "1"; + editedCabalFile = "1zkncw3nflhqgs0wmfj4pz2jvbp2hq5xanyv3ggdbjff6zzpcx6m"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process @@ -185652,8 +186346,8 @@ self: { ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { pname = "th-abstraction"; - version = "0.2.1.0"; - sha256 = "08kn5siadiz4zv1p03bcys1yzsdaac10l2rh017g2sxrb40hnffk"; + version = "0.2.2.0"; + sha256 = "00xnyknp1xgbr6rqbmdbpvxrnd3pw1wax46vv03g8bbjm0m4d7kd"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; @@ -186010,6 +186704,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-reify-many_0_1_7" = callPackage + ({ mkDerivation, base, containers, mtl, safe, template-haskell + , th-expand-syns + }: + mkDerivation { + pname = "th-reify-many"; + version = "0.1.7"; + sha256 = "1sa4gxkkv30h6g12cqss3qffmphcamfqmvnn69ix2w0wlsya81m8"; + libraryHaskellDepends = [ + base containers mtl safe template-haskell th-expand-syns + ]; + testHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/mgsloan/th-reify-many"; + description = "Recurseively reify template haskell datatype info"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-sccs" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -186221,6 +186933,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "these_0_7_4" = callPackage + ({ mkDerivation, aeson, base, bifunctors, binary, containers + , data-default-class, deepseq, hashable, keys, mtl, profunctors + , QuickCheck, quickcheck-instances, semigroupoids, tasty + , tasty-quickcheck, transformers, transformers-compat + , unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "these"; + version = "0.7.4"; + sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; + libraryHaskellDepends = [ + aeson base bifunctors binary containers data-default-class deepseq + hashable keys mtl profunctors QuickCheck semigroupoids transformers + transformers-compat unordered-containers vector vector-instances + ]; + testHaskellDepends = [ + aeson base bifunctors binary containers hashable QuickCheck + quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "thespian" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -186444,8 +187183,8 @@ self: { }: mkDerivation { pname = "threepenny-editors"; - version = "0.2.0.10"; - sha256 = "0hspg2zlkcmckdx2skgx3yh1sprx3a5fa57xspv4vcj0rws4kjr2"; + version = "0.2.0.11"; + sha256 = "0wq8s88l3pdl2n00gfyzg99dg2fd7d7gcq7pssxhg3z4rv72fdif"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186628,6 +187367,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "throwable-exceptions" = callPackage + ({ mkDerivation, base, either, safe-exceptions, tasty + , tasty-discover, tasty-hunit, text + }: + mkDerivation { + pname = "throwable-exceptions"; + version = "0.1.0.4"; + sha256 = "1hpji5db3hg36f4ry3xsgl4cynw0djx3a61i19q4cy9sqbbdlw4c"; + libraryHaskellDepends = [ base safe-exceptions ]; + testHaskellDepends = [ + base either safe-exceptions tasty tasty-discover tasty-hunit text + ]; + homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md"; + description = "throwable-exceptions gives the exception's value constructors"; + license = stdenv.lib.licenses.mit; + }) {}; + "thumbnail" = callPackage ({ mkDerivation, base, bytestring, gd }: mkDerivation { @@ -187697,24 +188453,6 @@ self: { }) {}; "timezone-olson" = callPackage - ({ mkDerivation, base, binary, bytestring, extensible-exceptions - , time, timezone-series - }: - mkDerivation { - pname = "timezone-olson"; - version = "0.1.7"; - sha256 = "1am6vqq3zxrnb444waqfajk3s1wpynw9fszqnk9ww7akf2v5abr3"; - revision = "2"; - editedCabalFile = "1ss4ipn11m6y8bq9pw9i7cs3yciqacf7y281749xc77a1w2nw19b"; - libraryHaskellDepends = [ - base binary bytestring extensible-exceptions time timezone-series - ]; - homepage = "http://projects.haskell.org/time-ng/"; - description = "A pure Haskell parser and renderer for binary Olson timezone files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "timezone-olson_0_1_8" = callPackage ({ mkDerivation, base, binary, bytestring, extensible-exceptions , time, timezone-series }: @@ -187728,7 +188466,6 @@ self: { homepage = "http://projects.haskell.org/time-ng/"; description = "A pure Haskell parser and renderer for binary Olson timezone files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timezone-olson-th" = callPackage @@ -189420,6 +190157,85 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "trasa" = callPackage + ({ mkDerivation, base, binary, bytestring, doctest, http-types + , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers + , vinyl + }: + mkDerivation { + pname = "trasa"; + version = "0.1"; + sha256 = "118x1z2hwx5gagiw4fas30jsdn1igqry2gydpjfnn9nvzf639x6y"; + libraryHaskellDepends = [ + base binary bytestring http-types text unordered-containers vinyl + ]; + testHaskellDepends = [ + base bytestring doctest tasty tasty-hunit tasty-quickcheck text + vinyl + ]; + homepage = "https://github.com/haskell-trasa/trasa#readme"; + description = "Type Safe Web Routing"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "trasa-client" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, http-client + , http-types, ip, text, trasa, unordered-containers + }: + mkDerivation { + pname = "trasa-client"; + version = "0.1.0.0"; + sha256 = "00vhl41al809njjl94j5prrbhihc02627qfsacqy294sdf5pf6kd"; + libraryHaskellDepends = [ + base binary bytestring http-client http-types text trasa + ]; + testHaskellDepends = [ + aeson base http-client http-types ip text trasa + unordered-containers + ]; + description = "Type safe http requests"; + license = stdenv.lib.licenses.mit; + }) {}; + + "trasa-reflex" = callPackage + ({ mkDerivation, base, bytestring, containers, ghcjs-dom + , http-types, jsaddle, reflex, reflex-dom, text, trasa + }: + mkDerivation { + pname = "trasa-reflex"; + version = "0.1.0.0"; + sha256 = "10c9ssk5dzvqglhism3g3kpracaf4j913gd6m639ry8nkax0ndyv"; + libraryHaskellDepends = [ + base bytestring containers ghcjs-dom http-types jsaddle reflex + reflex-dom text trasa + ]; + description = "Reactive Type Safe Routing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "trasa-server" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, containers + , doctest, http-client, http-types, mtl, tasty, tasty-hunit + , tasty-quickcheck, text, trasa, vinyl, wai, warp + }: + mkDerivation { + pname = "trasa-server"; + version = "0.1"; + sha256 = "1pj0rlpn0625vxm5hzik1vj2yrfkc8dmf04hc6mcjrpb78yyd2ai"; + libraryHaskellDepends = [ + base bytestring case-insensitive containers http-types mtl text + trasa wai + ]; + testHaskellDepends = [ + base bytestring doctest http-client tasty tasty-hunit + tasty-quickcheck text trasa vinyl warp + ]; + homepage = "https://github.com/haskell-trasa/trasa#readme"; + description = "Type safe web server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "traverse-with-class" = callPackage ({ mkDerivation, base, template-haskell, transformers }: mkDerivation { @@ -190152,30 +190968,6 @@ self: { }) {}; "tttool" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib - }: - mkDerivation { - pname = "tttool"; - version = "1.7.0.2"; - sha256 = "08h3s1jldrlz9im5bb7s83jgr9grc9sd0i6im49fsb54nmahc41p"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib - ]; - homepage = "https://github.com/entropia/tip-toi-reveng"; - description = "Working with files for the Tiptoi® pen"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tttool_1_7_0_3" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec @@ -190197,7 +190989,6 @@ self: { homepage = "https://github.com/entropia/tip-toi-reveng"; description = "Working with files for the Tiptoi® pen"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tubes" = callPackage @@ -190475,6 +191266,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "turtle_1_3_6" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock + , criterion, directory, doctest, foldl, hostname, managed + , optional-args, optparse-applicative, process, semigroups, stm + , system-fileio, system-filepath, temporary, text, time + , transformers, unix, unix-compat + }: + mkDerivation { + pname = "turtle"; + version = "1.3.6"; + sha256 = "0fr8p6rnk2lrsgbfh60jlqcjr0nxrh3ywxsj5d4psck0kgyhvg1m"; + libraryHaskellDepends = [ + ansi-wl-pprint async base bytestring clock directory foldl hostname + managed optional-args optparse-applicative process semigroups stm + system-fileio system-filepath temporary text time transformers unix + unix-compat + ]; + testHaskellDepends = [ base doctest system-filepath temporary ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Shell programming, Haskell-style"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "turtle-options" = callPackage ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle }: @@ -190545,26 +191360,23 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition, containers, criterion, data-default - , directory, extra, hspec, hspec-megaparsec, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, split, text + , directory, extra, hspec, http-client, http-client-tls, http-types + , lens, optparse-applicative, split, text }: mkDerivation { pname = "tweet-hs"; - version = "0.5.3.12"; - sha256 = "0kscaq83m8yvnqpraq4m758r1q17cpqm6ks7c0lvknkgbv1f548v"; + version = "0.6.0.0"; + sha256 = "1myvwhyzw4a9xdrp16ibzgafdv84kwyvn0pqcsnq8kf3lnic60n3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring composition containers data-default directory extra http-client http-client-tls - http-types lens megaparsec optparse-applicative split text + http-types lens optparse-applicative split text ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec hspec-megaparsec megaparsec - ]; - benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; + testHaskellDepends = [ base bytestring hspec ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; license = stdenv.lib.licenses.bsd3; @@ -190957,8 +191769,8 @@ self: { }: mkDerivation { pname = "twitter-conduit"; - version = "0.2.2"; - sha256 = "0nzxzx4p0gxvn8w715ajivz8ddqgfs20n4g87hxwj9h8p2irlzw3"; + version = "0.2.2.1"; + sha256 = "06nbbh9lx816klc1hcd7rvqaxhshscc4bbq10mnhqrfzq69al695"; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit conduit-extra containers data-default exceptions http-client @@ -192460,6 +193272,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ulid" = callPackage + ({ mkDerivation, base, binary, bytestring, crockford, crypto-api + , deepseq, format-numbers, hashable, hspec, random, text, time + }: + mkDerivation { + pname = "ulid"; + version = "0.2.0.0"; + sha256 = "1fw50j6ajrrfc1nzgf814rzj1x06dls220ngpxpdvs278spc1hns"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring crockford crypto-api deepseq hashable random + time + ]; + executableHaskellDepends = [ base crypto-api ]; + testHaskellDepends = [ + base binary bytestring hashable hspec random + ]; + benchmarkHaskellDepends = [ + base deepseq format-numbers text time + ]; + homepage = "https://github.com/steven777400/ulid"; + description = "Implementation of ULID, lexicographically sortable unique identifiers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "una" = callPackage ({ mkDerivation, base, bytestring, cmdargs, directory, filepath , io-storage, process @@ -192993,16 +193831,22 @@ self: { }) {}; "unicoder" = callPackage - ({ mkDerivation, attoparsec, base, directory, text }: + ({ mkDerivation, attoparsec, base, data-default, directory + , filepath, text, twitch + }: mkDerivation { pname = "unicoder"; - version = "0.4.1"; - sha256 = "17a2rxq5b4a66ia4jm1g0lmkvsanfc477567wygq9kz4w9q4xwc3"; + version = "0.5.0"; + sha256 = "1974birppkd49jwq31x8bcbmgnximh233salnyq47ikgxfp6x4c6"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ attoparsec base text ]; - executableHaskellDepends = [ attoparsec base directory text ]; - testHaskellDepends = [ attoparsec base text ]; + libraryHaskellDepends = [ + attoparsec base directory filepath text + ]; + executableHaskellDepends = [ + base data-default directory filepath text twitch + ]; + testHaskellDepends = [ base text ]; homepage = "https://github.com/Zankoku-Okuno/unicoder"; description = "Make writing in unicode easy"; license = stdenv.lib.licenses.bsd3; @@ -194129,35 +194973,6 @@ self: { }) {}; "uri-bytestring" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, criterion, deepseq, deepseq-generics, generics-sop - , HUnit, lens-simple, network-uri, QuickCheck, quickcheck-instances - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, th-lift-instances - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.3.2"; - sha256 = "0slchhhgwcig8ifla49r9j96cg5l1jf5gy9zzpvmmds0x3d42qh4"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - template-haskell th-lift-instances - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers generics-sop - HUnit lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - benchmarkHaskellDepends = [ - base blaze-builder bytestring criterion deepseq deepseq-generics - network-uri - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "uri-bytestring_0_2_3_3" = callPackage ({ mkDerivation, attoparsec, base, base-compat, blaze-builder , bytestring, containers, criterion, deepseq, deepseq-generics , generics-sop, HUnit, network-uri, QuickCheck @@ -194185,7 +195000,6 @@ self: { homepage = "https://github.com/Soostone/uri-bytestring"; description = "Haskell URI parsing as ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uri-bytestring-aeson" = callPackage @@ -195555,6 +196369,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "variation" = callPackage + ({ mkDerivation, base, cereal, containers, deepseq, semigroupoids + }: + mkDerivation { + pname = "variation"; + version = "0.1.1.0"; + sha256 = "05wkjr3sd4r3bid4n18qiblc8jvpzzdkh74f7qh3q1lfx8yv2133"; + libraryHaskellDepends = [ + base cereal containers deepseq semigroupoids + ]; + description = "nominal value with possible variations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "varying" = callPackage ({ mkDerivation, base, criterion, hspec, QuickCheck, time , transformers @@ -196427,15 +197255,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "versions_3_1_0_1" = callPackage - ({ mkDerivation, base, megaparsec, microlens, tasty, tasty-hunit - , text + "versions_3_1_1" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , tasty, tasty-hunit, text }: mkDerivation { pname = "versions"; - version = "3.1.0.1"; - sha256 = "0r6dzf27bw2d0d0p48rv2vqkiw4dagdk6ka0hhisxz5ii4x6lvl7"; - libraryHaskellDepends = [ base megaparsec text ]; + version = "3.1.1"; + sha256 = "1pnmbvlchjskavp6h04xdxwxg61aplqpxnawnbzflyf1mvpz0dm4"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; testHaskellDepends = [ base microlens tasty tasty-hunit text ]; description = "Types and parsers for software version numbers"; license = stdenv.lib.licenses.bsd3; @@ -196529,14 +197357,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "viewprof_0_0_0_2" = callPackage + "viewprof_0_0_0_3" = callPackage ({ mkDerivation, base, brick, containers, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty }: mkDerivation { pname = "viewprof"; - version = "0.0.0.2"; - sha256 = "1yxz4lfynq3smncaq0z845avzlvmsd44knrzf0dh0w39rag2z5jj"; + version = "0.0.0.3"; + sha256 = "13rb9cgi65vcc6y6rj79li1rywzb711ayl1dwsm97b7nqz4007rk"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -198021,6 +198849,8 @@ self: { pname = "wai-middleware-crowd"; version = "0.1.4.2"; sha256 = "0n5h4s3b2fdn2j0pl32bsdbf6wyyf2ms8qsbcs9r0wp7dhdbcdhi"; + revision = "1"; + editedCabalFile = "0qvh92p9s80kmzg5w7rga54kfqbwcrkkv5p03pd92px04j2h5lbm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200055,7 +200885,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets_0_11_1_0" = callPackage + "websockets_0_11_2_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers , criterion, entropy, HUnit, network, QuickCheck, random, SHA @@ -200064,8 +200894,8 @@ self: { }: mkDerivation { pname = "websockets"; - version = "0.11.1.0"; - sha256 = "1qbslmgj7blnm4al414h76mn8adzydpw2mba4w9vgb4rgi0w6b9w"; + version = "0.11.2.0"; + sha256 = "0bncy78zjyhb961lhiklg2d1zh6vh03xq1zjj9js8904p75kvbaq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200079,7 +200909,11 @@ self: { SHA streaming-commons test-framework test-framework-hunit test-framework-quickcheck2 text ]; - benchmarkHaskellDepends = [ base bytestring criterion random ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers criterion entropy network random SHA + text + ]; doCheck = false; homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; @@ -201236,8 +202070,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.0.4"; - sha256 = "1k7vjn114qwi46mdnqszwc8q7lg6k8s0k4g9rj4hfv7w83a2w377"; + version = "0.1.0.5"; + sha256 = "0841dzjxnj9hm2lm31sa7xabaywdpnjjksy1c7b4idirdpmz9rhd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -202466,8 +203300,8 @@ self: { pname = "xdcc"; version = "1.1.4"; sha256 = "0r344vgkiwc7lkb7x78swnz0rimbgdcb0ki29dilqvdv0k4z9i59"; - revision = "1"; - editedCabalFile = "0zp24wny11q6firilvwc5fq9z4qycww6nspxfrczjmws3b60zxxd"; + revision = "2"; + editedCabalFile = "1r9vp01r8pym1skqy6ll632q5j4xbgsf6mf1n26rk296z2rqdvra"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203045,6 +203879,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit_1_5_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , data-default, deepseq, hspec, HUnit, monad-control, resourcet + , text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.5.1"; + sha256 = "0d4pb9d0mdz9djh8aiy5r8088rqh7w34mbqmg8mmaq1i7vx2dzks"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + conduit conduit-extra containers data-default deepseq monad-control + resourcet text transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers hspec HUnit + resourcet text transformers xml-types + ]; + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -203906,17 +204765,16 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.1.1"; - sha256 = "0f322aqfav3hzv9hh0krl778q25jq0m83lqdwzbymbgm4yy585y2"; + version = "0.1.1.2"; + sha256 = "065kcsr7s114sw8g8hdl2i5w0543r9f9ypirvh3bn38x2lv4f9ng"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers process transformers X11 xmonad xmonad-contrib ]; - executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec xmonad ]; - homepage = "https://github.com/vmchale/xmonad-vanessa#readme"; - description = "Custom xmonad, which uses stack and sets various defaults"; + homepage = "https://hub.darcs.net/vmchale/xmonad-vanessa"; + description = "Custom xmonad, which builds with stack or cabal"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -204457,6 +205315,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; + "yaml_0_8_23_1" = callPackage + ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat + , bytestring, conduit, containers, directory, filepath, hspec + , HUnit, libyaml, mockery, resourcet, scientific, semigroups + , template-haskell, temporary, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.23.1"; + sha256 = "0sv01yzi08mr2r7wkjcrsl5pf02zzv3y2n7amznv0pdj82sw16sa"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath resourcet scientific semigroups template-haskell text + transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson aeson-qq base base-compat bytestring conduit directory hspec + HUnit mockery resourcet temporary text transformers + unordered-containers vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -204464,8 +205354,8 @@ self: { }: mkDerivation { pname = "yaml-combinators"; - version = "1.0"; - sha256 = "05xxv6dxkr4rn48kbzhh0nilpg42mg18s901wlnf1n3nb61dz5wr"; + version = "1.0.1"; + sha256 = "03y7z08ly3l5plh2c06i1p83c12s15fwshkl4nakqf1a6vb7bl48"; libraryHaskellDepends = [ aeson base bytestring generics-sop scientific text transformers unordered-containers vector yaml @@ -205037,35 +205927,6 @@ self: { }) {}; "yesod-auth" = callPackage - ({ mkDerivation, aeson, authenticate, base, base16-bytestring - , base64-bytestring, binary, blaze-builder, blaze-html - , blaze-markup, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, data-default, email-validate, file-embed - , http-client, http-conduit, http-types, lifted-base, mime-mail - , network-uri, nonce, persistent, persistent-template, random - , resourcet, safe, shakespeare, template-haskell, text, time - , transformers, unordered-containers, wai, yesod-core, yesod-form - , yesod-persistent - }: - mkDerivation { - pname = "yesod-auth"; - version = "1.4.17.1"; - sha256 = "0d9mwk7wxp3bl0d7v95qndps0i761f57ky7vy1h7n2smm1x7yy7q"; - libraryHaskellDepends = [ - aeson authenticate base base16-bytestring base64-bytestring binary - blaze-builder blaze-html blaze-markup byteable bytestring conduit - conduit-extra containers cryptohash data-default email-validate - file-embed http-client http-conduit http-types lifted-base - mime-mail network-uri nonce persistent persistent-template random - resourcet safe shakespeare template-haskell text time transformers - unordered-containers wai yesod-core yesod-form yesod-persistent - ]; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-auth_1_4_17_2" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html , blaze-markup, byteable, bytestring, conduit, conduit-extra @@ -205092,7 +205953,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Authentication for Yesod"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-account" = callPackage @@ -205583,51 +206443,6 @@ self: { }) {}; "yesod-core" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , blaze-html, blaze-markup, byteable, bytestring, case-insensitive - , cereal, clientsession, conduit, conduit-extra, containers, cookie - , criterion, data-default, deepseq, deepseq-generics, directory - , exceptions, fast-logger, hspec, hspec-expectations, http-types - , HUnit, lifted-base, monad-control, monad-logger, mtl, mwc-random - , network, old-locale, parsec, path-pieces, primitive, QuickCheck - , random, resourcet, safe, semigroups, shakespeare - , streaming-commons, template-haskell, text, time, transformers - , transformers-base, unix-compat, unordered-containers, vector, wai - , wai-extra, wai-logger, warp, word8 - }: - mkDerivation { - pname = "yesod-core"; - version = "1.4.33"; - sha256 = "1pk3bymlpzxsx54l5lzifrlgy2avsbdb917gqkn5jbnkbcf6mqmb"; - revision = "1"; - editedCabalFile = "0ryxcikbr70sp716bh43baayv9ay4hwm5d36i198vi4n4a9k1j0v"; - libraryHaskellDepends = [ - aeson auto-update base blaze-builder blaze-html blaze-markup - byteable bytestring case-insensitive cereal clientsession conduit - conduit-extra containers cookie data-default deepseq - deepseq-generics directory exceptions fast-logger http-types - lifted-base monad-control monad-logger mtl mwc-random old-locale - parsec path-pieces primitive random resourcet safe semigroups - shakespeare template-haskell text time transformers - transformers-base unix-compat unordered-containers vector wai - wai-extra wai-logger warp word8 - ]; - testHaskellDepends = [ - async base blaze-builder bytestring clientsession conduit - conduit-extra containers cookie hspec hspec-expectations http-types - HUnit lifted-base mwc-random network path-pieces QuickCheck random - resourcet shakespeare streaming-commons template-haskell text - transformers wai wai-extra - ]; - benchmarkHaskellDepends = [ - base blaze-html bytestring criterion shakespeare text transformers - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-core_1_4_35" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive , cereal, clientsession, conduit, conduit-extra, containers, cookie @@ -205670,7 +206485,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-crud" = callPackage @@ -206644,41 +207458,6 @@ self: { }) {}; "yesod-static" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, exceptions, file-embed, filepath - , hashable, hjsmin, hspec, http-types, HUnit, mime-types, old-time - , process, resourcet, template-haskell, text, transformers - , unix-compat, unordered-containers, wai, wai-app-static, wai-extra - , yesod-core, yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.5.2"; - sha256 = "17h9f95dqincb7zbqb6fw6xhbxhxgdjfsh9gzz3k57kx13vcajdr"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory exceptions - file-embed filepath hashable hjsmin http-types mime-types old-time - process resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default - directory exceptions file-embed filepath hjsmin hspec http-types - HUnit mime-types old-time process resourcet template-haskell text - transformers unix-compat unordered-containers wai wai-app-static - wai-extra yesod-core yesod-test - ]; - homepage = "http://www.yesodweb.com/"; - description = "Static file serving subsite for Yesod Web Framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-static_1_5_3" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra , containers, cryptohash, cryptohash-conduit, css-text @@ -206711,7 +207490,6 @@ self: { homepage = "http://www.yesodweb.com/"; description = "Static file serving subsite for Yesod Web Framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-static-angular" = callPackage @@ -206769,33 +207547,6 @@ self: { }) {}; "yesod-test" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html - , blaze-markup, bytestring, case-insensitive, containers, cookie - , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base - , monad-control, network, persistent, pretty-show, text, time - , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core - , yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.5"; - sha256 = "0f8adzhqkzw1bbvvks42q0bhq1imiinrfk5sn7q9yr22jpsmnhj4"; - libraryHaskellDepends = [ - attoparsec base blaze-builder blaze-html blaze-markup bytestring - case-insensitive containers cookie hspec-core html-conduit - http-types HUnit monad-control network persistent pretty-show text - time transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "yesod-test_1_5_6" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base @@ -206820,7 +207571,6 @@ self: { homepage = "http://www.yesodweb.com"; description = "integration testing for WAI/Yesod Applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-test-json" = callPackage @@ -208061,6 +208811,29 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) zeromq;}; + "zeromq4-haskell_0_6_6" = callPackage + ({ mkDerivation, async, base, bytestring, containers, exceptions + , monad-control, QuickCheck, semigroups, tasty, tasty-hunit + , tasty-quickcheck, transformers, transformers-base, zeromq + }: + mkDerivation { + pname = "zeromq4-haskell"; + version = "0.6.6"; + sha256 = "1pblwyn2lly3px9843g4a2wpkqhnffd53kam1b9kx31zpplfhbx8"; + libraryHaskellDepends = [ + async base bytestring containers exceptions monad-control + semigroups transformers transformers-base + ]; + libraryPkgconfigDepends = [ zeromq ]; + testHaskellDepends = [ + async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://gitlab.com/twittner/zeromq-haskell/"; + description = "Bindings to ZeroMQ 4.x"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) zeromq;}; + "zeroth" = callPackage ({ mkDerivation, base, Cabal, derive, directory, filepath , haskell-src-exts, hskeleton, monoid-record, process, syb @@ -208258,6 +209031,8 @@ self: { pname = "zip"; version = "0.1.11"; sha256 = "0adflrr7h6aqq4nz0751chs65zfj0ljz1mjwyym3s080sbrwncjn"; + revision = "1"; + editedCabalFile = "0f97aidxiw149m64bv6qnb6ba2xlmllv3cwalihvccc0vh5kn0as"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path @@ -208280,8 +209055,8 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.3.0.6"; - sha256 = "1dnmmfqfvssx1saxwc3r6miazcnilrhy188jqa0195nj2m510h41"; + version = "0.3.1"; + sha256 = "0ywy6isvyizs5d27lh108y6k4qnwmbcdmvzsrm3r45bwcj1nii5f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208298,31 +209073,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zip;}; - "zip-archive_0_3_1" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, temporary, text, time, unix, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.3.1"; - sha256 = "0ywy6isvyizs5d27lh108y6k4qnwmbcdmvzsrm3r45bwcj1nii5f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory HUnit old-time process temporary time - unix - ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl @@ -208450,29 +209200,6 @@ self: { }) {}; "ziptastic-client" = callPackage - ({ mkDerivation, base, base-compat, hspec, http-client - , http-client-tls, http-types, iso3166-country-codes, servant - , servant-client, text, ziptastic-core - }: - mkDerivation { - pname = "ziptastic-client"; - version = "0.3.0.2"; - sha256 = "1ara825win4zgngy5yhx16d8ffm94j1qlqha7b1s143dzk0vw8hs"; - libraryHaskellDepends = [ - base base-compat http-client iso3166-country-codes servant - servant-client text ziptastic-core - ]; - testHaskellDepends = [ - base base-compat hspec http-client http-client-tls http-types - iso3166-country-codes servant-client - ]; - homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; - description = "A type-safe client for the Ziptastic API for doing forward and reverse geocoding"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "ziptastic-client_0_3_0_3" = callPackage ({ mkDerivation, base, base-compat, hspec, http-client , http-client-tls, http-types, iso3166-country-codes, servant , servant-client, text, ziptastic-core @@ -208496,26 +209223,6 @@ self: { }) {}; "ziptastic-core" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec - , http-api-data, iso3166-country-codes, servant, text, tz - }: - mkDerivation { - pname = "ziptastic-core"; - version = "0.2.0.2"; - sha256 = "1hrbzsb09vsl5amkzyhs50c0la17xbh11nhnw5h59rq3dcv3kkyk"; - libraryHaskellDepends = [ - aeson base base-compat bytestring http-api-data - iso3166-country-codes servant text tz - ]; - testHaskellDepends = [ - aeson base base-compat here hspec iso3166-country-codes text tz - ]; - homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; - description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ziptastic-core_0_2_0_3" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, here, hspec , http-api-data, iso3166-country-codes, servant, text, tz }: @@ -208533,7 +209240,6 @@ self: { homepage = "https://github.com/Ziptastic/ziptastic-haskell#readme"; description = "Core Servant specification for the Ziptastic API for doing forward and reverse geocoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zlib_0_5_4_2" = callPackage From 35762f6ce3eed226f785cf4a54d2f9f0a7f7975d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 14 Jun 2017 09:52:44 +0200 Subject: [PATCH 22/26] git-annex: update hash for new version --- 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 ed99118850f..7b7099db0df 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -67,7 +67,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1iwqxjvga0wam0dg1alwawvnz13hm7d7c9rfph0w6adrdgfmhnzc"; + sha256 = "1psyklfyjf4zqh3qxjn11sp2jiwvp8mfxqvsi1wggqpidfmk39jx"; }; }))).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 7bcfdc1c1173322ad5f8363e1d987de2d9d597de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 16 Jun 2017 14:40:12 +0200 Subject: [PATCH 23/26] stack: build with hpack version 0.17.x --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 7b7099db0df..464ea25aee1 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -682,6 +682,7 @@ self: super: { stack = super.stack.overrideScope (self: super: { store-core = self.store-core_0_3; store = self.store_0_3_1; + hpack = self.hpack_0_17_1; }); # It makes no sense to have intero-nix-shim in Hackage, so we publish it here only. diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e4741017b1f..493181ea16c 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2445,6 +2445,7 @@ extra-packages: - haddock-api == 2.16.* # required on GHC 7.10.x - haddock-library == 1.2.* # required for haddock-api-2.16.x - haskell-src-exts == 1.18.* # required by hoogle-5.0.4 + - hpack < 0.18 # required by stack-1.4.0 - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 From 8a8f0408cd9b7fdda1095718107c800057658c44 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 8 Jun 2017 10:55:11 -0400 Subject: [PATCH 24/26] generic-builder: use buildInputs for Haskell dependencies This actually will matter when I (soon) land cross-compilation support, and native deps are compiled for the build, instead of host, platform. But even now, it's good style do this, and one less thing to review later. The use of `$nativePkgs` is unfortunate, as it will need to be swapped out for `$crossPkgs` for build != host builds. This will just a temporarily cause pain, however, as eventually I will change stdenv to use a `$runPkgs` (or moral equivalent) in both case. Closes https://github.com/NixOS/nixpkgs/pull/26480. --- .../haskell-modules/generic-builder.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 9516aca5366..38d74178e2e 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -144,9 +144,9 @@ let allPkgconfigDepends = pkgconfigDepends ++ libraryPkgconfigDepends ++ executablePkgconfigDepends ++ optionals doCheck testPkgconfigDepends ++ optionals withBenchmarkDepends benchmarkPkgconfigDepends; + nativeBuildInputs = setupHaskellDepends ++ buildTools ++ libraryToolDepends ++ executableToolDepends; propagatedBuildInputs = buildDepends ++ libraryHaskellDepends ++ executableHaskellDepends; - otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ setupHaskellDepends ++ - buildTools ++ libraryToolDepends ++ executableToolDepends ++ + otherBuildInputs = extraLibraries ++ librarySystemDepends ++ executableSystemDepends ++ optionals (allPkgconfigDepends != []) ([pkgconfig] ++ allPkgconfigDepends) ++ optionals doCheck (testDepends ++ testHaskellDepends ++ testSystemDepends ++ testToolDepends) ++ # ghcjs's hsc2hs calls out to the native hsc2hs @@ -181,8 +181,9 @@ stdenv.mkDerivation ({ inherit src; - nativeBuildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs; - propagatedNativeBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; + inherit nativeBuildInputs; + buildInputs = otherBuildInputs ++ optionals (!hasActiveLibrary) propagatedBuildInputs; + propagatedBuildInputs = optionals hasActiveLibrary propagatedBuildInputs; LANG = "en_US.UTF-8"; # GHC needs the locale configured during the Haddock phase. @@ -209,11 +210,8 @@ stdenv.mkDerivation ({ setupCompileFlags="${concatStringsSep " " setupCompileFlags}" configureFlags="${concatStringsSep " " defaultConfigureFlags} $configureFlags" - local inputClosure="" - for i in $propagatedNativeBuildInputs $nativeBuildInputs; do - findInputs $i inputClosure propagated-native-build-inputs - done - for p in $inputClosure; do + # nativePkgs defined in stdenv/setup.hs + for p in $nativePkgs; do if [ -d "$p/lib/${ghc.name}/package.conf.d" ]; then cp -f "$p/lib/${ghc.name}/package.conf.d/"*.conf $packageConfDir/ continue From 39fd9444020e2de89514db9297b27a57a9369eac Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 16 Jun 2017 01:49:50 -0400 Subject: [PATCH 25/26] chrome: fix fallout from #26512 Fixes broken save dialogue (causes chrome to crash) and missing icons. --- .../networking/browsers/chromium/default.nix | 27 ++++++++++++++++--- .../browsers/google-chrome/default.nix | 19 +++++++++++-- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index cfc8951eef1..30a16d824d0 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,5 @@ { newScope, stdenv, makeWrapper, makeDesktopItem, ed +, glib, gtk2, gtk3, gnome2, gnome3, gsettings_desktop_schemas # package customization , channel ? "stable" @@ -62,10 +63,26 @@ let sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; -in stdenv.mkDerivation { - name = "chromium${suffix}-${chromium.browser.version}"; + version = chromium.browser.version; - buildInputs = [ makeWrapper ed ]; + inherit (stdenv.lib) versionAtLeast; + + gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; + gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; + +in stdenv.mkDerivation { + name = "chromium${suffix}-${version}"; + inherit version; + + buildInputs = [ + makeWrapper ed + + # needed for GSETTINGS_SCHEMAS_PATH + gsettings_desktop_schemas glib gtk + + # needed for XDG_ICON_DIRS + gnome.defaultIconTheme + ]; outputs = ["out" "sandbox"]; @@ -92,6 +109,8 @@ in stdenv.mkDerivation { # libredirect causes chromium to deadlock on startup export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + . w EOF @@ -107,7 +126,7 @@ in stdenv.mkDerivation { cp -v "${desktopItem}/share/applications/"* "$out/share/applications" ''; - inherit (chromium.browser) meta packageName version; + inherit (chromium.browser) meta packageName; passthru = { inherit (chromium) upstream-info browser; diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index e7b74562bd5..9a4d90701b2 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -31,6 +31,9 @@ # Only needed for getting information about upstream binaries , chromium + +, gsettings_desktop_schemas +, gnome2, gnome3 }: with stdenv.lib; @@ -42,6 +45,9 @@ let withCustomModes = true; }; + gtk = if (versionAtLeast version "59.0.0.0") then gtk3 else gtk2; + gnome = if (versionAtLeast version "59.0.0.0") then gnome3 else gnome2; + deps = [ glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb @@ -53,7 +59,7 @@ let flac harfbuzz icu libpng opusWithCustomModes snappy speechd bzip2 libcap ] ++ optional pulseSupport libpulseaudio - ++ (if (versionAtLeast version "59.0.0.0") then [gtk3] else [gtk2]); + ++ [ gtk ]; suffix = if channel != "stable" then "-" + channel else ""; @@ -64,7 +70,15 @@ in stdenv.mkDerivation rec { src = binary; - buildInputs = [ patchelf ]; + buildInputs = [ + patchelf + + # needed for GSETTINGS_SCHEMAS_PATH + gsettings_desktop_schemas glib gtk + + # needed for XDG_ICON_DIRS + gnome.defaultIconTheme + ]; unpackPhase = '' ar x $src @@ -109,6 +123,7 @@ in stdenv.mkDerivation rec { #!${bash}/bin/sh export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH} export PATH=$binpath\''${PATH:+:\$PATH} + export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS $out/share/google/$appname/google-$appname ${commandLineArgs} "\$@" EOF chmod +x $exe From dda6daa4ff876d6f48cdd3538509c26c3e18af03 Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Fri, 16 Jun 2017 14:19:57 -0400 Subject: [PATCH 26/26] flash: 26.0.0.126 -> 26.0.0.131 The previous releases were 404ing. --- .../networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 01f4b03e4ca..4e2a2f84b96 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -94,12 +94,12 @@ let flash = stdenv.mkDerivation rec { name = "flashplayer-ppapi-${version}"; - version = "26.0.0.126"; + version = "26.0.0.131"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/" + "${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "17ivhkdkbnzxr10ln1ix30k1hmaak5p9zzcchdyrjxdpzfk5qq7s"; + sha256 = "1cw5pmzfyaaxxd3kf90nz8zn5r06qmkh8l793j3db4n0ffxg5c1s"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 5936c86c1cc..e7893d22717 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "26.0.0.126"; + version = "26.0.0.131"; src = fetchurl { url = @@ -84,14 +84,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "0i5rr8bymbdzwqpns854i2r9390av89v1ikh8msincczq5vpj012" + "0yqrw2gl9i0z33kcv5dpp3x3jyq9ksqfaqjgkk7xcy127ahric8s" else - "1mzq3wvq6rxqfdlapd0b1ymw7389414jxwhkd6wk3677qdhr1y42" + "0cmjqm5asqqcqavpkldm6wgjb49m9n018rixi7cj9zcwhfakm7zr" else if arch == "x86_64" then - "0684kizzfwfzaj0i54cdlkx3fqb3kyhb9jw88n031bjrzv7ddiz7" + "0agz4k5319m5bd0nqzkzvy8r28nr6c5j9b0jr6a8yh9s844aga8w" else - "1pn15wnldabacmahlqdsl8nd60982j77bghjlf2cdc7drysby3ns"; + "0jzvhyi1qgfjp9l85ffgcxqa87ymi899q2j68b9hfsn9hlw1sc5f"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index e29af0eaf4e..b290caaee3e 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -55,7 +55,7 @@ let in stdenv.mkDerivation rec { name = "flashplayer-standalone-${version}"; - version = "26.0.0.126"; + version = "26.0.0.131"; src = fetchurl { url = @@ -65,9 +65,9 @@ stdenv.mkDerivation rec { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/26/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "17s55b1ncjj0hnldjmxm133z0i4jf49wbh4sn1cfwrw6xrhgbkiw" + "000a019x15yk6qkx8yg7l496lc5knvw0kqgzial491d73zw8qjhn" else - "02j98ji2jw2sxrs9hhlkkdrhpf2c4hc336cfvqzdf1iajza5was8"; + "0rmsfi70hvp5vvdvcr8w7knz8bzf70r3ysnsgz3yv3b9p5dvsbjk"; }; nativeBuildInputs = [ unzip ];