From f7871d3433d0a614886394a7edf6b94332f6b300 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 2 Feb 2017 13:41:23 +0800 Subject: [PATCH 001/138] suil: 0.8.2 -> 0.8.4 We can now also build against qt5 but not qt4 and qt5 at the same time. --- .../libraries/audio/suil/default.nix | 23 +++++++++++++------ pkgs/top-level/all-packages.nix | 12 +++++++++- 2 files changed, 27 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 518f89092ab..8864d710174 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,15 +1,24 @@ -{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: +{ stdenv, lib, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom +, withQt4 ? true, qt4 ? null +, withQt5 ? false, qt5 ? null }: + +# I haven't found an XOR operator in nix... +assert withQt4 || withQt5; +assert !(withQt4 && withQt5); stdenv.mkDerivation rec { - name = "suil-${version}"; - version = "0.8.2"; + pname = "suil"; + version = "0.8.4"; + name = "${pname}-qt${if withQt4 then "4" else "5"}-${version}"; src = fetchurl { - url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"; + url = "http://download.drobilla.net/${pname}-${version}.tar.bz2"; + sha256 = "1kji3lhha26qr6xm9j8ic5c40zbrrb5qnwm2qxzmsfxgmrz29wkf"; }; - buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ]; + buildInputs = [ gtk2 lv2 pkgconfig python serd sord sratom ] + ++ (lib.optionals withQt4 [ qt4 ]) + ++ (lib.optionals withQt5 (with qt5; [ qtbase qttools ])); configurePhase = "python waf configure --prefix=$out"; @@ -21,7 +30,7 @@ stdenv.mkDerivation rec { homepage = http://drobilla.net/software/suil; description = "A lightweight C library for loading and wrapping LV2 plugin UIs"; license = licenses.mit; - maintainers = [ maintainers.goibhniu ]; + maintainers = with maintainers; [ goibhniu ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28668e0fc1c..c88e1d157fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9550,7 +9550,17 @@ with pkgs; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; - suil = callPackage ../development/libraries/audio/suil { }; + suil-qt4 = callPackage ../development/libraries/audio/suil { + withQt4 = true; + withQt5 = false; + }; + + suil-qt5 = callPackage ../development/libraries/audio/suil { + withQt4 = false; + withQt5 = true; + }; + + suil = suil-qt4; sutils = callPackage ../tools/misc/sutils { }; From 991c9da1d70d43242beee0251a6fa2752d3836c2 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 5 Feb 2017 12:48:24 +0800 Subject: [PATCH 002/138] ingen: 2016-10-29 -> 2017-01-18 This is needed to compile against suil 0.8.4 --- pkgs/applications/audio/ingen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 7f4bc0b3e9e..0b0df0b55e4 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { name = "ingen-unstable-${rev}"; - rev = "2016-10-29"; + rev = "2017-01-18"; src = fetchgit { url = "http://git.drobilla.net/cgit.cgi/ingen.git"; - rev = "fd147d0b888090bfb897505852c1f25dbdf77e18"; - sha256 = "1qmg79962my82c43vyrv5sxbqci9c7gc2s9bwaaqd0fcf08xcz1z"; + rev = "02ae3e9d8bf3f6a5e844706721aad8c0ac9f4340"; + sha256 = "15s8nrzn68hc2s6iw0zshbz3lfnsq0mr6gflq05xm911b7xbp74k"; }; buildInputs = [ From ae2932249edc58b3a95e5614497b83d60becefc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Facundo=20Dom=C3=ADnguez?= Date: Mon, 6 Feb 2017 17:18:15 -0300 Subject: [PATCH 003/138] spark: 1.6.0 -> 2.1.0 Tested in linux with: nix-env -f . -i spark-1.6.0 nix-env -f . -i spark cc @thoughtpolice @offlinehacker --- .../networking/cluster/spark/default.nix | 26 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index b4c20e22680..bdcb0a84625 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,22 +1,38 @@ { stdenv, fetchzip, makeWrapper, jre, pythonPackages , mesosSupport ? true, mesos +, version }: +let + versionMap = { + "1.6.0" = { + hadoopVersion = "cdh4"; + sparkSha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c"; + }; + "2.1.0" = { + hadoopVersion = "hadoop2.4"; + sparkSha256 = "0pbsmbjwijsfgbnm56kgwnmnlqkz3w010ma0d7vzlkdklj40vqn2"; + }; + }; +in + +with versionMap.${version}; + with stdenv.lib; stdenv.mkDerivation rec { - name = "spark-${version}"; - version = "1.6.0"; + + name = "spark-${version}"; src = fetchzip { - url = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz"; - sha256 = "19ycx1r8g82vkvzmn9wxkssmv2damrg72yfmrgzpc6xyh071g91c"; + url = "mirror://apache/spark/${name}/${name}-bin-${hadoopVersion}.tgz"; + sha256 = sparkSha256; }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] ++ optional mesosSupport mesos; - untarDir = "${name}-bin-cdh4"; + untarDir = "${name}-bin-${hadoopVersion}"; installPhase = '' mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java} mv * $out/lib/${untarDir} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d38479b26d5..53a6f253991 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5931,7 +5931,9 @@ with pkgs; self = callPackage_i686 ../development/interpreters/self { }; - spark = callPackage ../applications/networking/cluster/spark { }; + spark = spark_21; + spark_16 = callPackage ../applications/networking/cluster/spark { version = "1.6.0"; }; + spark_21 = callPackage ../applications/networking/cluster/spark { version = "2.1.0"; }; spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_17 = callPackage ../development/interpreters/spidermonkey/17.nix { }; From b09215bed57a434810b7772201f594420dbac379 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Tue, 7 Feb 2017 16:58:14 -0800 Subject: [PATCH 004/138] rakudo-star: 2016.07 -> 2017.01 --- pkgs/development/interpreters/rakudo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 210570ad846..83e8f1d0030 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "rakudo-star-${version}"; - version = "2016.07"; + version = "2017.01"; src = fetchurl { url = "http://rakudo.org/downloads/star/${name}.tar.gz"; - sha256 = "0czx7w1chf108mpyps7k7nqq8cbsy1rbb87ajms9xj65l4ywg8ka"; + sha256 = "07zjqdzxm30pmjqwlnr669d75bsbimy09sk0dvgm0pnn3zr92fjq"; }; buildInputs = [ icu zlib gmp readline perl ] @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = "http://www.rakudo.org"; license = licenses.artistic2; platforms = platforms.unix; - maintainers = [ maintainers.thoughtpolice maintainers.vrthra ]; + maintainers = with maintainers; [ thoughtpolice vrthra ]; }; } From 7001a125d2411cb2e0ba1c92c2466eaaa33aaf6a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 10 Feb 2017 03:16:10 +0100 Subject: [PATCH 005/138] lf: 2016-10-02 -> 2017-02-04 --- pkgs/tools/misc/lf/default.nix | 9 ++++----- pkgs/tools/misc/lf/deps.nix | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index 80b8457f07f..c54f8ebec0d 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,17 +2,16 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2016-10-02"; - - goPackagePath = "github.com/gokcehan/lf"; + version = "2017-02-04"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "7a851f6c720380a6b9f715542906a56334e7e98b"; # nightly - sha256 = "0hdxcibly3algz0hgy65xr3dxchf4aarpxdgxsgc67m1knizksjr"; + rev = "c55c4bf254d59c4e943d5559cd6e062652751e36"; # nightly + sha256 = "0jq85pfhpzdplv083mxbys7pp8igcvhp4daa9dh0yn4xbd8x821d"; }; + goPackagePath = "github.com/gokcehan/lf"; goDeps = ./deps.nix; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index ebd11853291..d3aff8de33c 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "b6acae516ace002cb8105a89024544a1480655a5"; # master - sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil"; + rev = "abe82ce5fb7a42fbd6784a5ceb71aff977e09ed8"; # master + sha256 = "156i8apkga8b3272kjhapyqwspgcfkrr9kpqwc5lii43k4swghpv"; }; } { @@ -13,8 +13,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "d6bea18f789704b5f83375793155289da36a3c7f"; # v0.0.1 - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + rev = "9e777a8366cce605130a531d2cd6363d07ad7317"; # v0.0.2 + sha256 = "0vkrfrz3fzn5n6ix4k8s0cg0b448459sldq8bp4riavsxm932jzb"; }; } ] From d04ee2f91cb4413d3fd6672e75e9f9677259d501 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 10 Feb 2017 12:11:29 +0100 Subject: [PATCH 006/138] libretro: add reicast core --- pkgs/misc/emulators/retroarch/cores.nix | 13 +++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 259a6007975..705150d4e20 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -248,6 +248,19 @@ in buildPhase = "make"; }; + reicast = (mkLibRetroCore rec { + core = "reicast"; + src = fetchRetro { + repo = core + "-emulator"; + rev = "ed47c72cf2e124d9d753285fd61d12ea8e071d0d"; + sha256 = "05dw7qjnprf1lw3ps0sb7sp73hsh1a27rxbwjqd26j85zr84g3r9"; + }; + description = "Reicast libretro port"; + extraBuildInputs = [ mesa ]; + }).override { + buildPhase = "make"; + }; + scummvm = (mkLibRetroCore rec { core = "scummvm"; src = fetchRetro { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 496d6e9e236..6c1d52f8c85 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15599,6 +15599,7 @@ with pkgs; ++ optional (cfg.enablePrboom or false) prboom ++ optional (cfg.enablePPSSPP or false) ppsspp ++ optional (cfg.enableQuickNES or false) quicknes + ++ optional (cfg.enableReicast or false) reicast ++ optional (cfg.enableScummVM or false) scummvm ++ optional (cfg.enableSnes9x or false) snes9x ++ optional (cfg.enableSnes9xNext or false) snes9x-next From 1713dae2e38cc31e5db5ea4dab728a8ce6a34092 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 10 Feb 2017 12:17:11 +0100 Subject: [PATCH 007/138] cdi2iso: init at 0.1 --- pkgs/tools/cd-dvd/cdi2iso/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/cd-dvd/cdi2iso/default.nix diff --git a/pkgs/tools/cd-dvd/cdi2iso/default.nix b/pkgs/tools/cd-dvd/cdi2iso/default.nix new file mode 100644 index 00000000000..a65f2d47d8f --- /dev/null +++ b/pkgs/tools/cd-dvd/cdi2iso/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "cdi2iso-${version}"; + version = "0.1"; + + src = fetchurl { + url = "mirror://sourceforge/cdi2iso.berlios/${name}-src.tar.gz"; + sha256 = "0fj2fxhpr26z649m0ph71378c41ljflpyk89g87x8r1mc4rbq3kh"; + }; + + installPhase = '' + mkdir -p $out/bin/ + cp cdi2iso $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A very simple utility for converting DiscJuggler images to the standard ISO-9660 format"; + homepage = https://sourceforge.net/projects/cdi2iso.berlios; + license = licenses.gpl2; + maintainers = with maintainers; [ hrdinka ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 496d6e9e236..5dbb9174117 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1092,6 +1092,8 @@ with pkgs; cdecl = callPackage ../development/tools/cdecl { }; + cdi2iso = callPackage ../tools/cd-dvd/cdi2iso { }; + cdrdao = callPackage ../tools/cd-dvd/cdrdao { }; cdrkit = callPackage ../tools/cd-dvd/cdrkit { }; From 349bc2e1e240241d5faef246da2451c2b0200321 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 10 Feb 2017 22:12:21 +0100 Subject: [PATCH 008/138] phpPackages.composer: 1.2.0 -> 1.3.2 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1808d65b75c..f0ebdf0096c 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -235,11 +235,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.2.0"; + version = "1.3.2"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "15chwfsqmwmhry3bv13a5y4ih1vzb0j8h1dfd49pnzzd8lai706w"; + sha256 = "0s85zglzwx5i0hw9zlpwy1385jink1g1lhdwhv59zdjblcd7ckva"; }; phases = [ "installPhase" ]; From 4f74f9158a474fec5940baf17b375597b514144b Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Fri, 10 Feb 2017 14:06:28 -0800 Subject: [PATCH 009/138] kakoune: 2016-12-30 -> 2017-02-09 --- pkgs/applications/editors/kakoune/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/kakoune/default.nix b/pkgs/applications/editors/kakoune/default.nix index 14b13c394f3..4590939b516 100644 --- a/pkgs/applications/editors/kakoune/default.nix +++ b/pkgs/applications/editors/kakoune/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "kakoune-nightly-${version}"; - version = "2016-12-30"; + version = "2017-02-09"; src = fetchFromGitHub { repo = "kakoune"; owner = "mawww"; - rev = "76c58aa022a896dc170c207ff821992ee354d934"; - sha256 = "0hgpcp6444cyg4bm0a9ypywjwfh19qpqpfr5w0wcd2y3clnsvsdz"; + rev = "9ba1665e58ee84b6596d89e6ef75f7c32e7c6c14"; + sha256 = "1l25mzq64a481qlsyh25rzp5rzajrkx4dq29677z85lnjqn30wbi"; }; buildInputs = [ ncurses boost asciidoc docbook_xsl libxslt ]; From 564e0c120be9f317a7c43eb246882065b1909c67 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Fri, 10 Feb 2017 17:35:52 -0500 Subject: [PATCH 010/138] kde4, kdm: mark services as deprecated --- nixos/modules/services/x11/desktop-managers/kde4.nix | 3 +++ nixos/modules/services/x11/display-managers/kdm.nix | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 3aa4821a052..f0de9120c69 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -87,6 +87,9 @@ in config = mkIf (xcfg.enable && cfg.enable) { + warnings = [ + "KDE4 is long unmaintained and will be removed. Please update to KDE5." + ]; # If KDE 4 is enabled, make it the default desktop manager (unless # overridden by the user's configuration). diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index 04701a1640c..bfb763f2858 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -35,7 +35,7 @@ let ${optionalString (cfg.setupScript != "") '' Setup=${cfg.setupScript} - ''} + ''} [X-*-Greeter] HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers} @@ -128,6 +128,9 @@ in ###### implementation config = mkIf cfg.enable { + warnings = [ + "KDM is long unmaintained and will be removed. Please update to SDDM." + ]; services.xserver.displayManager.slim.enable = false; From d4bf624f968fa7b94988080be231285a95ea2ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 11 Feb 2017 12:47:15 +0100 Subject: [PATCH 011/138] nixos manual: add grub option to avoid #21830 Close #22659. vcunat edited this slightly. --- nixos/doc/manual/configuration/luks-file-systems.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/doc/manual/configuration/luks-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml index 2062456703f..00c795cd089 100644 --- a/nixos/doc/manual/configuration/luks-file-systems.xml +++ b/nixos/doc/manual/configuration/luks-file-systems.xml @@ -37,6 +37,10 @@ boot.initrd.luks.devices.crypted.device = "/dev/disk/by-uuid/3f6b0024-3a44-4fde- fileSystems."/".device = "/dev/mapper/crypted"; +Should grub be used as bootloader, and /boot is located +on an encrypted partition, it is necessary to add the following grub option: +boot.loader.grub.enableCryptodisk = true; + From 980565bca078e6a8754990c3ea610aaf3c69dfa1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Feb 2017 13:46:42 +0100 Subject: [PATCH 012/138] smtube: 16.7.2 -> 17.1.0 --- pkgs/applications/video/smtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix index 5026e6c4831..ea0bd083b1d 100644 --- a/pkgs/applications/video/smtube/default.nix +++ b/pkgs/applications/video/smtube/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }: stdenv.mkDerivation rec { - version = "16.7.2"; + version = "17.1.0"; name = "smtube-${version}"; src = fetchurl { url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2"; - sha256 = "0k64hc6grn4nlp739b0w5fznh0k9xx9qdwx6s7w3fb5m5pfkdrmm"; + sha256 = "1kg45qkr7nvchy9ih24vlbpkn6vd8v8qw5xqsjhjpjkizcmzaa61"; }; makeFlags = [ From c4a47bdb5e5c17e93b3be0f0257b919e8892231e Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sat, 11 Feb 2017 13:49:33 +0100 Subject: [PATCH 013/138] libretro: add mednafen-saturn core --- pkgs/misc/emulators/retroarch/cores.nix | 12 ++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 259a6007975..775fc21a3db 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -170,6 +170,18 @@ in buildPhase = "make"; }; + mednafen-saturn = (mkLibRetroCore rec { + core = "mednafen-saturn"; + src = fetchRetro { + repo = "beetle-saturn-libretro"; + rev = "bb5d0c126feb25cf980f5cc1fc57d6a5a6f6e7ab"; + sha256 = "0bnsdy27378b71y6aa65k4jxxy2xw6ky2ici3z53hkky2jnnjq0b"; + }; + description = "Port of Mednafen's Saturn core to libretro"; + }).override { + buildPhase = "make"; + }; + mupen64plus = (mkLibRetroCore rec { core = "mupen64plus"; src = fetchRetro { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 105890e654a..c8c3207327f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15598,6 +15598,7 @@ with pkgs; ++ optional (cfg.enableMAME or false) mame ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast ++ optional (cfg.enableMednafenPSX or false) mednafen-psx + ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enablePicodrive or false) picodrive From 44641997799d97f7aea83d8c8e01334197273b3a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Feb 2017 13:55:07 +0100 Subject: [PATCH 014/138] smplayer: 17.1.0 -> 17.2.0 --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 0801dc8573d..9c2f6d04119 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qmakeHook, qtscript }: stdenv.mkDerivation rec { - name = "smplayer-17.1.0"; + name = "smplayer-17.2.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "0wgw940gxf3gqh6xzxvz037ipvr1xcw86gf0myvpb4lkwqh5jds0"; + sha256 = "05nqwpyh3zlyzip7chs711sz97cgijb92h44cd5aqbwbx06hihdd"; }; buildInputs = [ qtscript ]; From 5712ac6a721879f481dc0d2955cc3d99fca38320 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 Jan 2017 06:35:57 +0000 Subject: [PATCH 015/138] coqPackages.{ssreflect,mathcomp}: 1.6 -> 1.6.1 --- pkgs/development/coq-modules/mathcomp/default.nix | 11 +---------- pkgs/development/coq-modules/mathcomp/generic.nix | 7 ++----- pkgs/development/coq-modules/ssreflect/default.nix | 11 +---------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/pkgs/development/coq-modules/mathcomp/default.nix b/pkgs/development/coq-modules/mathcomp/default.nix index dba6a3abbea..a80c934c6c1 100644 --- a/pkgs/development/coq-modules/mathcomp/default.nix +++ b/pkgs/development/coq-modules/mathcomp/default.nix @@ -1,20 +1,11 @@ { callPackage, fetchurl, coq }: let param = - let v16 = { - version = "1.6"; - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; v161 = { + { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; in -{ - "8.4" = v16; - "8.5" = v16; - "8.6" = v161; -}."${coq.coq-version}"; in callPackage ./generic.nix { name = "coq${coq.coq-version}-mathcomp-${param.version}"; diff --git a/pkgs/development/coq-modules/mathcomp/generic.nix b/pkgs/development/coq-modules/mathcomp/generic.nix index 1c150c9e69f..564cb6f6571 100644 --- a/pkgs/development/coq-modules/mathcomp/generic.nix +++ b/pkgs/development/coq-modules/mathcomp/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ssreflect, ncurses, which +{ stdenv, fetchurl, coq, ncurses, which , graphviz, withDoc ? false , src, name }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { nativeBuildInputs = stdenv.lib.optionals withDoc [ graphviz ]; buildInputs = [ coq.ocaml coq.findlib coq.camlp5 ncurses which ]; - propagatedBuildInputs = [ coq ssreflect ]; + propagatedBuildInputs = [ coq ]; enableParallelBuilding = true; @@ -24,9 +24,6 @@ stdenv.mkDerivation { installPhase = '' make -f Makefile.coq COQLIB=$out/lib/coq/${coq.coq-version}/ install - rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect* - rm -fr $out/lib/coq/${coq.coq-version}/user-contrib/ssrmatching.cmi - rm -fr $out/share/coq/${coq.coq-version}/user-contrib/mathcomp/ssreflect* '' + stdenv.lib.optionalString withDoc '' make -f Makefile.coq install-doc DOCDIR=$out/share/coq/${coq.coq-version}/ ''; diff --git a/pkgs/development/coq-modules/ssreflect/default.nix b/pkgs/development/coq-modules/ssreflect/default.nix index 18eafe5e9c2..352b98ab88b 100644 --- a/pkgs/development/coq-modules/ssreflect/default.nix +++ b/pkgs/development/coq-modules/ssreflect/default.nix @@ -1,20 +1,11 @@ { callPackage, fetchurl, coq }: let param = - let v16 = { - version = "1.6"; - url = http://ssr.msr-inria.inria.fr/FTP/mathcomp-1.6.tar.gz; - sha256 = "0adr556032r1jkvphbpfvrrv041qk0yqb7a1xnbam52ji0mdl2w8"; - }; v161 = { + { version = "1.6.1"; url = https://github.com/math-comp/math-comp/archive/mathcomp-1.6.1.tar.gz; sha256 = "1j9ylggjzrxz1i2hdl2yhsvmvy5z6l4rprwx7604401080p5sgjw"; }; in -{ - "8.4" = v16; - "8.5" = v16; - "8.6" = v161; -}."${coq.coq-version}"; in callPackage ./generic.nix { name = "coq${coq.coq-version}-ssreflect-${param.version}"; From dedba2a32d39bebe94ed5d3268616eabd53ed26b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 Jan 2017 06:52:23 +0000 Subject: [PATCH 016/138] coqPackages.coquelicot: 2.1.1 -> 2.1.2 keeping old 2.1.1 version for Coq-8.4, as newer versions of the library do not support older Coq versions --- .../coq-modules/coquelicot/default.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/coquelicot/default.nix b/pkgs/development/coq-modules/coquelicot/default.nix index a57686177c4..a81b76849bc 100644 --- a/pkgs/development/coq-modules/coquelicot/default.nix +++ b/pkgs/development/coq-modules/coquelicot/default.nix @@ -1,11 +1,26 @@ { stdenv, fetchurl, which, coq, ssreflect }: -stdenv.mkDerivation { - name = "coq${coq.coq-version}-coquelicot-2.1.1"; - src = fetchurl { +let param = + let + v2_1_1 = { + version = "2.1.1"; url = https://gforge.inria.fr/frs/download.php/file/35429/coquelicot-2.1.1.tar.gz; sha256 = "1wxds73h26q03r2xiw8shplh97rsbim2i2s0r7af0fa490bp44km"; }; + v2_1_2 = { + version = "2.1.2"; + url = https://gforge.inria.fr/frs/download.php/file/36320/coquelicot-2.1.2.tar.gz; + sha256 = "09q9xbzyndx8i68hn3ir4pmzgqd1q33qpk3xghf2l849g8w3q5an"; + }; + in { + "8.4" = v2_1_1; + "8.5" = v2_1_2; + "8.6" = v2_1_2; +}."${coq.coq-version}"; in + +stdenv.mkDerivation { + name = "coq${coq.coq-version}-coquelicot-${param.version}"; + src = fetchurl { inherit (param) url sha256; }; nativeBuildInputs = [ which ]; buildInputs = [ coq ]; From 8bfce240457124eef57edab73faaea7c059ad722 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 28 Jan 2017 06:54:33 +0000 Subject: [PATCH 017/138] coqPackages.interval: 2.2.1 -> 3.1.1 --- pkgs/development/coq-modules/interval/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix index f367dad1fca..e07c7c80ac0 100644 --- a/pkgs/development/coq-modules/interval/default.nix +++ b/pkgs/development/coq-modules/interval/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, which, coq, coquelicot, flocq, mathcomp }: stdenv.mkDerivation { - name = "coq-interval-${coq.coq-version}-2.2.1"; + name = "coq${coq.coq-version}-interval-3.1.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/35431/interval-2.2.1.tar.gz; - sha256 = "1i6v7da9mf6907sa803xa0llsf9lj4akxbrl8rma6gsdgff2d78n"; + url = https://gforge.inria.fr/frs/download.php/file/36342/interval-3.1.1.tar.gz; + sha256 = "0jzkb0xykiz9bfaminy9yd88b5w0gxcpw506yaaqmnmb43gdksyf"; }; nativeBuildInputs = [ which ]; From 8ea925b2404ac7b4d22ea3a3ec69241b757e7fb2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 13:26:17 +0100 Subject: [PATCH 018/138] ansible_2_1: windowsSupport off by default --- pkgs/development/python-modules/ansible/2.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/2.1.nix b/pkgs/development/python-modules/ansible/2.1.nix index 5af0837387d..077bfa198aa 100644 --- a/pkgs/development/python-modules/ansible/2.1.nix +++ b/pkgs/development/python-modules/ansible/2.1.nix @@ -10,7 +10,8 @@ , six , netaddr , dns -, pywinrm +, windowsSupport ? false +, pywinrm ? null }: let @@ -43,7 +44,6 @@ in buildPythonPackage rec { dontStrip = true; dontPatchELF = true; dontPatchShebangs = false; - windowsSupport = true; propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; From 1ba17987f7bb1439791af8cf2b2d373ca00d8e09 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 13:26:52 +0100 Subject: [PATCH 019/138] ansible_2_2: windows support off by default this was accidentally enabled when moving the expression. --- pkgs/development/python-modules/ansible/2.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/2.2.nix b/pkgs/development/python-modules/ansible/2.2.nix index 48a325fec33..d62c1e74822 100644 --- a/pkgs/development/python-modules/ansible/2.2.nix +++ b/pkgs/development/python-modules/ansible/2.2.nix @@ -10,7 +10,8 @@ , six , netaddr , dns -, pywinrm +, windowsSupport ? false +, pywinrm ? null }: let @@ -44,7 +45,6 @@ in buildPythonPackage rec { dontStrip = true; dontPatchELF = true; dontPatchShebangs = false; - windowsSupport = true; propagatedBuildInputs = [ pycrypto paramiko jinja pyyaml httplib2 boto six netaddr dns ] ++ lib.optional windowsSupport pywinrm; From 6cf3667bc91913556bd1dd905088cab811a830bb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 13:27:18 +0100 Subject: [PATCH 020/138] pythonPackages.cinderclient: mark as broken The whole python openstack needs some maintenance... --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0588ab5b3e2..88ee5425f88 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17036,6 +17036,7 @@ in { meta = with stdenv.lib; { description = "Python bindings to the OpenStack Cinder API"; homepage = "http://www.openstack.org/"; + broken = true; }; }; From e655ab08ee95b1563599539212798c8cfcd1d207 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 13:28:24 +0100 Subject: [PATCH 021/138] pythonPackages.ryu: mark as broken --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88ee5425f88..fc1f676ecf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -17316,6 +17316,8 @@ in { url = "mirror://pypi/r/ryu/${name}.tar.gz"; sha256 = "1fhriqi7qnvvx9mbvlfm94i5drh920lg204zy3v0qjz43sinkih6"; }; + + meta.broken = true; }; WSME = buildPythonPackage rec { From 049a031e34f0855acbff260569979b6a6aecb6fb Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 14:13:36 +0100 Subject: [PATCH 022/138] pythonPackages.paramiko: 2.0.2 -> 2.1.1 --- pkgs/top-level/python-packages.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc1f676ecf8..c25be593e27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18078,15 +18078,16 @@ in { }; paramiko = buildPythonPackage rec { - name = "paramiko-${version}"; - version = "2.0.2"; + pname = "paramiko"; + version = "2.1.1"; + name = "${pname}-${version}"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/paramiko/${name}.tar.gz"; - sha256 = "1p21s7psqj18k9a97nq26yas058i5ivzk7pi7y98l1rbl87zj6s1"; + src = fetchPypi { + inherit pname version; + sha256 = "0xdmamqgx2ymhdm46q8flpj4fncj4wv2dqxzz0bc2dh7mnkss7fm"; }; - propagatedBuildInputs = with self; [ cryptography cryptography_vectors ]; + propagatedBuildInputs = with self; [ cryptography pyasn1 ]; # https://github.com/paramiko/paramiko/issues/449 doCheck = !(isPyPy || isPy33); From 20578372e1e72a19e9c42e31d1f21cd8a3b6df39 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 11 Feb 2017 15:53:01 +0200 Subject: [PATCH 023/138] U-Boot: Fix ubootBananaPi & ubootPcduino3Nano by adding python2 Also enable parallel building. --- pkgs/misc/uboot/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 6179f05d42b..f0ec5f483d4 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bc, dtc }: +{ stdenv, fetchurl, bc, dtc, python2 }: let buildUBoot = { targetPlatforms @@ -17,7 +17,7 @@ let sha256 = "1wpc51jm3zyibgcr78jng2yksqvrya76bxgsr4pcyjrsz5sm2hkc"; }; - nativeBuildInputs = [ bc dtc ]; + nativeBuildInputs = [ bc dtc python2 ]; hardeningDisable = [ "all" ]; @@ -34,6 +34,7 @@ let runHook postInstall ''; + enableParallelBuilding = true; dontStrip = true; crossAttrs = { From e2834ca6113acc263ea7ed857fc1cdcf509510e2 Mon Sep 17 00:00:00 2001 From: Lprndn Date: Sat, 4 Feb 2017 18:30:00 +0100 Subject: [PATCH 024/138] Sile: Init at 0.9.4 --- pkgs/tools/typesetting/sile/default.nix | 48 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/typesetting/sile/default.nix diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix new file mode 100644 index 00000000000..890103a0f98 --- /dev/null +++ b/pkgs/tools/typesetting/sile/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig +, harfbuzz, icu, lpeg, luaexpat, luazlib, luafilesystem +, fontconfig, lua, libiconv +}: + +with stdenv.lib; + +let + + libs = [lpeg luaexpat luazlib luafilesystem]; + getPath = lib : type : "${lib}/lib/lua/${lua.luaversion}/?.${type};${lib}/share/lua/${lua.luaversion}/?.${type}"; + getLuaPath = lib : getPath lib "lua"; + getLuaCPath = lib : getPath lib "so"; + luaPath = concatStringsSep ";" (map getLuaPath libs); + luaCPath = concatStringsSep ";" (map getLuaCPath libs); + in + + stdenv.mkDerivation rec { + name = "sile-${version}"; + version = "0.9.4"; + src = fetchurl { + url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w"; + }; + + nativeBuildInputs = [pkgconfig makeWrapper]; + buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ]; + + LUA_PATH = luaPath; + LUA_CPATH = luaCPath; + + postInstall = '' + wrapProgram $out/bin/sile \ + --set LUA_PATH "${luaPath};" \ + --set LUA_CPATH "${luaCPath};" \ + ''; + + meta = { + description = "A typesetting system"; + longDescription = '' + SILE is a typesetting system; its job is to produce beautiful printed documents. + Conceptually, SILE is similar to TeX—from which it borrows some concepts and even syntax and algorithms—but the similarities end there. Rather than being a derivative of the TeX family SILE is a new typesetting and layout engine written from the ground up using modern technologies and borrowing some ideas from graphical systems such as InDesign. + ''; + homepage = "http://www.sile-typesetter.org"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b7b5cd5599..96420aeb048 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3805,6 +3805,10 @@ with pkgs; silc_server = callPackage ../servers/silc-server { }; + sile = callPackage ../tools/typesetting/sile { + inherit (lua52Packages) lua luaexpat luazlib luafilesystem lpeg; + }; + silver-searcher = callPackage ../tools/text/silver-searcher { }; ag = self.silver-searcher; From 9550686be85b70be95967fbfcb4293ad3f44206b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sat, 11 Feb 2017 22:48:18 +0800 Subject: [PATCH 025/138] subsurface: 4.5.97 -> 4.6.0 (#22615) We do a few more things: - libmarble and libdivecomputer with the subsurface patches have both been inlined for 2 reasons: a) nobody else is using these forks b) they need to be updated in lockstep with subsurface - instead of building libmarble against qtquick1, we now build using qtquickcontrols (qtquick2) - getting rid of qtquick1 also allows us to use the default qt (currently 5.6) - we get rid of some hacks to deal with library dependencies - instead of manually overriding various phases, we simply use cmakeFlags to pass proper parameters --- pkgs/applications/misc/subsurface/default.nix | 103 +++++++++++++----- .../libraries/libdivecomputer/subsurface.nix | 25 ----- .../libraries/libmarble-ssrf/default.nix | 33 ------ pkgs/top-level/all-packages.nix | 8 +- 4 files changed, 76 insertions(+), 93 deletions(-) delete mode 100644 pkgs/development/libraries/libdivecomputer/subsurface.nix delete mode 100644 pkgs/development/libraries/libmarble-ssrf/default.nix diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index 06b367fa6e7..bb23f46d733 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,49 +1,97 @@ { stdenv, - cmake, + cmake, doxygen, pkgconfig, autoreconfHook, curl, fetchgit, grantlee, - libdivecomputer, libgit2, - libmarble-ssrf, + libusb, libssh2, libxml2, libxslt, libzip, - pkgconfig, - qtbase, - qtconnectivity, - qttools, - qtwebkit, + qtbase, qtconnectivity, qtquickcontrols, qtscript, qtsvg, qttools, qtwebkit, sqlite }: -stdenv.mkDerivation rec { - version = "4.5.97"; +let + version = "4.6.0"; + + libmarble = stdenv.mkDerivation rec { + name = "libmarble-ssrf-${version}"; + + src = fetchgit { + url = "git://git.subsurface-divelog.org/marble"; + rev = "refs/tags/v${version}"; + sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; + }; + + buildInputs = [ qtbase qtquickcontrols qtscript qtwebkit ]; + nativeBuildInputs = [ doxygen pkgconfig cmake ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DQTONLY=TRUE" + "-DQT5BUILD=ON" + "-DBUILD_MARBLE_TESTS=NO" + "-DWITH_DESIGNER_PLUGIN=NO" + "-DBUILD_MARBLE_APPS=NO" + ]; + + meta = with stdenv.lib; { + description = "Qt library for a slippy map with patches from the Subsurface project"; + homepage = http://subsurface-divelog.org; + license = licenses.lgpl21; + maintainers = with maintainers; [ mguentner ]; + platforms = platforms.all; + }; + }; + + libdc = stdenv.mkDerivation rec { + name = "libdivecomputer-ssrf-${version}"; + + src = fetchgit { + url = "git://subsurface-divelog.org/libdc"; + rev = "refs/tags/v${version}"; + sha256 = "0s82c8bvqph9c9chwzd76iwrw968w7lgjm3pj4hmad1jim67bs6n"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.libdivecomputer.org; + description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; + maintainers = with maintainers; [ mguentner ]; + license = licenses.lgpl21; + platforms = platforms.all; + }; + }; + +in stdenv.mkDerivation rec { name = "subsurface-${version}"; src = fetchgit { - sha256 = "035ywhicadmr9sh7zhfxsvpchwa9sywccacbspfam39n2hpyqnmm"; - url = "git://git.subsurface-divelog.org/subsurface"; - rev = "72bcb6481f3b935444d7868a74599dda133f9b43"; - branchName = "master"; + url = "git://git.subsurface-divelog.org/subsurface"; + rev = "refs/tags/v${version}"; + sha256 = "1rk5n52p6cnyjrgi7ybhmvh7y31zxrjny0mqpnc1wql69f90h94c"; }; - buildInputs = [ qtbase libdivecomputer libmarble-ssrf libxslt - libzip libxml2 grantlee qtwebkit qttools - qtconnectivity libgit2 libssh2 curl ]; - nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ + libdc libmarble + curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip + qtbase qtconnectivity qtsvg qttools qtwebkit + ]; + nativeBuildInputs = [ cmake pkgconfig ]; - #enableParallelBuilding = true; # fatal error: ui_mainwindow.h: No such file or directory + enableParallelBuilding = true; - # hack incoming... - preConfigure = '' - marble_libs=$(echo $(echo $CMAKE_LIBRARY_PATH | grep -o "/nix/store/[[:alnum:]]*-libmarble-ssrf-[a-zA-Z0-9\-]*/lib")/libssrfmarblewidget.so) - cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Debug \ - -DMARBLE_LIBRARIES=$marble_libs \ - -DNO_PRINTING=OFF" - ''; + cmakeFlags = [ + "-DMARBLE_LIBRARIES=${libmarble}/lib/libssrfmarblewidget.so" + "-DNO_PRINTING=OFF" + ]; meta = with stdenv.lib; { description = "Subsurface is an open source divelog program that runs on Windows, Mac and Linux"; @@ -55,8 +103,7 @@ stdenv.mkDerivation rec { ''; homepage = https://subsurface-divelog.org; license = licenses.gpl2; - maintainers = [ maintainers.mguentner ]; + maintainers = with maintainers; [ mguentner ]; platforms = platforms.all; }; - } diff --git a/pkgs/development/libraries/libdivecomputer/subsurface.nix b/pkgs/development/libraries/libdivecomputer/subsurface.nix deleted file mode 100644 index 5840ea2ef85..00000000000 --- a/pkgs/development/libraries/libdivecomputer/subsurface.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchgit, autoreconfHook }: - -stdenv.mkDerivation rec { - name = "libdivecomputer-${version}"; - version = "ssrf-0.5.0"; - - src = fetchgit { - url = "git://subsurface-divelog.org/libdc"; - rev = "534dd2f34b8271b2a1cac0e3151bfdc81da40e47"; - branchName = "Subsurface-branch"; - sha256 = "0iw9pczmwqlfjlgrik79b2pd4lmipxhjzj60ysk8qzl3axadjycp"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = http://www.libdivecomputer.org; - description = "A cross-platform and open source library for communication with dive computers from various manufacturers"; - maintainers = [ maintainers.mguentner ]; - license = licenses.lgpl21; - platforms = platforms.all; - }; -} diff --git a/pkgs/development/libraries/libmarble-ssrf/default.nix b/pkgs/development/libraries/libmarble-ssrf/default.nix deleted file mode 100644 index 1d6c5413439..00000000000 --- a/pkgs/development/libraries/libmarble-ssrf/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ stdenv, fetchgit, doxygen, pkgconfig, cmake, qtbase, qtscript, qtquick1 }: - -stdenv.mkDerivation rec { - name = "libmarble-ssrf-${version}"; - version = "2016-11-09"; - - src = fetchgit { - sha256 = "1dm2hdk6y36ls7pxbzkqmyc46hdy2cd5f6pkxa6nfrbhvk5f31zd"; - url = "git://git.subsurface-divelog.org/marble"; - rev = "4325da93b7516abb6f93a1417adc10593dacd794"; - }; - - buildInputs = [ qtbase qtscript qtquick1 ]; - nativeBuildInputs = [ doxygen pkgconfig cmake ]; - - enableParallelBuilding = true; - - preConfigure = '' - cmakeFlags="$cmakeFlags -DCMAKE_BUILD_TYPE=Release \ - -DQTONLY=TRUE -DQT5BUILD=ON \ - -DBUILD_MARBLE_TESTS=NO \ - -DWITH_DESIGNER_PLUGIN=NO \ - -DBUILD_MARBLE_APPS=NO" - ''; - - meta = with stdenv.lib; { - description = "Qt library for a slippy map with patches from the Subsurface project"; - homepage = "http://subsurface-divelog.org"; - license = licenses.lgpl21; - maintainers = [ maintainers.mguentner ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 96420aeb048..98dbd70fe96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2488,8 +2488,6 @@ with pkgs; makebootfat = callPackage ../tools/misc/makebootfat { }; - libmarble-ssrf = qt55.callPackage ../development/libraries/libmarble-ssrf { }; - matrix-synapse = callPackage ../servers/matrix-synapse { }; memtester = callPackage ../tools/system/memtester { }; @@ -3904,9 +3902,7 @@ with pkgs; su-exec = callPackage ../tools/security/su-exec {}; - subsurface = qt55.callPackage ../applications/misc/subsurface { - libdivecomputer = libdivecomputer_ssrf; - }; + subsurface = qt5.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -8004,8 +8000,6 @@ with pkgs; libdivecomputer = callPackage ../development/libraries/libdivecomputer { }; - libdivecomputer_ssrf = callPackage ../development/libraries/libdivecomputer/subsurface.nix { }; - libdivsufsort = callPackage ../development/libraries/libdivsufsort { }; libdmtx = callPackage ../development/libraries/libdmtx { }; From bab37c73ac14e91c9fda22a1e7a7b54ffd2e9a7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 15:33:24 +0100 Subject: [PATCH 026/138] nvidia-x11: undo parallel building In ffc498c4900bbc993b88ef5525698e06fd91beca -j$NIX_BUILD_JOBS was added. Somehow this caused my machine to run many many more parallel jobs than it was supposed to, freezing the system. If you don't experience this, feel free to revert. --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 98858c4c985..523396faf3d 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -21,7 +21,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_JOBS + make SYSSRC=$sysSrc SYSOUT=$sysOut module cd .. fi From bbbd3c09701500c0d322f24c840e453a2973bf5f Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 11 Feb 2017 15:52:50 +0100 Subject: [PATCH 027/138] sile: minor cleanup --- pkgs/tools/typesetting/sile/default.nix | 28 ++++++++++++++++--------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 890103a0f98..382219a0a3a 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -13,15 +13,17 @@ let getLuaCPath = lib : getPath lib "so"; luaPath = concatStringsSep ";" (map getLuaPath libs); luaCPath = concatStringsSep ";" (map getLuaCPath libs); - in - stdenv.mkDerivation rec { - name = "sile-${version}"; - version = "0.9.4"; - src = fetchurl { - url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; - sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w"; - }; +in + +stdenv.mkDerivation rec { + name = "sile-${version}"; + version = "0.9.4"; + + src = fetchurl { + url = "https://github.com/simoncozens/sile/releases/download/v${version}/${name}.tar.bz2"; + sha256 = "1mald727hy9bi17rcaph8q400yn5xqkn5f2xf1408g94wmwncs8w"; + }; nativeBuildInputs = [pkgconfig makeWrapper]; buildInputs = [ harfbuzz icu lua lpeg luaexpat luazlib luafilesystem fontconfig libiconv ]; @@ -38,8 +40,14 @@ let meta = { description = "A typesetting system"; longDescription = '' - SILE is a typesetting system; its job is to produce beautiful printed documents. - Conceptually, SILE is similar to TeX—from which it borrows some concepts and even syntax and algorithms—but the similarities end there. Rather than being a derivative of the TeX family SILE is a new typesetting and layout engine written from the ground up using modern technologies and borrowing some ideas from graphical systems such as InDesign. + SILE is a typesetting system; its job is to produce beautiful + printed documents. Conceptually, SILE is similar to TeX—from + which it borrows some concepts and even syntax and + algorithms—but the similarities end there. Rather than being a + derivative of the TeX family SILE is a new typesetting and + layout engine written from the ground up using modern + technologies and borrowing some ideas from graphical systems + such as InDesign. ''; homepage = "http://www.sile-typesetter.org"; platforms = stdenv.lib.platforms.unix; From 0b7fec62726613b2c9703cfa43dd8c440ad7da75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 11 Feb 2017 17:46:00 +0100 Subject: [PATCH 028/138] knot-resolver: maintenance 1.2.1 -> 1.2.2 In particular, trust anchor bootstrapping is fixed after IANA publishing an additional key. --- pkgs/servers/dns/knot-resolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index 6b4f1522e21..b74f50beb61 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { name = "knot-resolver-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "http://secure.nic.cz/files/knot-resolver/${name}.tar.xz"; - sha256 = "1b6f55ea1dfec90f45c437f23e1ab440e478570498161d0f8a8f94a439305f8c"; + sha256 = "89ab2ac8058b297c1f73f1c12e0f16d6e160aa86363e99ffa590bee7fe307931"; }; outputs = [ "out" "dev" ]; From 45b1d0cb8cc153f83c47ef2ab6c8ba351b6367a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 11 Feb 2017 17:51:57 +0100 Subject: [PATCH 029/138] knot-dns: maintenance 2.4.0 -> 2.4.1 --- pkgs/servers/dns/knot-dns/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index c7b2032a579..cba21fbeb8e 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,20 +5,13 @@ # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { name = "knot-dns-${version}"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { url = "http://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "0y9nhp9lfmxv4iy1xg7l4lfxv4168qhag26wwg0dbi0zjpkd790b"; + sha256 = "c064ddf99bf5fc24dd3c6a3a523394760357e204c8b69f0e691e49bc0d9b704c"; }; - patches = stdenv.lib.optional stdenv.isDarwin - (fetchpatch { - name = "before-sierra.diff"; - url = "https://gitlab.labs.nic.cz/labs/knot/merge_requests/664.diff"; - sha256 = "0g4gm2m3pi0lfpkp53xayf6jq6yn3ifidh40maiy1a46dfadvw6w"; - }); - outputs = [ "bin" "out" "dev" ]; nativeBuildInputs = [ pkgconfig ]; From a749b73ff8fd88a98417659cce37ce194f2c0a7c Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Sun, 29 Jan 2017 21:35:49 +0000 Subject: [PATCH 030/138] ne: migrate from (broken) tetex to texlive related: #21770. vcunat re-indented the longDescription. --- pkgs/applications/editors/ne/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/ne/default.nix b/pkgs/applications/editors/ne/default.nix index c7dbff366db..7feb7f22e22 100644 --- a/pkgs/applications/editors/ne/default.nix +++ b/pkgs/applications/editors/ne/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ncurses, texinfo, tetex, perl, ghostscript }: +{ stdenv, fetchFromGitHub, ncurses, texinfo, texlive, perl, ghostscript }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "05inzhlqlf4ka22q78q389pr34bsb4lgp1i5qh550vjkb2cvbdfp"; }; - buildInputs = [ ncurses tetex texinfo perl ghostscript ]; + buildInputs = [ ncurses texlive.combined.scheme-medium texinfo perl ghostscript ]; dontBuild = true; installPhase = '' substituteInPlace src/makefile --replace "CC=c99" "cc=gcc" @@ -20,14 +20,15 @@ stdenv.mkDerivation rec { cd src && make && cd .. make PREFIX=$out install ''; - + meta = { description = "The nice editor"; homepage = https://github.com/vigna/ne; longDescription = '' - ne is a free (GPL'd) text editor based on the POSIX standard that runs (we hope) on almost any -UN*X machine. ne is easy to use for the beginner, but powerful and fully configurable for the wizard, -and most sparing in its resource usage. See the manual for some highlights of ne's features. + ne is a free (GPL'd) text editor based on the POSIX standard that runs + (we hope) on almost any UN*X machine. ne is easy to use for the beginner, + but powerful and fully configurable for the wizard, and most sparing in its + resource usage. See the manual for some highlights of ne's features. ''; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; From b9d6a6cbd0437c5482e5805594ed62394c74bdca Mon Sep 17 00:00:00 2001 From: Langston Barrett Date: Sun, 29 Jan 2017 21:36:26 +0000 Subject: [PATCH 031/138] enblend-enfuse: migrate from (broken) tetex to texlive related: #21770 --- pkgs/tools/graphics/enblend-enfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index 00cc5e385fe..2a0796699fb 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra -, help2man, pkgconfig, perl, tetex }: +, help2man, pkgconfig, perl, texlive }: stdenv.mkDerivation rec { name = "enblend-enfuse-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ]; - nativeBuildInputs = [ help2man perl pkgconfig tetex ]; + nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ]; preConfigure = '' patchShebangs src/embrace From 2aff29c7b202725933dd5306eed4241fe86be0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 11 Feb 2017 18:09:43 +0100 Subject: [PATCH 032/138] tex4ht: deprecate in favor of texlive.tex4ht I don't make an alias, as the attribute is used in a different way. --- pkgs/tools/typesetting/tex/tex4ht/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix index 5aaae2c06b2..6f387b5bf8b 100644 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ b/pkgs/tools/typesetting/tex/tex4ht/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { description = "A system to convert (La)TeX documents to HTML and various other formats"; license = stdenv.lib.licenses.lppl12; platforms = stdenv.lib.platforms.unix; + broken = true; # use the one from texlive.tex4ht }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98dbd70fe96..317903b4988 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17815,7 +17815,7 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi {}; - tex4ht = callPackage ../tools/typesetting/tex/tex4ht { }; + tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = null; }; texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; From a7096107f34535f4f730c38f86708ad98a3df942 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 18:18:27 +0100 Subject: [PATCH 033/138] audacious: 3.8 -> 3.8.2 --- pkgs/applications/audio/audacious/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index e9d7b5da79a..6d4b18e29b0 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "audacious-${version}"; - version = "3.8"; + version = "3.8.2"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; - sha256 = "0rpdzf9pb52lcswxypwh4nq3qkjzliw42v39nm5rlwwxdq6bm99q"; + sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; - sha256 = "0j9svdqdjvj5spx1vfp0m63xh8xwk8naqsikdxfxbb68xk33rxb9"; + sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq"; }; nativeBuildInputs = [ From c512ba7e7e8cbd19737b659fb6edb9baaa75f174 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 11 Feb 2017 18:19:17 +0100 Subject: [PATCH 034/138] audaciousQt5: 3.8.1 -> 3.8.2, rename to audacious-qt5 The name is changed as well so it won't upgrade from the gtk3 version. --- pkgs/applications/audio/audacious/qt-5.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix index b86efe7eb97..663e0eb0cc8 100644 --- a/pkgs/applications/audio/audacious/qt-5.nix +++ b/pkgs/applications/audio/audacious/qt-5.nix @@ -10,23 +10,23 @@ }: let - version = "3.8.1"; + version = "3.8.2"; sources = { "audacious-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "1k9blmgqia0df18l39bd2bbcwmjfxak6bd286vcd9zzmjhqs4qdc"; + sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx"; }; "audacious-plugins-${version}" = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "0f16ivcp8nd83r781hnw1qgbs9hi2b2v22zwv7c3sw3jq1chb70h"; + sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp"; }; }; in stdenv.mkDerivation { inherit version; - name = "audacious-${version}"; + name = "audacious-qt5-${version}"; sourceFiles = lib.attrValues sources; sourceRoots = lib.attrNames sources; From a3523022e704cfeda7c5c38166ff00343ed739ef Mon Sep 17 00:00:00 2001 From: David Terry Date: Sat, 11 Feb 2017 19:10:46 +0100 Subject: [PATCH 035/138] range-v3: init at 2017-01-30 (#22661) --- lib/maintainers.nix | 1 + .../libraries/range-v3/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/range-v3/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1afd32bc763..8c778921fac 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -523,6 +523,7 @@ womfoo = "Kranium Gikos Mendoza "; wscott = "Wayne Scott "; wyvie = "Elijah Rum "; + xwvvvvwx = "David Terry "; yarr = "Dmitry V. "; yochai = "Yochai "; yorickvp = "Yorick van Pelt "; diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix new file mode 100644 index 00000000000..f1d9026b5f9 --- /dev/null +++ b/pkgs/development/libraries/range-v3/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "range-v3-${version}"; + version = "2017-01-30"; + + src = fetchFromGitHub { + owner = "ericniebler"; + repo = "range-v3"; + rev = "bab29767cce120e11872d79a2537bc6f0be76963"; + sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi"; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/include + mv include/ $out/ + ''; + + meta = with stdenv.lib; { + description = "Experimental range library for C++11/14/17"; + homepage = https://github.com/ericniebler/range-v3; + license = licenses.boost; + platforms = platforms.all; + maintainers = with maintainers; [ xwvvvvwx ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 317903b4988..8837a65fba7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9347,6 +9347,8 @@ with pkgs; rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; + range-v3 = callPackage ../development/libraries/range-v3 {}; + rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; raul = callPackage ../development/libraries/audio/raul { }; From e644f9f8ecd4888b3a1a1c06e1c9f4edeaf83d60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 11 Feb 2017 19:24:06 +0100 Subject: [PATCH 036/138] python-packages: update "osc" to latest version from git --- pkgs/top-level/python-packages.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c25be593e27..2ddaa2a4fc1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16679,22 +16679,23 @@ in { }; }); - osc = buildPythonPackage (rec { - name = "osc-0.133+git"; + osc = buildPythonPackage { + name = "osc-0.156.0-16-g9e6d1a5"; disabled = isPy3k; - - src = pkgs.fetchgit { - url = https://github.com/openSUSE/osc; - rev = "6cd541967ee2fca0b89e81470f18b97a3ffc23ce"; - sha256 = "0bf0yc4y1q87k7hq40xnr687lyw3ma93b3zprjlgn9pr8s1cn9xw"; + src = pkgs.fetchFromGitHub { + owner = "openSUSE"; + repo = "osc"; + rev = "9e6d1a592e89e8ee9fd40a96cfcf97bf74f68715"; + sha256 = "13svha5zh1xn3jv4kn9h3d620p65qh5nnhhghjbscp9lzlwwba3g"; }; - - doCheck = false; + propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; - - propagatedBuildInputs = with self; [ self.m2crypto ]; - - }); + meta = { + description = "opensuse-commander with svn like handling"; + maintainers = [ maintainers.peti ]; + license = licenses.gpl2; + }; + }; oslosphinx = buildPythonPackage rec { name = "oslosphinx-3.3.1"; From 3cec7d10dfb80b7466f171e7a59ac9af3bab2862 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 11 Feb 2017 13:55:09 -0500 Subject: [PATCH 037/138] kdm: drop service --- nixos/modules/misc/ids.nix | 4 +- nixos/modules/module-list.nix | 1 - .../services/x11/desktop-managers/kde4.nix | 202 ------------------ .../services/x11/display-managers/default.nix | 3 - .../services/x11/display-managers/kdm.nix | 161 -------------- .../system/boot/loader/grub/install-grub.pl | 2 - .../modules/testing/test-instrumentation.nix | 9 - nixos/tests/kde4.nix | 70 ------ 8 files changed, 2 insertions(+), 450 deletions(-) delete mode 100644 nixos/modules/services/x11/desktop-managers/kde4.nix delete mode 100644 nixos/modules/services/x11/display-managers/kdm.nix delete mode 100644 nixos/tests/kde4.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 60e00ce874a..1566dbe1677 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -64,7 +64,7 @@ cups = 36; foldingathome = 37; sabnzbd = 38; - kdm = 39; + #kdm = 39; # dropped in 17.03 ghostone = 40; git = 41; fourstore = 42; @@ -333,7 +333,7 @@ #cups = 36; # unused #foldingathome = 37; # unused #sabnzd = 38; # unused - #kdm = 39; # unused + #kdm = 39; # unused, even before 17.03 ghostone = 40; git = 41; fourstore = 42; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index afaaccb0156..7c9c9ac2a1e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -559,7 +559,6 @@ ./services/x11/display-managers/auto.nix ./services/x11/display-managers/default.nix ./services/x11/display-managers/gdm.nix - ./services/x11/display-managers/kdm.nix ./services/x11/display-managers/lightdm.nix ./services/x11/display-managers/sddm.nix ./services/x11/display-managers/slim.nix diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix deleted file mode 100644 index f0de9120c69..00000000000 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - xcfg = config.services.xserver; - cfg = xcfg.desktopManager.kde4; - xorg = pkgs.xorg; - kde_workspace = config.services.xserver.desktopManager.kde4.kdeWorkspacePackage; - - # Disable Nepomuk and Strigi by default. As of KDE 4.7, they don't - # really work very well (e.g. searching files often fails to find - # files), segfault sometimes and consume significant resources. - # They can be re-enabled in the KDE System Settings under "Desktop - # Search". - disableNepomuk = pkgs.writeTextFile - { name = "nepomuk-config"; - destination = "/share/config/nepomukserverrc"; - text = - '' - [Basic Settings] - Start Nepomuk=false - - [Service-nepomukstrigiservice] - autostart=false - ''; - }; - - phononBackends = { - gstreamer = [ - pkgs.phonon-backend-gstreamer - pkgs.gst_all.gstPluginsBase - pkgs.gst_all.gstPluginsGood - pkgs.gst_all.gstPluginsUgly - pkgs.gst_all.gstPluginsBad - pkgs.gst_all.gstFfmpeg # for mp3 playback - pkgs.gst_all.gstreamer # needed? - ]; - - vlc = [pkgs.phonon-backend-vlc]; - }; - - phononBackendPackages = flip concatMap cfg.phononBackends - (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends); - -in - -{ - options = { - - services.xserver.desktopManager.kde4 = { - enable = mkOption { - type = types.bool; - default = false; - description = "Enable the KDE 4 desktop environment."; - }; - - phononBackends = mkOption { - type = types.listOf types.str; - default = ["gstreamer"]; - example = ["gstreamer" "vlc"]; - description = "Which phonon multimedia backend kde should use"; - }; - - kdeWorkspacePackage = mkOption { - internal = true; - default = pkgs.kde4.kde_workspace; - defaultText = "pkgs.kde4.kde_workspace"; - type = types.package; - description = "Custom kde-workspace, used for NixOS rebranding."; - }; - - enablePIM = mkOption { - type = types.bool; - default = true; - description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies."; - }; - - enableNepomuk = mkOption { - type = types.bool; - default = false; - description = "Whether to enable Nepomuk (deprecated)."; - }; - }; - }; - - - config = mkIf (xcfg.enable && cfg.enable) { - warnings = [ - "KDE4 is long unmaintained and will be removed. Please update to KDE5." - ]; - - # If KDE 4 is enabled, make it the default desktop manager (unless - # overridden by the user's configuration). - # !!! doesn't work yet ("Multiple definitions. Only one is allowed - # for this option.") - # services.xserver.desktopManager.default = mkOverride 900 "kde4"; - - services.xserver.desktopManager.session = singleton - { name = "kde4"; - bgSupport = true; - start = - '' - # The KDE icon cache is supposed to update itself - # automatically, but it uses the timestamp on the icon - # theme directory as a trigger. Since in Nix the - # timestamp is always the same, this doesn't work. So as - # a workaround, nuke the icon cache on login. This isn't - # perfect, since it may require logging out after - # installing new applications to update the cache. - # See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html - rm -fv $HOME/.kde/cache-*/icon-cache.kcache - - # Qt writes a weird ‘libraryPath’ line to - # ~/.config/Trolltech.conf that causes the KDE plugin - # paths of previous KDE invocations to be searched. - # Obviously using mismatching KDE libraries is potentially - # disastrous, so here we nuke references to the Nix store - # in Trolltech.conf. A better solution would be to stop - # Qt from doing this wackiness in the first place. - if [ -e $HOME/.config/Trolltech.conf ]; then - sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf - fi - - # Load PulseAudio module for routing support. - # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ - ${optionalString config.hardware.pulseaudio.enable '' - ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" - ''} - - # Start KDE. - exec ${kde_workspace}/bin/startkde - ''; - }; - - security.setuidOwners = singleton - { program = "kcheckpass"; - source = "${kde_workspace}/lib/kde4/libexec/kcheckpass"; - owner = "root"; - group = "root"; - setuid = true; - }; - - environment.systemPackages = - [ pkgs.kde4.kdelibs - - pkgs.kde4.kde_baseapps # Splitted kdebase - kde_workspace - pkgs.kde4.kde_runtime - pkgs.kde4.konsole - pkgs.kde4.kate - - pkgs.kde4.kde_wallpapers # contains kdm's default background - pkgs.kde4.oxygen_icons - - # Starts KDE's Polkit authentication agent. - pkgs.kde4.polkit_kde_agent - - # Miscellaneous runtime dependencies. - pkgs.kde4.qt4 # needed for qdbus - pkgs.shared_mime_info - xorg.xmessage # so that startkde can show error messages - xorg.xset # used by startkde, non-essential - xorg.xauth # used by kdesu - ] - ++ optionals cfg.enablePIM - [ pkgs.kde4.kdepim_runtime - pkgs.kde4.akonadi - pkgs.mysql # used by akonadi - ] - ++ (if cfg.enableNepomuk then - [ pkgs.shared_desktop_ontologies # used by nepomuk - pkgs.strigi # used by nepomuk - pkgs.virtuoso # to enable Nepomuk to find Virtuoso - ] else - [ disableNepomuk ]) - ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled - ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil - ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm - ++ phononBackendPackages; - - environment.pathsToLink = [ "/share" ]; - - environment.profileRelativeEnvVars = mkIf (elem "gstreamer" cfg.phononBackends) { - GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; - }; - - environment.etc = singleton - { source = "${pkgs.xkeyboard_config}/etc/X11/xkb"; - target = "X11/xkb"; - }; - - # Enable helpful DBus services. - services.udisks2.enable = true; - services.upower.enable = config.powerManagement.enable; - - security.pam.services.kde = { allowNullPassword = true; }; - - }; - -} diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 98d2d0ea834..7418ce56357 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -55,9 +55,6 @@ let fi ''} - # Handle being called by kdm. - if test "''${1:0:1}" = /; then eval exec "$1"; fi - # Start PulseAudio if enabled. ${optionalString (config.hardware.pulseaudio.enable) '' ${optionalString (!config.hardware.pulseaudio.systemWide) diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix deleted file mode 100644 index bfb763f2858..00000000000 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - dmcfg = config.services.xserver.displayManager; - cfg = dmcfg.kdm; - - inherit (pkgs.kde4) kdebase_workspace; - - defaultConfig = - '' - [Shutdown] - HaltCmd=${config.systemd.package}/sbin/shutdown -h now - RebootCmd=${config.systemd.package}/sbin/shutdown -r now - ${optionalString (config.system.boot.loader.id == "grub") '' - BootManager=${if config.boot.loader.grub.version == 2 then "Grub2" else "Grub"} - ''} - - [X-*-Core] - Xrdb=${pkgs.xorg.xrdb}/bin/xrdb - SessionsDirs=${dmcfg.session.desktops} - Session=${dmcfg.session.script} - FailsafeClient=${pkgs.xterm}/bin/xterm - - [X-:*-Core] - ServerCmd=${dmcfg.xserverBin} ${toString dmcfg.xserverArgs} - # KDM calls `rm' somewhere to clean up some temporary directory. - SystemPath=${pkgs.coreutils}/bin - # The default timeout (15) is too short in a heavily loaded boot process. - ServerTimeout=60 - # Needed to prevent the X server from dying on logout and not coming back: - TerminateServer=true - ${optionalString (cfg.setupScript != "") - '' - Setup=${cfg.setupScript} - ''} - - [X-*-Greeter] - HiddenUsers=root,${concatStringsSep "," dmcfg.hiddenUsers} - PluginsLogin=${kdebase_workspace}/lib/kde4/kgreet_classic.so - ${optionalString (cfg.themeDirectory != null) - '' - UseTheme=true - Theme=${cfg.themeDirectory} - '' - } - - ${optionalString (cfg.enableXDMCP) - '' - [Xdmcp] - Enable=true - ''} - ''; - - kdmrc = pkgs.runCommand "kdmrc" - { config = defaultConfig + cfg.extraConfig; - preferLocalBuild = true; - } - '' - echo "$config" > $out - - # The default kdmrc would add "-nolisten tcp", and we already - # have that managed by nixos. Hence the grep. - cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out - ''; - -in - -{ - - ###### interface - - options = { - - services.xserver.displayManager.kdm = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the KDE display manager. - ''; - }; - - enableXDMCP = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable XDMCP, which allows remote logins. - ''; - }; - - themeDirectory = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The path to a KDM theme directory. This theme - will be used by the KDM greeter. - ''; - }; - - setupScript = mkOption { - type = types.lines; - default = ""; - description = '' - The path to a KDM setup script. This script is run as root just - before KDM starts. Can be used for setting up - monitors with xrandr, for example. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Options appended to kdmrc, the - configuration file of KDM. - ''; - }; - - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - warnings = [ - "KDM is long unmaintained and will be removed. Please update to SDDM." - ]; - - services.xserver.displayManager.slim.enable = false; - - services.xserver.displayManager.job = - { execCmd = - '' - mkdir -m 0755 -p /var/lib/kdm - chown kdm /var/lib/kdm - ${(optionalString (config.system.boot.loader.id == "grub" && config.system.build.grub != null) "PATH=${config.system.build.grub}/sbin:$PATH ") + - "KDEDIRS=/run/current-system/sw exec ${kdebase_workspace}/bin/kdm -config ${kdmrc} -nodaemon -logfile /dev/stderr"} - ''; - logsXsession = true; - }; - - security.pam.services.kde = { allowNullPassword = true; startSession = true; }; - - users.extraUsers = singleton - { name = "kdm"; - uid = config.ids.uids.kdm; - description = "KDM user"; - }; - - environment.systemPackages = - [ pkgs.kde4.kde_wallpapers ]; # contains kdm's default background - - }; - -} diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 24442ca12a3..f92b17720f6 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -256,8 +256,6 @@ else { # ‘grub-reboot’ sets a one-time saved entry, which we process here and # then delete. if [ \"\${next_entry}\" ]; then - # FIXME: KDM expects the next line to be present. - set default=\"\${saved_entry}\" set default=\"\${next_entry}\" set next_entry= save_env next_entry diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 099ead3d846..7f5b55d5cca 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -123,15 +123,6 @@ let kernel = config.boot.kernelPackages.kernel; in users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; services.xserver.displayManager.logToJournal = true; - - # Bump kdm's X server start timeout to account for heavily loaded - # VM host systems. - services.xserver.displayManager.kdm.extraConfig = - '' - [X-:*-Core] - ServerTimeout=240 - ''; - }; } diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix deleted file mode 100644 index 9ecfe687056..00000000000 --- a/nixos/tests/kde4.nix +++ /dev/null @@ -1,70 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: { - name = "kde4"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ domenkozar eelco chaoflow ]; - }; - - machine = - { config, pkgs, ... }: - - { imports = [ ./common/user-account.nix ]; - - virtualisation.memorySize = 1024; - - services.xserver.enable = true; - - services.httpd.enable = true; - services.httpd.adminAddr = "foo@example.org"; - services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html"; - - services.xserver.displayManager.kdm.enable = true; - services.xserver.displayManager.kdm.extraConfig = - '' - [X-:0-Core] - AutoLoginEnable=true - AutoLoginUser=alice - AutoLoginPass=foobar - ''; - - services.xserver.desktopManager.kde4.enable = true; - - # Include most of KDE. We don't really test these here, but at - # least they should build. - environment.systemPackages = - [ pkgs.kde4.kdemultimedia - pkgs.kde4.kdegraphics - pkgs.kde4.kdeutils - pkgs.kde4.kdegames - #pkgs.kde4.kdeedu - pkgs.kde4.kdeaccessibility - pkgs.kde4.kdeadmin - pkgs.kde4.kdenetwork - pkgs.kde4.kdetoys - pkgs.kde4.kdewebdev - pkgs.xorg.xmessage - ]; - }; - - testScript = '' - $machine->waitUntilSucceeds("pgrep plasma-desktop"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->waitForWindow(qr/plasma-desktop/); - - # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); - - $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'"); - $machine->waitForWindow(qr/messages.*KWrite/); - - $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'"); - $machine->waitForWindow(qr/Valgrind.*Konqueror/); - - $machine->execute("su - alice -c 'DISPLAY=:0.0 gwenview ${pkgs.kde4.kde_wallpapers}/share/wallpapers/Hanami/contents/images/1280x1024.jpg &'"); - $machine->waitForWindow(qr/Gwenview/); - - $machine->sleep(10); - - $machine->screenshot("screen"); - ''; - -}) From b1a05a0865a6a7cfddb1dd5f6c0f32a91c20f473 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sat, 11 Feb 2017 14:01:13 -0500 Subject: [PATCH 038/138] nixos: drop references to kde4 Excluding modules/programs/environment.nix for PATHand QT_PLUGIN_PATH to allow the programs to continue running. --- nixos/modules/services/hardware/bluetooth.nix | 6 ++---- nixos/modules/services/networking/quassel.nix | 6 +++--- nixos/modules/services/x11/desktop-managers/default.nix | 5 ++--- nixos/modules/services/x11/desktop-managers/kde5.nix | 4 ---- nixos/release-combined.nix | 1 - nixos/release.nix | 1 - 6 files changed, 7 insertions(+), 16 deletions(-) diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix index ef2fce613f2..de0d4803211 100644 --- a/nixos/modules/services/hardware/bluetooth.nix +++ b/nixos/modules/services/hardware/bluetooth.nix @@ -2,9 +2,7 @@ with lib; let - isBluez4 = config.services.xserver.desktopManager.kde4.enable; - bluez-bluetooth = if isBluez4 then pkgs.bluez4 else pkgs.bluez; - + bluez-bluetooth = pkgs.bluez; in { @@ -38,7 +36,7 @@ in aliases = [ "dbus-org.bluez.service" ]; }; - systemd.user.services.obex = mkIf (!isBluez4) { + systemd.user.services.obex = { aliases = [ "dbus-org.bluez.obex.service" ]; }; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index edcc12170b2..9b06cccca79 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -25,12 +25,12 @@ in package = mkOption { type = types.package; - default = pkgs.kde4.quasselDaemon; - defaultText = "pkgs.kde4.quasselDaemon"; + default = pkgs.quasselDaemon_qt5; + defaultText = "pkgs.quasselDaemon_qt5"; description = '' The package of the quassel daemon. ''; - example = literalExample "pkgs.quasselDaemon"; + example = literalExample "pkgs.quasselDaemon_qt5"; }; interfaces = mkOption { diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 144e4aada27..1f7a925ed05 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -18,9 +18,8 @@ in # determines the default: later modules (if enabled) are preferred. # E.g., if KDE is enabled, it supersedes xterm. imports = [ - ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./lumina.nix ./lxqt.nix ./enlightenment.nix ./gnome3.nix - ./kodi.nix + ./none.nix ./xterm.nix ./xfce.nix ./kde5.nix ./lumina.nix + ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix index 8f081a1e9d2..644fd8d7752 100644 --- a/nixos/modules/services/x11/desktop-managers/kde5.nix +++ b/nixos/modules/services/x11/desktop-managers/kde5.nix @@ -50,10 +50,6 @@ in }) (mkIf (xcfg.enable && cfg.enable) { - - warnings = optional config.services.xserver.desktopManager.kde4.enable - "KDE 4 should not be enabled at the same time as KDE 5"; - services.xserver.desktopManager.session = singleton { name = "kde5"; bgSupport = true; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 70b29aa23a5..6c048e8a0ac 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -72,7 +72,6 @@ in rec { (all nixos.tests.ecryptfs) (all nixos.tests.ipv6) (all nixos.tests.i3wm) - (all nixos.tests.kde4) (all nixos.tests.kde5) #(all nixos.tests.lightdm) (all nixos.tests.login) diff --git a/nixos/release.nix b/nixos/release.nix index 0f298188c6c..c061b9801a0 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -255,7 +255,6 @@ in rec { tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; - tests.kde4 = callTest tests/kde4.nix {}; tests.kde5 = callTest tests/kde5.nix {}; tests.keymap = callSubTests tests/keymap.nix {}; tests.initrdNetwork = callTest tests/initrd-network.nix {}; From 70d54cdbe393cf179a880a58c0ca6e8a108eb22a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Feb 2017 20:33:21 +0100 Subject: [PATCH 039/138] skrooge: 2.6.0 -> 2.7.0 --- pkgs/applications/office/skrooge/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/skrooge/2.nix b/pkgs/applications/office/skrooge/2.nix index 98c1c4c8b79..42cc9b0c6eb 100644 --- a/pkgs/applications/office/skrooge/2.nix +++ b/pkgs/applications/office/skrooge/2.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "skrooge-${version}"; - version = "2.6.0"; + version = "2.7.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "13sd669rx66fpk9pm72nr2y69k2h4mcs4b904i9xm41i0fiy6szp"; + sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x"; }; nativeBuildInputs = [ cmake ecm makeQtWrapper ]; From 36d6a3041a3f8c23b1d439fcffb34402d5d220bf Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Tue, 7 Feb 2017 16:11:16 -0800 Subject: [PATCH 040/138] jimtcl: 0.76 -> 0.77 --- pkgs/development/interpreters/jimtcl/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/jimtcl/default.nix b/pkgs/development/interpreters/jimtcl/default.nix index 4ac9b647956..3bef4996a4c 100644 --- a/pkgs/development/interpreters/jimtcl/default.nix +++ b/pkgs/development/interpreters/jimtcl/default.nix @@ -1,20 +1,24 @@ { stdenv, fetchFromGitHub, sqlite, readline, asciidoc, SDL, SDL_gfx }: -stdenv.mkDerivation { - name = "jimtcl-0.76"; +let + makeSDLFlags = map (p: "-I${stdenv.lib.getDev p}/include/SDL"); + +in stdenv.mkDerivation rec { + name = "jimtcl-${version}"; + version = "0.77"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; - rev = "51f65c6d38fbf86e1f0b036ad336761fd2ab7fa0"; - sha256 = "00ldal1w9ysyfmx28xdcaz81vaazr1fqixxb2abk438yfpp1i9hq"; + rev = version; + sha256 = "06d9gdgvi6cwd6pjg3xig0kkjqm6kgq3am8yq1xnksyz2n09f0kp"; }; buildInputs = [ sqlite readline asciidoc SDL SDL_gfx ]; - NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ]; + NIX_CFLAGS_COMPILE = makeSDLFlags [ SDL SDL_gfx ]; configureFlags = [ "--with-ext=oo" From 89db3a0bc6d54c8ff49d48c235d427b2bc68030a Mon Sep 17 00:00:00 2001 From: c74d <8573dd@gmail.com> Date: Sat, 11 Feb 2017 18:41:47 +0000 Subject: [PATCH 041/138] perlPackages.Swim: 0.1.44 -> 0.1.45 This patch updates the Perl package `Swim` (attribute path `perlPackages.Swim`) from version 0.1.44 to version 0.1.45. I have tested this patch per nixpkgs manual section 11.1 ("Making patches"). --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 6105fcf54aa..f50d5dfe38d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11964,10 +11964,10 @@ let self = _self // overrides; _self = with self; { }; Swim = buildPerlPackage rec { - name = "Swim-0.1.44"; + name = "Swim-0.1.45"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "06aac148d7b1778028ffae657fdf79b1093b52035661fd8b9bdad729dc8741aa"; + sha256 = "3755ba1a02aee933c8e1de3995aca1523d6175291a1fa60c3f7fd477f5bb2469"; }; buildInputs = [ FileShareDirInstall ]; propagatedBuildInputs = [ HTMLEscape HashMerge IPCRun Pegex TextAutoformat YAMLLibYAML ]; From c4fab214fae3c89c0c9505cedd6782892db8bcdb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 11 Feb 2017 22:16:10 +0100 Subject: [PATCH 042/138] blender: 2.78a -> 2.78b --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e07fa1df546..76810a6f249 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.78a"; + name = "blender-2.78b"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "1byf1klrvm8fdw2libx7wldz2i6lblp9nih6y58ydh00paqi8jh1"; + sha256 = "0wgrqwznih6c19y2fpvrk3k6qsaxsy3g7xja87rb4hq7r7j8x22d"; }; buildInputs = From cb4e8919c31a3ed79d01a44742a2b310d7568977 Mon Sep 17 00:00:00 2001 From: David Terry Date: Sat, 11 Feb 2017 22:20:42 +0100 Subject: [PATCH 043/138] spotify: 1.0.47.13 -> 1.0.49.125 --- pkgs/applications/audio/spotify/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index b678380f12d..72514d7b67b 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -6,7 +6,9 @@ assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.48.103.g15edf1ec-94"; + # Latest version number can be found at: + # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ + version = "1.0.49.125.g72ee7853-83"; deps = [ alsaLib @@ -51,7 +53,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0rpwxgxv2ihfhlri98k4n87ynlcp569gm9q6hd8jg0vd2jgji8b3"; + sha256 = "1sqi79yj503y4b7pfvr6xi0i8g7hj01hkhn0vpkc3y3jz5c0ih9g"; }; buildInputs = [ dpkg makeWrapper ]; From 5b2a71fa250926010e6da0a6c6325dc1270770c1 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sat, 11 Feb 2017 23:06:17 +0100 Subject: [PATCH 044/138] droopy: init at 20160830 (#22499) --- .../networking/droopy/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/networking/droopy/default.nix diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/applications/networking/droopy/default.nix new file mode 100644 index 00000000000..8be5ee3c775 --- /dev/null +++ b/pkgs/applications/networking/droopy/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, wrapPython }: + +with lib; + +stdenv.mkDerivation rec { + name = "droopy-${version}"; + version = "20160830"; + + src = fetchFromGitHub { + owner = "stackp"; + repo = "Droopy"; + rev = "7a9c7bc46c4ff8b743755be86a9b29bd1a8ba1d9"; + sha256 = "03i1arwyj9qpfyyvccl21lbpz3rnnp1hsadvc0b23nh1z2ng9sff"; + }; + + nativeBuildInputs = [ wrapPython ]; + + installPhase = '' + install -vD droopy $out/bin/droopy + install -vD -m 644 man/droopy.1 $out/share/man/man1/droopy.1 + wrapPythonPrograms + ''; + + meta = { + description = "Mini Web server that let others upload files to your computer"; + homepage = http://stackp.online.fr/droopy; + license = licenses.bsd3; + maintainers = maintainers.profpatsch; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3de30ceee90..7beca5009f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12881,6 +12881,10 @@ with pkgs; doodle = callPackage ../applications/search/doodle { }; + droopy = callPackage ../applications/networking/droopy { + inherit (python3Packages) wrapPython; + }; + drumgizmo = callPackage ../applications/audio/drumgizmo { }; dunst = callPackage ../applications/misc/dunst { }; From 947c26972b8451e0f00839c9b0e9cfd321e152d4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 11 Feb 2017 16:13:29 -0600 Subject: [PATCH 045/138] LLVM: Fix licensing metadata, closes #22679. (#22681) * All projects are available under NCSA license, other than dragonegg. * "Runtime" projects are dual-licensed under both NCSA and MIT: libc++, libc++abi, compiler-rt * I don't mention MIT for compiler-rt as we only build it as part of LLVM. --- pkgs/development/compilers/llvm/3.4/clang.nix | 2 +- pkgs/development/compilers/llvm/3.4/lld.nix | 2 +- pkgs/development/compilers/llvm/3.4/lldb.nix | 2 +- pkgs/development/compilers/llvm/3.4/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.4/polly.nix | 2 +- pkgs/development/compilers/llvm/3.5/clang.nix | 2 +- pkgs/development/compilers/llvm/3.5/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/3.5/libc++abi/default.nix | 2 +- pkgs/development/compilers/llvm/3.5/lld.nix | 2 +- pkgs/development/compilers/llvm/3.5/lldb.nix | 2 +- pkgs/development/compilers/llvm/3.5/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.5/polly.nix | 2 +- pkgs/development/compilers/llvm/3.7/clang/default.nix | 2 +- pkgs/development/compilers/llvm/3.7/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/3.7/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/3.7/lldb.nix | 2 +- pkgs/development/compilers/llvm/3.7/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.8/clang/default.nix | 2 +- pkgs/development/compilers/llvm/3.8/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/3.8/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/3.8/lldb.nix | 2 +- pkgs/development/compilers/llvm/3.8/llvm.nix | 2 +- pkgs/development/compilers/llvm/3.9/clang/default.nix | 2 +- pkgs/development/compilers/llvm/3.9/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/3.9/libc++abi.nix | 2 +- pkgs/development/compilers/llvm/3.9/lldb.nix | 2 +- pkgs/development/compilers/llvm/3.9/llvm.nix | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index b05496eabf2..741ecc3856f 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix index c1841610f31..0398a5a543a 100644 --- a/pkgs/development/compilers/llvm/3.4/lld.nix +++ b/pkgs/development/compilers/llvm/3.4/lld.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A set of modular code for creating linker tools"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index a50f9536542..c5ed82f53e5 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix index 54346baba0d..0a18f7e01cf 100644 --- a/pkgs/development/compilers/llvm/3.4/llvm.nix +++ b/pkgs/development/compilers/llvm/3.4/llvm.nix @@ -67,7 +67,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix index 3d3483afafa..1ea806a1266 100644 --- a/pkgs/development/compilers/llvm/3.4/polly.nix +++ b/pkgs/development/compilers/llvm/3.4/polly.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A polyhedral optimizer for llvm"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index d11259c82f0..f15c989ef51 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation { meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index 476fc7bcd43..abc198b0686 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix index 963caf80970..268f2702a23 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++abi/default.nix @@ -52,7 +52,7 @@ in stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index 7ee90818ac9..4a398bd96a0 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { meta = { description = "A set of modular code for creating linker tools"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index bbffa1a9a93..a5161333b28 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; broken = true; }; diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index 4f54f1438a7..8bb5a6c684b 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index 42b3fd74e6c..bacf4d30556 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "A polyhedral optimizer for llvm"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index 6c1a89cf60a..535dbbc93d5 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -49,7 +49,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix index 1196645b923..69ce87bcbf3 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.7/libc++abi.nix b/pkgs/development/compilers/llvm/3.7/libc++abi.nix index ec0be51a11c..6a62a6256b4 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix index 36f9cb1f139..294410f9986 100644 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ b/pkgs/development/compilers/llvm/3.7/lldb.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index c674b959c78..d4e7c73ad0d 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 6052246dad0..41e515249eb 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -60,7 +60,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index 15f7ee1e3e4..e4198599904 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index 61ff6341c30..6b98a5726cf 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index fe0dcfc8306..d27786464c0 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index fa647e62ff1..9394179a8f9 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -85,7 +85,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index e6c804c96b1..677c4a526ea 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -49,7 +49,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; }; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 7a53ffa0d8f..f656f553f16 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/compilers/llvm/3.9/libc++abi.nix b/pkgs/development/compilers/llvm/3.9/libc++abi.nix index aff4205d6a9..1ad2cb10295 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { homepage = http://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; - license = "BSD"; + license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index 5d8878b3b06..52f27de8cdb 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = { description = "A next-generation high-performance debugger"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index b64cf4fed5b..e1edbf5d0e7 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -109,7 +109,7 @@ in stdenv.mkDerivation rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = http://llvm.org/; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin viric ]; platforms = stdenv.lib.platforms.all; }; From c3e3b6a19ab8a2082197d8076da75de95568e3a1 Mon Sep 17 00:00:00 2001 From: Jude Taylor Date: Sat, 11 Feb 2017 14:29:37 -0800 Subject: [PATCH 046/138] nvidia-x11: fix parallel building variable name --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index 523396faf3d..7dee6b4776c 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -21,7 +21,7 @@ buildPhase() { sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) unset src # used by the nv makefile - make SYSSRC=$sysSrc SYSOUT=$sysOut module + make SYSSRC=$sysSrc SYSOUT=$sysOut module -j$NIX_BUILD_CORES cd .. fi From 35d06e947f761b3e92e063e9323a4cff4892045f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 11 Feb 2017 23:35:59 +0100 Subject: [PATCH 047/138] python-packages: bump osc to fix bug with NixOS's default $PAGER setting --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ddaa2a4fc1..40201bc6047 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16685,8 +16685,8 @@ in { src = pkgs.fetchFromGitHub { owner = "openSUSE"; repo = "osc"; - rev = "9e6d1a592e89e8ee9fd40a96cfcf97bf74f68715"; - sha256 = "13svha5zh1xn3jv4kn9h3d620p65qh5nnhhghjbscp9lzlwwba3g"; + rev = "64cbb10095cf9ef0270d65fff58085a13bc0abe9"; + sha256 = "0s5kz5ln96ka0f1sa9nyp34c28mkxkrgcxbvysdawlppg7ay9s1z"; }; propagatedBuildInputs = with self; [ urlgrabber m2crypto pyyaml ]; postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; From 0045f932bba018345cbb2f03bb5d4d17d01850b1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 11 Feb 2017 20:58:53 +0000 Subject: [PATCH 048/138] proj: 4.9.2 -> 4.9.3 --- pkgs/development/libraries/proj/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index bc9178f6367..8fceacd870a 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "proj-4.9.2"; + name = "proj-4.9.3"; src = fetchurl { - url = http://download.osgeo.org/proj/proj-4.9.2.tar.gz; - sha256 = "15kpcmz3qjxfrs6vq48mgyvb4vxscmwgkzrdcn71a60wxp8rmgv0"; + url = http://download.osgeo.org/proj/proj-4.9.3.tar.gz; + sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"; }; doCheck = true; From c19b17d14ff25a86bc4b563999bfa3569344d16a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Tue, 17 Jan 2017 11:19:39 +0000 Subject: [PATCH 049/138] raspberryPi boot loader: fix booting Raspberry Pi 3 The Raspberry Pi 3 seems to need the .DTB file when booting the kernel, so we must copy it to /boot when installing a new kernel. --- .../system/boot/loader/raspberrypi/builder.sh | 12 +++++++++--- .../system/boot/loader/raspberrypi/raspberrypi.nix | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh index ccb88ca1c52..1a02bf23170 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh @@ -61,12 +61,13 @@ addEntry() { local kernel=$(readlink -f $path/kernel) local initrd=$(readlink -f $path/initrd) + local dtb_path=$(readlink -f $path/kernel-modules/dtbs) if test -n "@copyKernels@"; then copyToKernelsDir $kernel; kernel=$result copyToKernelsDir $initrd; initrd=$result fi - + echo $(readlink -f $path) > $outdir/$generation-system echo $(readlink -f $path/init) > $outdir/$generation-init cp $path/kernel-params $outdir/$generation-cmdline.txt @@ -80,6 +81,11 @@ addEntry() { copyForced $kernel /boot/kernel7.img fi copyForced $initrd /boot/initrd + for dtb in $dtb_path/bcm*.dtb; do + dst="/boot/$(basename $dtb)" + copyForced $dtb "$dst" + filesCopied[$dst]=1 + done cp "$(readlink -f "$path/init")" /boot/nixos-init echo "`cat $path/kernel-params` init=$path/init" >/boot/cmdline.txt @@ -108,8 +114,8 @@ copyForced $fwdir/start_cd.elf /boot/start_cd.elf copyForced $fwdir/start_db.elf /boot/start_db.elf copyForced $fwdir/start_x.elf /boot/start_x.elf -# Remove obsolete files from /boot/old. -for fn in /boot/old/*linux* /boot/old/*initrd*; do +# Remove obsolete files from /boot and /boot/old. +for fn in /boot/old/*linux* /boot/old/*initrd* /boot/bcm*.dtb; do if ! test "${filesCopied[$fn]}" = 1; then rm -vf -- "$fn" fi diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index eb8ea613097..f246d04284c 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -33,7 +33,7 @@ in boot.loader.raspberryPi.version = mkOption { default = 2; - type = types.enum [ 1 2 ]; + type = types.enum [ 1 2 3 ]; description = '' ''; }; From 123cbd40c244c84a1caebce9082aa3704be7f57c Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 19 Jan 2017 14:10:03 +0100 Subject: [PATCH 050/138] raspberryPi boot loader: don't remove xx-initrd files The Raspberry Pi boot loader was deleting all xx-initrd text files (which simply contain the path to the actual initrd files) just after having created them. The code was actually trying to delete real, obsolete initrd files, which are named -initrd-initrd (after path cleaning), but the glob was catching the other files as well. --- nixos/modules/system/boot/loader/raspberrypi/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/builder.sh b/nixos/modules/system/boot/loader/raspberrypi/builder.sh index 1a02bf23170..f627d093eaf 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/builder.sh +++ b/nixos/modules/system/boot/loader/raspberrypi/builder.sh @@ -115,7 +115,7 @@ copyForced $fwdir/start_db.elf /boot/start_db.elf copyForced $fwdir/start_x.elf /boot/start_x.elf # Remove obsolete files from /boot and /boot/old. -for fn in /boot/old/*linux* /boot/old/*initrd* /boot/bcm*.dtb; do +for fn in /boot/old/*linux* /boot/old/*initrd-initrd* /boot/bcm*.dtb; do if ! test "${filesCopied[$fn]}" = 1; then rm -vf -- "$fn" fi From 5e599035f457f2eb8c5fb7fb8e6ceda9b80a3a5d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Feb 2017 02:31:21 +0100 Subject: [PATCH 051/138] libidn2: fix darwin build cc #22595 --- .../development/libraries/libidn2/default.nix | 8 +++-- .../libraries/libidn2/fix-error-darwin.patch | 31 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libidn2/fix-error-darwin.patch diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 083b04d4b09..ea26f480cd1 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -1,4 +1,6 @@ -{ fetchurl, stdenv, libiconv, libunistring }: +{ fetchurl, stdenv, libiconv, libunistring, help2man }: + +with stdenv.lib; stdenv.mkDerivation rec { name = "libidn2-0.16"; @@ -10,8 +12,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "info" "devdoc" ]; + patches = optional stdenv.isDarwin ./fix-error-darwin.patch; + buildInputs = [ libunistring ] - ++ stdenv.lib.optional stdenv.isDarwin libiconv; + ++ optionals stdenv.isDarwin [ libiconv help2man ]; meta = { homepage = "https://www.gnu.org/software/libidn/#libidn2"; diff --git a/pkgs/development/libraries/libidn2/fix-error-darwin.patch b/pkgs/development/libraries/libidn2/fix-error-darwin.patch new file mode 100644 index 00000000000..db3edd6e4a0 --- /dev/null +++ b/pkgs/development/libraries/libidn2/fix-error-darwin.patch @@ -0,0 +1,31 @@ +diff --git a/src/idn2.c b/src/idn2.c +index 6abbc72..804f0f2 100644 +--- a/src/idn2.c ++++ b/src/idn2.c +@@ -31,7 +31,6 @@ + #include + + /* Gnulib headers. */ +-#include "error.h" + #include "gettext.h" + #define _(String) dgettext (PACKAGE, String) + #include "progname.h" +@@ -161,9 +160,7 @@ process_input (char *readbuf, int flags) + free (output); + } + else +- error (EXIT_FAILURE, 0, "%s: %s", +- args_info.register_given ? "register" : "lookup", +- idn2_strerror (rc)); ++ perror (idn2_strerror (rc)); + } + + int +@@ -222,7 +219,7 @@ main (int argc, char *argv[]) + } + + if (ferror (stdin)) +- error (EXIT_FAILURE, errno, "%s", _("input error")); ++ perror (_("input error")); + + cmdline_parser_free (&args_info); From e9a5ec099efe3769f0e4c7d8093c74255dcfbeff Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Feb 2017 02:52:25 +0100 Subject: [PATCH 052/138] wget: 1.19 -> 1.19.1 Fixes build on darwin. Fixes #22595. --- pkgs/tools/networking/wget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 60edc1ad16f..f024c637c34 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19"; + name = "wget-1.19.1"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.xz"; - sha256 = "1133c14g19ysv74j7am66jwgwrr0rdn0rdyxw7rikbnsyjxmf48g"; + sha256 = "1ljcfhbkdsd0zjfm520rbl1ai62fc34i7c45sfj244l8f6b0p58c"; }; patches = [ ./remove-runtime-dep-on-openssl-headers.patch ]; From 6651c72df1c4c47d36e67fe59dcf3c50e75c5383 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 11 Feb 2017 21:01:56 -0500 Subject: [PATCH 053/138] proofgeneral_HEAD: Bump --- pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix index a6ccd4f631d..fabf8ac4ce4 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://github.com/ProofGeneral/PG.git"; - rev = "64ca55b1593fff8cfffab89c51d7e92c1a68dc27"; - sha256 = "1gz13fagxf0w2zgp7qd0w328qiv97295jwq7ra8vj61pdfi8xklj"; + rev = "4bcac92df46da9e68b5e3d565bb118fb63b4feb4"; + sha256 = "143anwll7mij6iskf3jbbbfzmkp2vnp0q329zpsl2l6v3wk2vv64"; }; buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; From 6b2ea7ec6ee968b9613ce06a3e8e182c1a281de9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 8 Feb 2017 10:12:16 +0800 Subject: [PATCH 054/138] diskscan: init at 0.19 --- pkgs/tools/misc/diskscan/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/diskscan/default.nix diff --git a/pkgs/tools/misc/diskscan/default.nix b/pkgs/tools/misc/diskscan/default.nix new file mode 100644 index 00000000000..e1024d70bce --- /dev/null +++ b/pkgs/tools/misc/diskscan/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, ncurses, zlib }: + +stdenv.mkDerivation rec { + name = "diskscan-${version}"; + version = "0.19"; + + src = fetchFromGitHub { + owner = "baruch"; + repo = "diskscan"; + rev = "${version}"; + sha256 = "0yqpaxfahbjr8hr9xw7nngncwigy7yncdwnyp5wy9s9wdp8mrjra"; + }; + + buildInputs = [ ncurses zlib ]; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + homepage = https://github.com/baruch/diskscan; + description = "Scan HDD/SSD for failed and near failed sectors"; + platforms = with platforms; linux; + maintainers = with maintainers; [ peterhoeg ]; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7beca5009f6..1d7d103c00a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -816,6 +816,8 @@ with pkgs; discount = callPackage ../tools/text/discount { }; + diskscan = callPackage ../tools/misc/diskscan { }; + disorderfs = callPackage ../tools/filesystems/disorderfs { asciidoc = asciidoc-full; }; From f6dd263d4244b832a761c808597cf00b2688f4af Mon Sep 17 00:00:00 2001 From: Changlin Li Date: Sun, 12 Feb 2017 01:00:29 -0500 Subject: [PATCH 055/138] bfg-repo-cleaner: init at 1.12.15 --- lib/maintainers.nix | 1 + .../bfg-repo-cleaner/default.nix | 49 +++++++++++++++++++ .../git-and-tools/default.nix | 2 + 3 files changed, 52 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8c778921fac..15167408786 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -87,6 +87,7 @@ cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; chattered = "Phil Scott "; + changlinli = "Changlin Li "; choochootrain = "Hurshal Patel "; chris-martin = "Chris Martin "; chrisjefferson = "Christopher Jefferson "; diff --git a/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix new file mode 100644 index 00000000000..b2324581244 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/bfg-repo-cleaner/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, jre, makeWrapper }: + +let + version = "1.12.15"; + jarName = "bfg-${version}.jar"; + mavenUrl = "http://central.maven.org/maven2/com/madgag/bfg/${version}/${jarName}"; +in + stdenv.mkDerivation { + inherit version jarName; + + name = "bfg-repo-cleaner"; + + src = fetchurl { + url = mavenUrl; + sha256 = "17dh25jambkk55khknlhy8wa9s1i1xmh9hdgj72j1lzyl0ag42ik"; + }; + + buildInputs = [ jre makeWrapper ]; + + phases = "installPhase"; + + installPhase = '' + mkdir -p $out/share/java + mkdir -p $out/bin + cp $src $out/share/java/$jarName + makeWrapper "${jre}/bin/java" $out/bin/bfg --add-flags "-cp $out/share/java/$jarName com.madgag.git.bfg.cli.Main" + ''; + + meta = with stdenv.lib; { + homepage = "https://rtyley.github.io/bfg-repo-cleaner/"; + # Descriptions taken with minor modification from the homepage of bfg-repo-cleaner + description = "Removes large or troublesome blobs in a git repository like git-filter-branch does, but faster"; + longDescription = '' + The BFG is a simpler, faster alternative to git-filter-branch for + cleansing bad data out of your Git repository history, in particular removing + crazy big files and removing passwords, credentials, and other private data. + + The git-filter-branch command is enormously powerful and can do things + that the BFG can't - but the BFG is much better for the tasks above, because + it's faster (10-720x), simpler (dedicated to just removing things), and + beautiful (can use Scala instead of bash to script customizations). + ''; + license = licenses.gpl3; + maintainers = [ maintainers.changlinli ]; + platforms = platforms.unix; + downloadPage = "https://mvnrepository.com/artifact/com.madgag/bfg/${version}"; + }; + + } diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 975c83c6e97..d68b1e41c8d 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -22,6 +22,8 @@ in rec { # Try to keep this generally alphabetized + bfg-repo-cleaner = callPackage ./bfg-repo-cleaner { }; + bitbucket-server-cli = callPackage ./bitbucket-server-cli { }; darcsToGit = callPackage ./darcs-to-git { }; From c07f1589bf91f35e9e72536e660c0d1ba39285e6 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 12 Feb 2017 09:10:35 +0000 Subject: [PATCH 056/138] Make azure-mgmt-resource work with requests 2.11.x. We should update the azure python packages, however, that is a much bigger effort. This is needed to make sure nixops keeps working with Azure. (cherry picked from commit 81f2bde0a2af99d84666628fae89af648ce2fa3e) --- pkgs/top-level/python-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40201bc6047..d49fcc8613c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1762,6 +1762,11 @@ in { url = mirror://pypi/a/azure-mgmt-resource/azure-mgmt-resource-0.20.1.zip; sha256 = "0slh9qfm5nfacrdm3lid0sr8kwqzgxvrwf27laf9v38kylkfqvml"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/resource/resourcemanagement.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py From 9ed445a0f780c00043adc3e6457f9db518cd1814 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 11 Feb 2017 16:48:58 +0200 Subject: [PATCH 057/138] wineUnstable: 2.0 -> 2.1 --- pkgs/misc/emulators/wine/sources.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index e86c6bef05a..e8409a631c3 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -31,23 +31,23 @@ in rec { }; unstable = fetchurl rec { - version = "2.0"; - url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.bz2"; - sha256 = "1ik6q0h3ph3jizmp7bxhf6kcm1pzrdrn2m0yf2x86slv2aigamlp"; + version = "2.1"; + url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz"; + sha256 = "0vhykmypv8zqdma7nfwv40klwaywcslam6cmipr3vjci6vvapfdz"; inherit (stable) mono gecko32 gecko64; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "02jrdm49zlc0f357m0z65pilmg4lxh16va32ll3p4y8vr13nwawk"; + sha256 = "1r3mpdyhq3nmbqgj99bgrhx202k5c046bl8fhi5hr1x0adybb9hs"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20170101"; - sha256 = "0c2aam68x3nlvc6f4r6rnfw6y3a86644zb0qirwkmh3p04mpdl39"; + version = "20170207"; + sha256 = "1zmx041rxxawkv3ifsdjbmshp654bib75n5hll0g1f205arbahzw"; owner = "Winetricks"; repo = "winetricks"; rev = version; From a74d1594f1db7ae22179dec4ab32fe2c324524e8 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 12 Feb 2017 09:23:52 +0000 Subject: [PATCH 058/138] Make azure-mgmt-... work with requests 2.11.x. We should update the azure python packages, however, that is a much bigger effort. This is needed to make sure nixops keeps working with Azure. (cherry picked from commit 4eb92c5c64906a5142e7cb34bdcfc7e16ab77dd1) --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d49fcc8613c..985ab3ae6be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1706,6 +1706,11 @@ in { url = mirror://pypi/a/azure-mgmt-compute/azure-mgmt-compute-0.20.0.zip; sha256 = "12hr5vxdg2sk2fzr608a37f4i8nbchca7dgdmly2w5fc7x88jx2v"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/compute/computemanagement.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -1726,6 +1731,11 @@ in { url = mirror://pypi/a/azure-mgmt-network/azure-mgmt-network-0.20.1.zip; sha256 = "10vj22h6nxpw0qpvib5x2g6qs5j8z31142icvh4qk8k40fcrs9hx"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/network/networkresourceprovider.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py @@ -1787,6 +1797,11 @@ in { url = mirror://pypi/a/azure-mgmt-storage/azure-mgmt-storage-0.20.0.zip; sha256 = "16iw7hqhq97vlzfwixarfnirc60l5mz951p57brpcwyylphl3yim"; }; + preConfigure = '' + # Patch to make this package work on requests >= 2.11.x + # CAN BE REMOVED ON NEXT PACKAGE UPDATE + sed -i 's|len(request_content)|str(len(request_content))|' azure/mgmt/storage/storagemanagement.py + ''; postInstall = '' echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py From bee23d7dfc944de82a1b6945294567ed98f964d2 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 12 Feb 2017 10:27:36 +0100 Subject: [PATCH 059/138] pythonPackages.argparse: only for Python < 2.7 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 985ab3ae6be..0b4e5cb462c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1321,7 +1321,7 @@ in { }; - argparse = buildPythonPackage (rec { + argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec { name = "argparse-1.4.0"; src = pkgs.fetchurl { From af9857ef47b6afa68b8631f3b5e7299e60a8764f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 12 Feb 2017 09:59:23 +0000 Subject: [PATCH 060/138] proj: disable tests on 32 bit --- pkgs/development/libraries/proj/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix index 8fceacd870a..b92aa49a092 100644 --- a/pkgs/development/libraries/proj/default.nix +++ b/pkgs/development/libraries/proj/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1xw5f427xk9p2nbsj04j6m5zyjlyd66sbvl2bkg8hd1kx8pm9139"; }; - doCheck = true; + doCheck = stdenv.is64bit; meta = with stdenv.lib; { description = "Cartographic Projections Library"; From 543721d766af9980f4a47225128936a3cdf5ebe5 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 12 Feb 2017 11:27:13 +0100 Subject: [PATCH 061/138] Revert "pythonPackages.argparse: only for Python < 2.7" Mass-rebuild, goes into staging. This reverts commit bee23d7dfc944de82a1b6945294567ed98f964d2. --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b4e5cb462c..985ab3ae6be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1321,7 +1321,7 @@ in { }; - argparse = if (pythonAtLeast "2.7") then null else buildPythonPackage (rec { + argparse = buildPythonPackage (rec { name = "argparse-1.4.0"; src = pkgs.fetchurl { From 5b1a1b0e50995d5d8ff11b7986bbc85aa800b4ce Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Feb 2017 11:32:02 +0100 Subject: [PATCH 062/138] pythonPackages.afew: 2016-02-29 -> 2017-02-08 Failed to build because sha256 of the source tarball changed. --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 985ab3ae6be..85898169729 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -551,13 +551,13 @@ in { }; afew = buildPythonPackage rec { - rev = "b19a88fa1c06cc03ed6c636475cf4361b616d128"; - name = "afew-git-2016-02-29"; + name = "afew-git-2017-02-08"; - src = pkgs.fetchurl { - url = "https://github.com/teythoon/afew/tarball/${rev}"; - name = "${name}.tar.bz"; - sha256 = "0idlyrk29bmjw3w74vn0c1a6s59phx9zhzghf2cpyqf9qdhxib8k"; + src = pkgs.fetchFromGitHub { + owner = "afewmail"; + repo = "afew"; + rev = "889a3b966835c4d16aa1f24bb89f12945b9b2a67"; + sha256 = "01gwrx1m3ka13ps3vj04a3y8llli2j2vkd3gcggcvxdphhpysckm"; }; buildInputs = with self; [ pkgs.dbacl ]; From 9960f7e9f8e94756c3321951cac1034d9a14421e Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Sun, 12 Feb 2017 11:41:47 +0100 Subject: [PATCH 063/138] flow: 0.37.4 -> 0.39.0 --- pkgs/development/tools/analysis/flow/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 4e15ed8572e..a63e9f65e5c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }: +{ stdenv, fetchFromGitHub, lib, ocaml_4_02, libelf, cf-private, CoreServices }: with lib; stdenv.mkDerivation rec { - version = "0.37.4"; + version = "0.39.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "0v3hi2wn4ysybmd768wdmijlbnq41i6yzzzj5d7cmd4blzd9c0nq"; + sha256 = "05a0kvhlakm7c7n19npg77rj52cz6282290126sfn0qq2059zhli"; }; installPhase = '' @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml libelf ] + buildInputs = [ ocaml_4_02 libelf ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { From a7ca11454533b0b2f2d9fb4c481e9db5f3313486 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Fri, 10 Feb 2017 12:03:14 +0100 Subject: [PATCH 064/138] libretro: add mGBA core Closes #22618. --- pkgs/misc/emulators/retroarch/cores.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 8247f95f9da..50f73d6f4e6 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -182,6 +182,16 @@ in buildPhase = "make"; }; + mgba = mkLibRetroCore rec { + core = "mgba"; + src = fetchRetro { + repo = core; + rev = "4000128339b535896615c994cafcd777637573f4"; + sha256 = "1yar78rvgfqx7jdna9chkmmbnpcf7k9ckbzj506f7k7m7zv819fn"; + }; + description = "Port of mGBA to libretro"; + }; + mupen64plus = (mkLibRetroCore rec { core = "mupen64plus"; src = fetchRetro { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d7d103c00a..2a482388290 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15615,6 +15615,7 @@ with pkgs; ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast ++ optional (cfg.enableMednafenPSX or false) mednafen-psx ++ optional (cfg.enableMednafenSaturn or false) mednafen-saturn + ++ optional (cfg.enableMGBA or false) mgba ++ optional (cfg.enableMupen64Plus or false) mupen64plus ++ optional (cfg.enableNestopia or false) nestopia ++ optional (cfg.enablePicodrive or false) picodrive From ffefd8389775f8d256ca6dddcfd4573d12a8ee71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Feb 2017 12:50:04 +0100 Subject: [PATCH 065/138] xorg xf86-video-*: bump drivers that seem unused I verified they build, at least with xorg-server-1.19.1. --- pkgs/servers/x11/xorg/default.nix | 72 ++++++++++++------------- pkgs/servers/x11/xorg/overrides.nix | 8 --- pkgs/servers/x11/xorg/tarballs-7.7.list | 24 ++++----- 3 files changed, 48 insertions(+), 56 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index b825d86ac8d..285c4504280 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videochips = (mkDerivation "xf86videochips" { - name = "xf86-video-chips-1.2.6"; + name = "xf86-video-chips-1.2.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2; - sha256 = "073bcdsvvsg19mb963sa5v7x2zs19y0q6javmgpiwfaqkz7zbblr"; + url = mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2; + sha256 = "0n4zypmbkjzkw36cjy2braaivhvj60np6w80lcs9mfpabs66ia3f"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1736,11 +1736,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videodummy = (mkDerivation "xf86videodummy" { - name = "xf86-video-dummy-0.3.7"; + name = "xf86-video-dummy-0.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2; - sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n"; + url = mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2; + sha256 = "1fcm9vwgv8wnffbvkzddk4yxrh3kc0np6w65wj8k88q7jf3bn4ip"; }; buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1780,11 +1780,11 @@ let }) // {inherit xextproto xorgserver xproto ;}; xf86videoglint = (mkDerivation "xf86videoglint" { - name = "xf86-video-glint-1.2.8"; + name = "xf86-video-glint-1.2.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2; - sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5"; + url = mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2; + sha256 = "1lkpspvrvrp9s539bhfdjfh4andaqyk63l6zjn8m3km95smk6a45"; }; buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1802,11 +1802,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoi740 = (mkDerivation "xf86videoi740" { - name = "xf86-video-i740-1.3.5"; + name = "xf86-video-i740-1.3.6"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2; - sha256 = "0973zzmdsvlmplcax1c91is7v78lcwy6d9mwp11npgqzl782vq0w"; + url = mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2; + sha256 = "0c8nl0yyyw08n4zd6sgw9p3a858wpgf6raczjd70gf47lncms389"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1836,11 +1836,11 @@ let }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videomga = (mkDerivation "xf86videomga" { - name = "xf86-video-mga-1.6.4"; + name = "xf86-video-mga-1.6.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2; - sha256 = "0kyl8w99arviv27pc349zsy2vinnm7mdpy34vr9nzisicw5nkij8"; + url = mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2; + sha256 = "08ll52hlar9z446v0wwca5qkj3hxhswwm7vvcgic9xv4cf7csqxn"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1880,11 +1880,11 @@ let }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videonv = (mkDerivation "xf86videonv" { - name = "xf86-video-nv-2.1.20"; + name = "xf86-video-nv-2.1.21"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2; - sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3"; + url = mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2; + sha256 = "0bdk3pc5y0n7p53q4gc2ff7bw16hy5hwdjjxkm5j3s7hdyg6960z"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1913,11 +1913,11 @@ let }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; xf86videor128 = (mkDerivation "xf86videor128" { - name = "xf86-video-r128-6.10.0"; + name = "xf86-video-r128-6.10.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2; - sha256 = "0g9m1n5184h05mq14vb6k288zm6g81a9m048id00l8v8f6h33mc0"; + url = mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2; + sha256 = "1pkpka5m4cd6iy0f8iqnmg6xci14nb6887ilvxzn3xrsgx8j3nl4"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1946,33 +1946,33 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videosavage = (mkDerivation "xf86videosavage" { - name = "xf86-video-savage-2.3.8"; + name = "xf86-video-savage-2.3.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2; - sha256 = "0qzshncynjdmyhavhqw4x5ha3gwbygi0zbsy158fpg1jcnla9kpx"; + url = mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2; + sha256 = "11pcrsdpdrwk0mrgv83s5nsx8a9i4lhmivnal3fjbrvi3zdw94rc"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;}; xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" { - name = "xf86-video-siliconmotion-1.7.8"; + name = "xf86-video-siliconmotion-1.7.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2; - sha256 = "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79"; + url = mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2; + sha256 = "1g2r6gxqrmjdff95d42msxdw6vmkg2zn5sqv0rxd420iwy8wdwyh"; }; buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;}; xf86videosis = (mkDerivation "xf86videosis" { - name = "xf86-video-sis-0.10.8"; + name = "xf86-video-sis-0.10.9"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2; - sha256 = "1znkqwdyd6am23xbsfjzamq125j5rrylg5mzqky4scv9gxbz5wy8"; + url = mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2; + sha256 = "03f1abjjf68y8y1iz768rn95va9d33wmbwfbsqrgl6k0gi0bf9jj"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2001,11 +2001,11 @@ let }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; xf86videotdfx = (mkDerivation "xf86videotdfx" { - name = "xf86-video-tdfx-1.4.6"; + name = "xf86-video-tdfx-1.4.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2; - sha256 = "0dvdrhyn1iv6rr85v1c52s1gl0j1qrxgv7x0r7qn3ba0gj38i2is"; + url = mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2; + sha256 = "0hia45z4jc472fxp00803nznizcn4h1ybp63jcsb4lmd9vhqxx2c"; }; buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2023,11 +2023,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;}; xf86videotrident = (mkDerivation "xf86videotrident" { - name = "xf86-video-trident-1.3.7"; + name = "xf86-video-trident-1.3.8"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2; - sha256 = "1bhkwic2acq9za4yz4bwj338cwv5mdrgr2qmgkhlj3bscbg1imgc"; + url = mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2; + sha256 = "0gxcar434kx813fxdpb93126lhmkl3ikabaljhcj5qn3fkcijlcy"; }; buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 3ae7b481978..d706a096321 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -338,7 +338,6 @@ in xf86videoark = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videogeode = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoglide = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; - xf86videoglint = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoi128 = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videonewport = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; xf86videoopenchrome = attrs: attrs // { meta = attrs.meta // { broken = true; }; }; @@ -355,13 +354,6 @@ in NIX_CFLAGS_COMPILE = "-I${xorg.xorgserver.dev or xorg.xorgserver}/include/xorg"; }; - xf86videonv = attrs: attrs // { - patches = [( args.fetchpatch { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-nv/patch/?id=fc78fe98222b0204b8a2872a529763d6fe5048da; - sha256 = "0i2ddgqwj6cfnk8f4r73kkq3cna7hfnz7k3xj3ifx5v8mfiva6gw"; - })]; - }; - xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker }; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index c0d2065a9ff..143411304db 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -132,34 +132,34 @@ mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ast-1.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-ati-7.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.13.tar.bz2 -mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-chips-1.2.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-dummy-0.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-dummy-0.3.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-fbdev-0.4.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-geode-2.11.17.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-glint-1.2.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-i740-1.3.5.tar.bz2 +mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-mga-1.6.4.tar.bz2 +mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 -mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 +mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 mirror://xorg/individual/driver/xf86-video-openchrome-0.3.3.tar.bz2 -mirror://xorg/individual/driver/xf86-video-r128-6.10.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-r128-6.10.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-rendition-4.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 -mirror://xorg/individual/driver/xf86-video-savage-2.3.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.8.tar.bz2 -mirror://xorg/individual/driver/xf86-video-sis-0.10.8.tar.bz2 +mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-tdfx-1.4.6.tar.bz2 +mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 -mirror://xorg/individual/driver/xf86-video-trident-1.3.7.tar.bz2 +mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-v4l-0.2.0.tar.bz2 mirror://xorg/individual/driver/xf86-video-vesa-2.3.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-vmware-13.2.1.tar.bz2 From e970b8e8df6bffcbbea2a1bd58a6efb5ac35e286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Feb 2017 13:00:37 +0100 Subject: [PATCH 066/138] xorg xf86-input-evdev: 2.10.3 -> 2.10.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 285c4504280..c1b97ccc147 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1571,11 +1571,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.3"; + name = "xf86-input-evdev-2.10.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2; - sha256 = "18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2; + sha256 = "03dphgwjaxxyys8axc1kyysp6xvy9bjxicsdrhi2jvdgbchadnly"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 143411304db..c5d4fda1aa2 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -119,7 +119,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 From 53600eae3d5fb884c884ae14fc8776691fbcb7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Feb 2017 13:01:24 +0100 Subject: [PATCH 067/138] xorg xf86-input-libinput: 0.19.1 -> 0.23.0 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index c1b97ccc147..19f31fa3d0e 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1604,11 +1604,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.19.1"; + name = "xf86-input-libinput-0.23.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; - sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2; + sha256 = "1p596v3kbmjpdz3kz8z19bnd79l860f1pbwjvma7bz7qx3gynlqb"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index c5d4fda1aa2..185a4485c6a 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -122,7 +122,7 @@ mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.5.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.23.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 From d4b8737e007e1d298364397e37106f0674413d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Feb 2017 13:07:55 +0100 Subject: [PATCH 068/138] xorg: add xf86-video-{sisusb,sunleo} They might be useless, but they build :-) --- pkgs/servers/x11/xorg/default.nix | 22 ++++++++++++++++++++++ pkgs/servers/x11/xorg/tarballs-7.7.list | 2 ++ 2 files changed, 24 insertions(+) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 19f31fa3d0e..1fb5ac85d60 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1978,6 +1978,17 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;}; + xf86videosisusb = (mkDerivation "xf86videosisusb" { + name = "xf86-video-sisusb-0.9.7"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2; + sha256 = "090lfs3hjz3cjd016v5dybmcsigj6ffvjdhdsqv13k90p4b08h7l"; + }; + buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xineramaproto xorgserver xproto ;}; + xf86videosuncg6 = (mkDerivation "xf86videosuncg6" { name = "xf86-video-suncg6-1.1.2"; builder = ./builder.sh; @@ -2000,6 +2011,17 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;}; + xf86videosunleo = (mkDerivation "xf86videosunleo" { + name = "xf86-video-sunleo-1.2.2"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2; + sha256 = "1gacm0s6rii4x5sx9py5bhvs50jd4vs3nnbwjdjymyf31kpdirl3"; + }; + buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ]; + meta.platforms = stdenv.lib.platforms.unix; + }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;}; + xf86videotdfx = (mkDerivation "xf86videotdfx" { name = "xf86-video-tdfx-1.4.7"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 185a4485c6a..d5470039315 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -155,8 +155,10 @@ mirror://xorg/individual/driver/xf86-video-s3virge-1.10.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-savage-2.3.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-siliconmotion-1.7.9.tar.bz2 mirror://xorg/individual/driver/xf86-video-sis-0.10.9.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sisusb-0.9.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-suncg6-1.1.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-sunffb-1.2.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-sunleo-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-tdfx-1.4.7.tar.bz2 mirror://xorg/individual/driver/xf86-video-tga-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-trident-1.3.8.tar.bz2 From c5c0f63320039a43aa1351bb11d006e66f0f4a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Feb 2017 13:10:51 +0100 Subject: [PATCH 069/138] xorg xf86-video-qxl: 0.1.3 -> 0.1.5 --- pkgs/servers/x11/xorg/default.nix | 6 +++--- pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 1fb5ac85d60..01a45208309 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1902,11 +1902,11 @@ let }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videoqxl = (mkDerivation "xf86videoqxl" { - name = "xf86-video-qxl-0.1.3"; + name = "xf86-video-qxl-0.1.5"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2; - sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m"; + url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2; + sha256 = "14jc24znnahhmz4kqalafmllsg8awlz0y6gpgdpk5ih38ph851mi"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index d5470039315..8ca45b8b161 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -144,7 +144,7 @@ mirror://xorg/individual/driver/xf86-video-i740-1.3.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.5.tar.bz2 -mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 +mirror://xorg/individual/driver/xf86-video-qxl-0.1.5.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.9.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.21.tar.bz2 From 3348905cdecff53190eb011e76ab2dba5855c107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Feb 2017 13:12:10 +0100 Subject: [PATCH 070/138] xorg-server: major bump 1.18.4 -> 1.19.1 I encountered no problems with it. Nvidia binary drivers are tested, and AMD ones now both set `abiCompat` to use older server versions. --- nixos/doc/manual/release-notes/rl-1703.xml | 6 ++++++ pkgs/servers/x11/xorg/default.nix | 10 +++++----- pkgs/servers/x11/xorg/overrides.nix | 1 + pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index ae8aeb6e707..37173ccd744 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -15,6 +15,12 @@ has the following highlights: xlink:href="https://nixos.org/nixpkgs/manual/#sec-overlays-install">Nixpkgs manual for more information. + + + X.org server uses branch 1.19. Due to ABI incompatibilities, + ati_unfree keeps forcing 1.17 + and amdgpu-pro starts forcing 1.18. + The following new services were added since the last release: diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 01a45208309..d81879d5169 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -2364,15 +2364,15 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.18.4"; + name = "xorg-server-1.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2; - sha256 = "1j1i3n5xy1wawhk95kxqdc54h34kg7xp4nnramba2q8xqfr5k117"; + url = mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2; + sha256 = "1yx7cnlhl14hsdq5lg0740s4nxqxkmaav38x428llv1zkprjrbkr"; }; - buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; + buildInputs = [pkgconfig dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ]; meta.platforms = stdenv.lib.platforms.unix; - }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; + }) // {inherit dri2proto dri3proto renderproto openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d706a096321..0afbb21ea22 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -428,6 +428,7 @@ in damageproto xcmiscproto bigreqsproto inputproto xextproto randrproto renderproto presentproto dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + libXfont2 ]; # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 commonPatches = [ ]; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8ca45b8b161..8d37d9f46b5 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -185,7 +185,7 @@ mirror://xorg/individual/app/xlsfonts-1.0.5.tar.bz2 mirror://xorg/individual/app/xmag-1.0.6.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.9.tar.bz2 mirror://xorg/individual/doc/xorg-docs-1.7.1.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.18.4.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.19.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 From 9e04b57dde58c4db462bba8057e49eb071f5e5c0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 12 Feb 2017 02:56:29 +0200 Subject: [PATCH 071/138] nixos top-level: Add 'dtbs' symlink when kernel uses device trees Currently e.g. extlinux-conf-builder.sh uses `readlink -m "$toplevel/kernel/../dtbs"` to figure out the directory. That is obscenely ugly. --- nixos/modules/system/activation/top-level.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 0c08375da64..84c23bed3e3 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -45,6 +45,9 @@ let ln -s ${kernelPath} $out/kernel ln -s ${config.system.modulesTree} $out/kernel-modules + ${optionalString (pkgs.stdenv.platform.kernelDTB or false) '' + ln -s ${config.boot.kernelPackages.kernel}/dtbs $out/dtbs + ''} echo -n "$kernelParams" > $out/kernel-params From 824d82fa0f6fdd1b2213020283d8bd7aa77738b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 6 Jun 2016 17:38:51 +0200 Subject: [PATCH 072/138] nixos/geoip-updater: new service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GeoIP databases from MaxMind have no stable URLs and change every month (or so). Our current method of packaging these database in Nix and playing catch-up with ever-changing file hashes is a bad idea. For instance, it makes it impossible to realize old NixOS configurations. This patch adds a NixOS service that periodically updates the GeoIP databases in /var/lib/geoip-databases. Moving NixOS modules over can be done in later patches. I tried adding MD5 check, but not all databases have them, so i skipped it. We are downloading over HTTPS though, it should be good. I also tried adding zip support, but the first zip file I extracted had a different filename inside than the archive name, which breaks an assumption in this service, so I skipped that too. Changes v9 -> v10: - Pass "--max-time" to curl to set upper bound on downloads (ensures no indefinite hanging if there's problem with networking). Timeout for network connectivity check: 60s. Timeout for geoip database (each): 15m. Changes v8 -> v9: - Mention the random timer delay in the documentation for the 'interval' option. Changes v7 -> v8: - Add "RemainAfterExit=true" for the setup service, so it won't be restarted needlessly. (Thanks @danbst!) Changes v6 -> v7: - Add --skip-existing flag to geoip-updater, which skips updating existing database files. Pass that flag when we run the service on boot (and on any NixOS configuration change). (IMHO, this is somewhat a workaround for systemd persistent timers not being triggered immediately when a timer has never expired before. But it does have the nice side effect of ensuring that the installed databases always correspond to the configured ones, since the service is now always run after configuration changes.) Changes v5 -> v6: - Update database files atomically (per DB) - If a database is removed from the configuration, it'll be removed from /var/lib/geoip-databases too (on next run). - Add NixOS module assertion so that if user inputs non- .gz or .xz file there will be a build time error instead of runtime. - Run updater as user "nobody" instead of "root". - Rename NixOS service from "geoip-databases" to "geoip-updater". - Drop RemainAfterExit, or else the timer won't trigger the unit. - Bring back "curl --fail", or else we won't catch and log curl failures. Changes v4 -> v5: - Add "GeoLite2-City.mmdb.gz" to default database list. Changes v3 -> v4: - Remove unneeded geoip-updater-setup.service after adding 'wantedBy = [ "multi-user.target" ]' directly to geoip-updater.service - Drop unneeded "Service" name from service descriptions. Changes v2 -> v3: - Network may be down when starting from a cold boot, so try a few times. Possibly, if using systemd-networkd, it'll pass on the first try. But with default DHCP on NixOS, the service is started before hostnames can be resolved and thus we need a few extra seconds. - Add error handling and mark service as failed if fatal error. - Add proper syslog log levels. - Add RandomizedDelaySec=3600 to the timer to not put high load on the MaxMind servers. Suggested by @Mic92. - Set RemainAfterExit on geoip-updater.service instead of geoip-updater-setup.service. (The latter is only a proxy that pulls in the former service). Changes v1 -> v2: From Данило Глинський (Danylo Hlynskyi) : nixos/geoip-databases: add `databases` option and fix initial setup There were two great issues when using this service: - When you just enable service, databases aren't downloaded, they are downloaded when timer triggers. Fixed this with automatic download on first system activation. - When there is no internet, updater outputs nothing to logs, which is IMO misbehavior. Fixed this with removing `--fail` option, better be explicit here. --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/geoip-updater.nix | 300 ++++++++++++++++++ 2 files changed, 301 insertions(+) create mode 100644 nixos/modules/services/misc/geoip-updater.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7c9c9ac2a1e..9bf6a400b09 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -259,6 +259,7 @@ ./services/misc/felix.nix ./services/misc/folding-at-home.nix ./services/misc/gammu-smsd.nix + ./services/misc/geoip-updater.nix #./services/misc/gitit.nix ./services/misc/gitlab.nix ./services/misc/gitolite.nix diff --git a/nixos/modules/services/misc/geoip-updater.nix b/nixos/modules/services/misc/geoip-updater.nix new file mode 100644 index 00000000000..021ee02782d --- /dev/null +++ b/nixos/modules/services/misc/geoip-updater.nix @@ -0,0 +1,300 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.geoip-updater; + + dbBaseUrl = "https://geolite.maxmind.com/download/geoip/database"; + + randomizedTimerDelaySec = "3600"; + + # Use writeScriptBin instead of writeScript, so that argv[0] (logged to the + # journal) doesn't include the long nix store path hash. (Prefixing the + # ExecStart= command with '@' doesn't work because we start a shell (new + # process) that creates a new argv[0].) + geoip-updater = pkgs.writeScriptBin "geoip-updater" '' + #!${pkgs.stdenv.shell} + skipExisting=0 + debug() + { + echo "<7>$@" + } + info() + { + echo "<6>$@" + } + error() + { + echo "<3>$@" + } + die() + { + error "$@" + exit 1 + } + waitNetworkOnline() + { + ret=1 + for i in $(seq 6); do + curl_out=$("${pkgs.curl.bin}/bin/curl" \ + --silent --fail --show-error --max-time 60 "${dbBaseUrl}" 2>&1) + if [ $? -eq 0 ]; then + debug "Server is reachable (try $i)" + ret=0 + break + else + debug "Server is unreachable (try $i): $curl_out" + sleep 10 + fi + done + return $ret + } + dbFnameTmp() + { + dburl=$1 + echo "${cfg.databaseDir}/.$(basename "$dburl")" + } + dbFnameTmpDecompressed() + { + dburl=$1 + echo "${cfg.databaseDir}/.$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//' + } + dbFname() + { + dburl=$1 + echo "${cfg.databaseDir}/$(basename "$dburl")" | sed 's/\.\(gz\|xz\)$//' + } + downloadDb() + { + dburl=$1 + curl_out=$("${pkgs.curl.bin}/bin/curl" \ + --silent --fail --show-error --max-time 900 -L -o "$(dbFnameTmp "$dburl")" "$dburl" 2>&1) + if [ $? -ne 0 ]; then + error "Failed to download $dburl: $curl_out" + return 1 + fi + } + decompressDb() + { + fn=$(dbFnameTmp "$1") + ret=0 + case "$fn" in + *.gz) + cmd_out=$("${pkgs.gzip}/bin/gzip" --decompress --force "$fn" 2>&1) + ;; + *.xz) + cmd_out=$("${pkgs.xz.bin}/bin/xz" --decompress --force "$fn" 2>&1) + ;; + *) + cmd_out=$(echo "File \"$fn\" is neither a .gz nor .xz file") + false + ;; + esac + if [ $? -ne 0 ]; then + error "$cmd_out" + ret=1 + fi + } + atomicRename() + { + dburl=$1 + mv "$(dbFnameTmpDecompressed "$dburl")" "$(dbFname "$dburl")" + } + removeIfNotInConfig() + { + # Arg 1 is the full path of an installed DB. + # If the corresponding database is not specified in the NixOS config we + # remove it. + db=$1 + for cdb in ${lib.concatStringsSep " " cfg.databases}; do + confDb=$(echo "$cdb" | sed 's/\.\(gz\|xz\)$//') + if [ "$(basename "$db")" = "$(basename "$confDb")" ]; then + return 0 + fi + done + rm "$db" + if [ $? -eq 0 ]; then + debug "Removed $(basename "$db") (not listed in services.geoip-updater.databases)" + else + error "Failed to remove $db" + fi + } + removeUnspecifiedDbs() + { + for f in "${cfg.databaseDir}/"*; do + test -f "$f" || continue + case "$f" in + *.dat|*.mmdb|*.csv) + removeIfNotInConfig "$f" + ;; + *) + debug "Not removing \"$f\" (unknown file extension)" + ;; + esac + done + } + downloadAndInstall() + { + dburl=$1 + if [ "$skipExisting" -eq 1 -a -f "$(dbFname "$dburl")" ]; then + debug "Skipping existing file: $(dbFname "$dburl")" + return 0 + fi + downloadDb "$dburl" || return 1 + decompressDb "$dburl" || return 1 + atomicRename "$dburl" || return 1 + info "Updated $(basename "$(dbFname "$dburl")")" + } + for arg in "$@"; do + case "$arg" in + --skip-existing) + skipExisting=1 + info "Option --skip-existing is set: not updating existing databases" + ;; + *) + error "Unknown argument: $arg";; + esac + done + waitNetworkOnline || die "Network is down (${dbBaseUrl} is unreachable)" + test -d "${cfg.databaseDir}" || die "Database directory (${cfg.databaseDir}) doesn't exist" + debug "Starting update of GeoIP databases in ${cfg.databaseDir}" + all_ret=0 + for db in ${lib.concatStringsSep " \\\n " cfg.databases}; do + downloadAndInstall "${dbBaseUrl}/$db" || all_ret=1 + done + removeUnspecifiedDbs || all_ret=1 + if [ $all_ret -eq 0 ]; then + info "Completed GeoIP database update in ${cfg.databaseDir}" + else + error "Completed GeoIP database update in ${cfg.databaseDir}, with error(s)" + fi + # Hack to work around systemd journal race: + # https://github.com/systemd/systemd/issues/2913 + sleep 2 + exit $all_ret + ''; + +in + +{ + options = { + services.geoip-updater = { + enable = mkOption { + default = false; + type = types.bool; + description = '' + Whether to enable periodic downloading of GeoIP databases from + maxmind.com. You might want to enable this if you, for instance, use + ntopng or Wireshark. + ''; + }; + + interval = mkOption { + type = types.str; + default = "weekly"; + description = '' + Update the GeoIP databases at this time / interval. + The format is described in + systemd.time + 7. + To prevent load spikes on maxmind.com, the timer interval is + randomized by an additional delay of ${randomizedTimerDelaySec} + seconds. Setting a shorter interval than this is not recommended. + ''; + }; + + databaseDir = mkOption { + type = types.path; + default = "/var/lib/geoip-databases"; + description = '' + Directory that will contain GeoIP databases. + ''; + }; + + databases = mkOption { + type = types.listOf types.str; + default = [ + "GeoLiteCountry/GeoIP.dat.gz" + "GeoIPv6.dat.gz" + "GeoLiteCity.dat.xz" + "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" + "asnum/GeoIPASNum.dat.gz" + "asnum/GeoIPASNumv6.dat.gz" + "GeoLite2-Country.mmdb.gz" + "GeoLite2-City.mmdb.gz" + ]; + description = '' + Which GeoIP databases to update. The full URL is ${dbBaseUrl}/ + + the_database. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + assertions = [ + { assertion = (builtins.filter + (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases) == []; + message = '' + services.geoip-updater.databases supports only .gz and .xz databases. + + Current value: + ${toString cfg.databases} + + Offending element(s): + ${toString (builtins.filter (x: builtins.match ".*\.(gz|xz)$" x == null) cfg.databases)}; + ''; + } + ]; + + systemd.timers.geoip-updater = + { description = "GeoIP Updater Timer"; + partOf = [ "geoip-updater.service" ]; + wantedBy = [ "timers.target" ]; + timerConfig.OnCalendar = cfg.interval; + timerConfig.Persistent = "true"; + timerConfig.RandomizedDelaySec = randomizedTimerDelaySec; + }; + + systemd.services.geoip-updater = { + description = "GeoIP Updater"; + after = [ "network-online.target" "nss-lookup.target" ]; + wants = [ "network-online.target" ]; + preStart = '' + mkdir -p "${cfg.databaseDir}" + chmod 755 "${cfg.databaseDir}" + chown nobody:root "${cfg.databaseDir}" + ''; + serviceConfig = { + ExecStart = "${geoip-updater}/bin/geoip-updater"; + User = "nobody"; + PermissionsStartOnly = true; + }; + }; + + systemd.services.geoip-updater-setup = { + description = "GeoIP Updater Setup"; + after = [ "network-online.target" "nss-lookup.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + conflicts = [ "geoip-updater.service" ]; + preStart = '' + mkdir -p "${cfg.databaseDir}" + chmod 755 "${cfg.databaseDir}" + chown nobody:root "${cfg.databaseDir}" + ''; + serviceConfig = { + ExecStart = "${geoip-updater}/bin/geoip-updater --skip-existing"; + User = "nobody"; + PermissionsStartOnly = true; + # So it won't be (needlessly) restarted: + RemainAfterExit = true; + }; + }; + + }; +} From 8e19dc565ec43d9ca7722aa0527224f19086d56e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Feb 2017 15:44:19 +0100 Subject: [PATCH 073/138] pythonPackages.slixmpp: 1.2.1 -> 1.2.4.post1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 85898169729..4a0fd02df5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15572,13 +15572,13 @@ in { slixmpp = buildPythonPackage rec { name = "slixmpp-${version}"; - version = "1.2.1"; + version = "1.2.4.post1"; disabled = pythonOlder "3.4"; src = pkgs.fetchurl { url = "mirror://pypi/s/slixmpp/${name}.tar.gz"; - sha256 = "0fwngxf2pnmpk8vhv4pfxvl1ya3nxr4kc2z6jrh2imynbry3xfj9"; + sha256 = "0v6430dczai8a2nmznhja2dxl6pxa8c5j20nhc5737bqjg7245jk"; }; patchPhase = '' From cf4775571fe55fdbb41fc99a423452f72e460fef Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 12 Feb 2017 15:55:35 +0100 Subject: [PATCH 074/138] poezio: 0.10 -> 0.11 --- .../poezio/fix_plugins_imports.patch | 80 ------------------- .../poezio/make_default_config_writable.patch | 25 ------ pkgs/top-level/python-packages.nix | 7 +- 3 files changed, 3 insertions(+), 109 deletions(-) delete mode 100644 pkgs/development/python-modules/poezio/fix_plugins_imports.patch delete mode 100644 pkgs/development/python-modules/poezio/make_default_config_writable.patch diff --git a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch b/pkgs/development/python-modules/poezio/fix_plugins_imports.patch deleted file mode 100644 index 821b9c41588..00000000000 --- a/pkgs/development/python-modules/poezio/fix_plugins_imports.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Nur poezio-0.10.orig/plugins/canat.py poezio-0.10/plugins/canat.py ---- poezio-0.10.orig/plugins/canat.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/canat.py 2016-11-16 14:32:21.565445266 +0100 -@@ -34,9 +34,9 @@ - - - """ --from plugin import BasePlugin --import tabs --from decorators import command_args_parser -+from poezio.plugin import BasePlugin -+import poezio.tabs -+from poezio.decorators import command_args_parser - - def move(text, step, spacing): - new_text = text + (" " * spacing) -diff -Nur poezio-0.10.orig/plugins/corrections_diff.py poezio-0.10/plugins/corrections_diff.py ---- poezio-0.10.orig/plugins/corrections_diff.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/corrections_diff.py 2016-11-16 14:30:53.992684959 +0100 -@@ -22,11 +22,11 @@ - - - """ --from plugin import BasePlugin -+from poezio.plugin import BasePlugin - import difflib -+import collections - from functools import wraps --import tabs --from config import config -+from poezio.config import config - - shim_message_fields = ('txt nick_color time str_time nickname user identifier' - ' highlight me old_message revisions jid ack') -@@ -61,10 +61,6 @@ - rev -= 1 - return ''.join(acc) - --Message.__repr__ = repr_message --Message.__str__ = repr_message -- -- - - def corrections_enabled(func): - @wraps(func) -diff -Nur poezio-0.10.orig/plugins/coucou.py poezio-0.10/plugins/coucou.py ---- poezio-0.10.orig/plugins/coucou.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/coucou.py 2016-11-16 14:25:37.101337668 +0100 -@@ -1,4 +1,4 @@ --from plugin import BasePlugin -+from poezio.plugin import BasePlugin - import tracemalloc - import cProfile, pstats, io - -diff -Nur poezio-0.10.orig/plugins/flood.py poezio-0.10/plugins/flood.py ---- poezio-0.10.orig/plugins/flood.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/flood.py 2016-11-16 14:32:56.452155220 +0100 -@@ -1,6 +1,6 @@ --from plugin import BasePlugin --import tabs --import multiuserchat as muc -+from poezio.plugin import BasePlugin -+import poezio.tabs -+import poezio.multiuserchat as muc - - class Plugin(BasePlugin): - def init(self): -diff -Nur poezio-0.10.orig/plugins/invisible.py poezio-0.10/plugins/invisible.py ---- poezio-0.10.orig/plugins/invisible.py 2016-08-21 14:56:35.000000000 +0200 -+++ poezio-0.10/plugins/invisible.py 2016-11-16 14:31:31.743288152 +0100 -@@ -20,8 +20,7 @@ - .. _XEP-0186: https://xmpp.org/extensions/xep-0186.html - """ - --from plugin import BasePlugin --import tabs -+from poezio.plugin import BasePlugin - - class Plugin(BasePlugin): - def init(self): diff --git a/pkgs/development/python-modules/poezio/make_default_config_writable.patch b/pkgs/development/python-modules/poezio/make_default_config_writable.patch deleted file mode 100644 index 03d732e256c..00000000000 --- a/pkgs/development/python-modules/poezio/make_default_config_writable.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN a/src/config.py b/src/config.py ---- a/src/config.py 2015-07-31 19:35:37.000000000 +0000 -+++ b/src/config.py 2015-08-03 09:23:34.322098081 +0000 -@@ -14,6 +14,7 @@ - - import logging.config - import os -+import stat - import sys - import pkg_resources - -@@ -563,6 +564,13 @@ - copy2(default, options.filename) - elif path.isfile(other): - copy2(other, options.filename) -+ -+ # Inside the nixstore, the reference file is readonly, so is the copy. -+ # Make it writable by the user who just created it. -+ if os.path.exists(options.filename): -+ os.chmod(options.filename, -+ os.stat(options.filename).st_mode | stat.S_IWUSR) -+ - global firstrun - firstrun = True - diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4a0fd02df5c..36ccc57b545 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -30186,7 +30186,7 @@ EOF poezio = buildPythonApplication rec { name = "poezio-${version}"; - version = "0.10"; + version = "0.11"; disabled = pythonOlder "3.4"; @@ -30194,13 +30194,12 @@ EOF propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr mpd2 ]; src = pkgs.fetchurl { - url = "http://dev.louiz.org/attachments/download/102/${name}.tar.gz"; - sha256 = "1mm0c3250p0kh7lmmjlp05hbc7byn9lknafgb906xmp4vx1p4kjn"; + url = "http://dev.louiz.org/attachments/download/118/${name}.tar.gz"; + sha256 = "07cn3717swarjv47yw8x95bvngz4nvlyyy9m7ck9fhycjgdy82r0"; }; patches = [ ../development/python-modules/poezio/fix_gnupg_import.patch - ../development/python-modules/poezio/fix_plugins_imports.patch ]; checkPhase = '' From 94b28a8072a6f93dad7ba6270422af8a99cc7e76 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Sun, 12 Feb 2017 15:06:59 +0000 Subject: [PATCH 075/138] fix systemd.services.kube-proxy to use correct extraOpts --- nixos/modules/services/cluster/kubernetes.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 029b11ad98b..a82802c3266 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -775,7 +775,7 @@ in { --bind-address=${cfg.proxy.address} \ ${optionalString cfg.verbose "--v=6"} \ ${optionalString cfg.verbose "--log-flush-frequency=1s"} \ - ${cfg.controllerManager.extraOpts} + ${cfg.proxy.extraOpts} ''; WorkingDirectory = cfg.dataDir; }; From a8d7a6a9577d70a80f55f1ddd766ee94617fad61 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 12 Feb 2017 14:18:04 -0400 Subject: [PATCH 076/138] xwayland : fix build by giving wayland-protocols to the build. --- pkgs/servers/x11/xorg/xwayland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix index ee4b5695c7c..513e4ceee62 100644 --- a/pkgs/servers/x11/xorg/xwayland.nix +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -1,5 +1,5 @@ -{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: +{ stdenv, wayland, wayland-protocols, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: with stdenv.lib; @@ -7,7 +7,7 @@ overrideDerivation xorgserver (oldAttrs: { name = "xwayland-${xorgserver.version}"; propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs - ++ [wayland epoxy libxslt makeWrapper libunwind]; + ++ [wayland wayland-protocols epoxy libxslt makeWrapper libunwind]; configureFlags = [ "--disable-docs" "--disable-devel-docs" From 84e7ad1eb7620f94760ba72f81b4ebf277608eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Fri, 20 Jan 2017 19:02:19 +0100 Subject: [PATCH 077/138] ipfs: 0.4.4 -> 0.4.5 0.4.5 introduces a new repo format. You might need to run a migration: https://github.com/ipfs/fs-repo-migrations --- pkgs/applications/networking/ipfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 0d018c9588f..40ac0917797 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "ipfs-${version}"; - version = "0.4.4"; - rev = "d905d485192616abaea25f7e721062a9e1093ab9"; + version = "0.4.5"; + rev = "2cb68b2210ba883bcd38a429ed62b7f832f8c064"; goPackagePath = "github.com/ipfs/go-ipfs"; extraSrcPaths = [ (fetchgx { inherit name src; - sha256 = "0mm1rs2mbs3rmxfcji5yal9ai3v1w75kk05bfyhgzmcjvi6lwpyb"; + sha256 = "0lq4najagdcga0zfprccprjy94nq46ja2gajij2pycag0wcc538d"; }) ]; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "06iq7fmq7p0854aqrnmd0f0jvnxy9958wvw7ibn754fdfii9l84l"; + sha256 = "087478rdj9cfl8hfrhrbb8rdlh7b1ixdj127vvkgn2k3mlz6af47"; }; meta = with stdenv.lib; { From 072adafb66d8f2a9e70d6d3965ce52b865f8ac54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Thu, 26 Jan 2017 17:25:01 +0100 Subject: [PATCH 078/138] ipfsapi: 0.4.0 -> 0.4.5-pre --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 36ccc57b545..b4ad21ffb5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7733,15 +7733,16 @@ in { ipfsapi = buildPythonPackage rec { name = "ipfsapi-${version}"; - version = "0.4.0"; + version = "0.4.5-pre"; disabled = isPy26 || isPy27; - src = pkgs.fetchurl { - url = "mirror://pypi/i/ipfsapi/${name}.tar.gz"; - sha256 = "0mqqsihannxzaqi8zcj9nca7fxwg1c85bp7xxic3xqa5zslcdcc3"; + src = pkgs.fetchFromGitHub { + owner = "ipfs"; + repo = "py-ipfs-api"; + rev = "bcce00e4a9b674d062729d82bd49a9ffbf76486f"; + sha256 = "0cdmzpk5wvi6fyfmmn96vynqkb1p59wjqjdijhm1ixf7bfl9r126"; }; - buildInputs = with self; [ pkgs.pandoc ]; propagatedBuildInputs = with self; [ six requests2 ]; meta = { From 31eba21d1dab7da2e75be229c542990e8f4b56b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 12 Feb 2017 21:06:59 +0100 Subject: [PATCH 079/138] virtualbox: force xorg-server-1.18 for now This is getting a little hacky, but hopefully it won't break anything. --- nixos/modules/services/x11/xserver.nix | 2 ++ .../virtualbox/guest-additions/default.nix | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f5ed5233818..7ac776571a0 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -459,6 +459,8 @@ in knownVideoDrivers; in optional (driver != null) ({ inherit name; modules = []; driverName = name; } // driver)); + nixpkgs.config.xorg = optionalAttrs (elem "vboxvideo" cfg.videoDrivers) { abiCompat = "1.18"; }; + assertions = [ { assertion = config.security.polkit.enable; message = "X11 requires Polkit to be enabled (‘security.polkit.enable = true’)."; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index d73c18badb1..6e58d42a1cb 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -4,7 +4,14 @@ let version = virtualbox.version; xserverVListFunc = builtins.elemAt (stdenv.lib.splitString "." xorg.xorgserver.version); - xserverABI = xserverVListFunc 0 + xserverVListFunc 1; + + # Forced to 1.18 in + # as it even fails to build otherwise. Still, override this even here, + # in case someone does just a standalone build + # (not via videoDrivers = ["vboxvideo"]). + # It's likely to work again in some future update. + xserverABI = let abi = xserverVListFunc 0 + xserverVListFunc 1; + in if abi == "119" then "118" else abi; in stdenv.mkDerivation { From 446aa6834aae0c585a94688247608458a0f93e4b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 12 Feb 2017 21:14:09 +0100 Subject: [PATCH 080/138] subtitle-editor: fix build Apply Debian patch that makes the project build with later GStreamer versions. --- pkgs/applications/video/subtitleeditor/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index 3f8f683e0ca..88768b3cb8f 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, file, desktop_file_utils, +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, file, desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook }: @@ -16,6 +16,13 @@ stdenv.mkDerivation rec { sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/s/subtitleeditor/0.53.0-2/debian/patches/03-fix-build-gstreamermm-1.8.0.patch"; + sha256 = "0di2i34id5dqnd3glibhifair1kdfnv8ay3k64lirad726ardw2c"; + }) + ]; + nativeBuildInputs = [ pkgconfig intltool From 06bacb10e5c0ae4af621648891da0aa979c8c8de Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Sun, 12 Feb 2017 10:38:08 +0100 Subject: [PATCH 081/138] scalafmt: 0.4.10 -> 0.5.6 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 534f358e531..af7854b33dc 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.4.10"; + version = "0.5.6"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "0igz95zy69pasvj4vya71akhwlc0233m7kwrn66rali1wxs2kcsz"; + sha256 = "17fwli6jlsh4q7nqgqmqmhb368hpmj1yg9fdsybk8yq57hb24bwq"; }; unpackPhase = "tar xvzf $src"; From 939c846ae7c2b330dbc317e4703926dbd554b030 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sat, 11 Feb 2017 15:19:22 -0800 Subject: [PATCH 082/138] elvish: 0.1 -> 0.5 --- pkgs/shells/elvish/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 884f34dcf02..7dc6029acb4 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { name = "elvish-${version}"; - version = "0.1"; + version = "0.5"; goPackagePath = "github.com/elves/elvish"; src = fetchFromGitHub { repo = "elvish"; owner = "elves"; - rev = "4125c2bb927330b0100b354817dd4ad252118ba6"; - sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f"; + rev = version; + sha256 = "1dk5f8a2wpgd5cw45ippvx46fxk0yap64skfpzpiqz8bkbnrwbz6"; }; goDeps = ./deps.nix; @@ -20,6 +20,6 @@ buildGoPackage rec { homepage = https://github.com/elves/elvish; license = licenses.bsd2; maintainers = with maintainers; [ vrthra ]; - platforms = with platforms; [ linux ]; + platforms = with platforms; linux; }; } From 21cb82f34b04e76c285b3ea1aab6ac1c8170f71f Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 12 Feb 2017 22:27:11 +0100 Subject: [PATCH 083/138] mpd: fix on i686 Was submtitted to upstream, but fix here in the meantime. --- pkgs/servers/mpd/default.nix | 2 ++ pkgs/servers/mpd/i386.patch | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/servers/mpd/i386.patch diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 09d72a12cf0..b1aa8034143 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -39,6 +39,8 @@ in stdenv.mkDerivation rec { sha256 = "0a4psqsf71vc6hfgyv55jclsx8yb7lf4w840qlq6cq8j3hsjaavi"; }; + patches = [ ./i386.patch ]; + buildInputs = [ pkgconfig glib boost ] ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd diff --git a/pkgs/servers/mpd/i386.patch b/pkgs/servers/mpd/i386.patch new file mode 100644 index 00000000000..dca8ea88a8b --- /dev/null +++ b/pkgs/servers/mpd/i386.patch @@ -0,0 +1,14 @@ +diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx +index 6986453..167fc07 100644 +--- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx ++++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx +@@ -20,8 +20,8 @@ + /* necessary because libavutil/common.h uses UINT64_C */ + #define __STDC_CONSTANT_MACROS + +-#include "lib/ffmpeg/Time.hxx" + #include "config.h" ++#include "lib/ffmpeg/Time.hxx" + #include "FfmpegDecoderPlugin.hxx" + #include "lib/ffmpeg/Domain.hxx" + #include "lib/ffmpeg/Error.hxx" From cbedb932f9d2320e708c804e82d20e9d63ec0b1f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 12 Feb 2017 23:12:13 +0100 Subject: [PATCH 084/138] nodePackages.mocha: init at 3.2.0 --- .../node-packages/node-packages-v4.nix | 1102 ++++++++++------- .../node-packages/node-packages-v6.nix | 1062 +++++++++------- .../node-packages/node-packages.json | 1 + 3 files changed, 1262 insertions(+), 903 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index 54687d92bbd..ceebd52b61c 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -400,13 +400,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-1.0.0" = { + "azure-arm-cdn-1.0.2" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz"; - sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz"; + sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96"; }; }; "azure-arm-commerce-0.2.0" = { @@ -418,13 +418,13 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.19.1" = { + "azure-arm-compute-0.20.0" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.19.1"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz"; - sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz"; + sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32"; }; }; "azure-arm-datalake-analytics-1.0.1-preview" = { @@ -535,13 +535,13 @@ let sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; }; }; - "azure-arm-rediscache-0.2.1" = { + "azure-arm-rediscache-0.2.3" = { name = "azure-arm-rediscache"; packageName = "azure-arm-rediscache"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; - sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; + url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; + sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; }; }; "azure-arm-devtestlabs-0.1.0" = { @@ -724,13 +724,13 @@ let sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; }; }; - "azure-servicefabric-0.1.4" = { + "azure-servicefabric-0.1.5" = { name = "azure-servicefabric"; packageName = "azure-servicefabric"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; - sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz"; + sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; "applicationinsights-0.16.0" = { @@ -1687,13 +1687,13 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; "bl-1.1.2" = { @@ -2155,13 +2155,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -2380,13 +2380,13 @@ let sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b"; }; }; - "sax-1.2.1" = { + "sax-1.2.2" = { name = "sax"; packageName = "sax"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; + sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; }; }; "mute-stream-0.0.7" = { @@ -2830,13 +2830,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.1.5" = { + "hosted-git-info-2.2.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; - sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; + sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; }; }; "is-builtin-module-1.0.0" = { @@ -3109,13 +3109,13 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.6.0" = { + "debug-2.6.1" = { name = "debug"; packageName = "debug"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; }; }; "ms-0.7.2" = { @@ -3190,13 +3190,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.2" = { + "buffer-5.0.5" = { name = "buffer"; packageName = "buffer"; - version = "5.0.2"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz"; - sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; + sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; "cached-path-relative-1.0.0" = { @@ -3784,13 +3784,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.2" = { + "elliptic-6.3.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; - sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz"; + sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f"; }; }; "parse-asn1-5.0.0" = { @@ -3802,13 +3802,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.6" = { + "brorand-1.0.7" = { name = "brorand"; packageName = "brorand"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; - sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz"; + sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc"; }; }; "hash.js-1.0.3" = { @@ -4945,13 +4945,13 @@ let sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; }; }; - "random-access-file-1.4.0" = { + "random-access-file-1.5.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz"; - sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; + sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; }; }; "run-parallel-1.1.6" = { @@ -4963,13 +4963,13 @@ let sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; }; }; - "thunky-1.0.1" = { + "thunky-1.0.2" = { name = "thunky"; packageName = "thunky"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz"; - sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68"; + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; + sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; "ip-1.1.4" = { @@ -5170,13 +5170,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.1" = { + "k-rpc-socket-1.6.2" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz"; - sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz"; + sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21"; }; }; "bencode-0.8.0" = { @@ -5215,22 +5215,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.2.1" = { + "simple-peer-6.2.2" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz"; - sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz"; + sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba"; }; }; - "simple-websocket-4.2.0" = { + "simple-websocket-4.3.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz"; - sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz"; + sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea"; }; }; "string2compact-1.2.2" = { @@ -5269,6 +5269,24 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; + "ws-2.0.3" = { + name = "ws"; + packageName = "ws"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz"; + sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb"; + }; + }; + "ultron-1.1.0" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz"; + sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864"; + }; + }; "addr-to-ip-port-1.4.2" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; @@ -6664,6 +6682,15 @@ let sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; + "hosted-git-info-2.1.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; + sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + }; + }; "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; @@ -9089,13 +9116,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.7.0" = { + "js-yaml-3.8.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; }; "json-stable-stringify-1.0.1" = { @@ -9395,13 +9422,13 @@ let sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; - "esprima-2.7.3" = { + "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; - version = "2.7.3"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; "prelude-ls-1.1.2" = { @@ -9476,13 +9503,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.11.2" = { + "ajv-4.11.3" = { name = "ajv"; packageName = "ajv"; - version = "4.11.2"; + version = "4.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz"; - sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz"; + sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22"; }; }; "ajv-keywords-1.5.1" = { @@ -10070,13 +10097,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.7.2" = { + "gauge-2.7.3" = { name = "gauge"; packageName = "gauge"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz"; - sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz"; + sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09"; }; }; "set-blocking-2.0.0" = { @@ -10088,13 +10115,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "aproba-1.0.4" = { + "aproba-1.1.1" = { name = "aproba"; packageName = "aproba"; - version = "1.0.4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; - sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz"; + sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab"; }; }; "wide-align-1.1.0" = { @@ -11457,6 +11484,15 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; @@ -11529,13 +11565,13 @@ let sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "body-parser-1.16.0" = { + "body-parser-1.16.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz"; - sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz"; + sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329"; }; }; "combine-lists-1.0.1" = { @@ -11646,13 +11682,13 @@ let sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; }; }; - "useragent-2.1.11" = { + "useragent-2.1.12" = { name = "useragent"; packageName = "useragent"; - version = "2.1.11"; + version = "2.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz"; - sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz"; + sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2"; }; }; "bytes-2.4.0" = { @@ -12843,6 +12879,78 @@ let sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "glob-7.0.5" = { + name = "glob"; + packageName = "glob"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; + sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; + }; + }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; + "lodash.create-3.1.1" = { + name = "lodash.create"; + packageName = "lodash.create"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; + sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "lodash._baseassign-3.2.0" = { + name = "lodash._baseassign"; + packageName = "lodash._baseassign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; + sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + }; + }; + "lodash._basecreate-3.0.3" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; + sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; + }; + }; "optparse-1.0.5" = { name = "optparse"; packageName = "optparse"; @@ -13248,15 +13356,6 @@ let sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; }; }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; - }; - }; "lodash._createassigner-3.1.1" = { name = "lodash._createassigner"; packageName = "lodash._createassigner"; @@ -13383,6 +13482,15 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; + "js-yaml-3.7.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + }; + }; "jsonata-1.0.10" = { name = "jsonata"; packageName = "jsonata"; @@ -13464,13 +13572,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.15" = { + "node-red-node-email-0.1.16" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.15"; + version = "0.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz"; - sha1 = "7a528596d3b693a077b1ee293300299855537142"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz"; + sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38"; }; }; "node-red-node-twitter-0.1.9" = { @@ -14031,6 +14139,15 @@ let sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; }; }; + "node-pre-gyp-0.6.32" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.32"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14616,6 +14733,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "aproba-1.0.4" = { + name = "aproba"; + packageName = "aproba"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; + sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + }; + }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14670,13 +14796,13 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; - "mississippi-1.2.0" = { + "mississippi-1.3.0" = { name = "mississippi"; packageName = "mississippi"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz"; + sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5"; }; }; "node-gyp-3.5.0" = { @@ -14814,6 +14940,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + }; "stream-each-1.2.0" = { name = "stream-each"; packageName = "stream-each"; @@ -14823,6 +14958,15 @@ let sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; }; }; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + }; "stream-iterate-1.2.0" = { name = "stream-iterate"; packageName = "stream-iterate"; @@ -15310,15 +15454,6 @@ let sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; - }; - }; "domino-1.0.28" = { name = "domino"; packageName = "domino"; @@ -15384,13 +15519,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.13" = { + "service-runner-2.1.15" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.13"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; - sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz"; + sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb"; }; }; "simplediff-0.1.1" = { @@ -15519,13 +15654,13 @@ let sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; }; }; - "yargs-5.0.0" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "5.0.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; - sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; "dtrace-provider-0.8.0" = { @@ -15655,6 +15790,15 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; "get-caller-file-1.0.2" = { name = "get-caller-file"; packageName = "get-caller-file"; @@ -15664,15 +15808,6 @@ let sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; }; }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -15700,6 +15835,24 @@ let sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; }; }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; "window-size-0.2.0" = { name = "window-size"; packageName = "window-size"; @@ -15709,24 +15862,6 @@ let sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; }; }; - "yargs-parser-3.2.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; - sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; - }; - }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; "yargs-parser-2.4.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -16663,40 +16798,31 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; - "private-0.1.6" = { + "private-0.1.7" = { name = "private"; packageName = "private"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz"; - sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.20" = { + "recast-0.11.21" = { name = "recast"; packageName = "recast"; - version = "0.11.20"; + version = "0.11.21"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz"; - sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz"; + sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9"; }; }; - "ast-types-0.9.4" = { + "ast-types-0.9.5" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz"; - sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b"; - }; - }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz"; + sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a"; }; }; "base62-0.1.1" = { @@ -17366,13 +17492,13 @@ let sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; }; }; - "stream-transform-0.1.1" = { + "stream-transform-0.1.2" = { name = "stream-transform"; packageName = "stream-transform"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz"; - sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71"; + url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz"; + sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; }; }; "csv-stringify-0.0.8" = { @@ -17888,13 +18014,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.1" = { + "raven-1.1.2" = { name = "raven"; packageName = "raven"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz"; - sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42"; + url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz"; + sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718"; }; }; "signals-1.0.0" = { @@ -17924,15 +18050,6 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; - }; - }; "color-convert-1.9.0" = { name = "color-convert"; packageName = "color-convert"; @@ -18140,6 +18257,15 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -18167,15 +18293,6 @@ let sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; }; }; - "yargs-parser-4.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; - }; - }; "kew-0.1.7" = { name = "kew"; packageName = "kew"; @@ -18221,6 +18338,15 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; + "acorn-4.0.11" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; + }; + }; "acorn-dynamic-import-2.0.1" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; @@ -18230,13 +18356,13 @@ let sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; }; }; - "enhanced-resolve-3.0.3" = { + "enhanced-resolve-3.1.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz"; - sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz"; + sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec"; }; }; "json-loader-0.5.4" = { @@ -18619,10 +18745,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.8"; + version = "0.10.9"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz"; - sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz"; + sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -18660,9 +18786,9 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.0" + sources."azure-arm-cdn-1.0.2" sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.19.1" + sources."azure-arm-compute-0.20.0" sources."azure-arm-datalake-analytics-1.0.1-preview" sources."azure-arm-datalake-store-1.0.1-preview" sources."azure-arm-hdinsight-0.2.2" @@ -18675,7 +18801,7 @@ in sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" - sources."azure-arm-rediscache-0.2.1" + sources."azure-arm-rediscache-0.2.3" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" @@ -18731,7 +18857,7 @@ in }) sources."azure-arm-batch-0.3.0" sources."azure-batch-0.5.2" - sources."azure-servicefabric-0.1.4" + sources."azure-servicefabric-0.1.5" sources."applicationinsights-0.16.0" (sources."caller-id-0.1.0" // { dependencies = [ @@ -18879,7 +19005,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -18978,7 +19104,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -19081,7 +19207,7 @@ in sources."wordwrap-0.0.2" (sources."xml2js-0.1.14" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" ]; }) sources."xmlbuilder-0.4.3" @@ -19219,7 +19345,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -19379,7 +19505,7 @@ in (sources."promised-temp-0.1.0" // { dependencies = [ sources."q-1.4.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -19472,7 +19598,7 @@ in sources."pako-0.2.9" ]; }) - (sources."buffer-5.0.2" // { + (sources."buffer-5.0.5" // { dependencies = [ sources."base64-js-1.2.0" sources."ieee754-1.1.8" @@ -19525,9 +19651,9 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -19552,9 +19678,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -19573,7 +19699,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" ]; }) ]; @@ -19847,7 +19973,7 @@ in ]; }) sources."debounced-seeker-1.0.0" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -19885,7 +20011,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -20119,14 +20245,14 @@ in sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."thunky-1.0.1" + sources."thunky-1.0.2" ]; }) sources."hat-0.0.3" @@ -20236,7 +20362,7 @@ in sources."randombytes-2.0.3" ]; }) - (sources."k-rpc-socket-1.6.1" // { + (sources."k-rpc-socket-1.6.2" // { dependencies = [ sources."bencode-0.11.0" ]; @@ -20269,7 +20395,7 @@ in sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.2.1" // { + (sources."simple-peer-6.2.2" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" @@ -20285,7 +20411,7 @@ in }) ]; }) - (sources."simple-websocket-4.2.0" // { + (sources."simple-websocket-4.3.0" // { dependencies = [ (sources."readable-stream-2.2.2" // { dependencies = [ @@ -20297,6 +20423,11 @@ in sources."util-deprecate-1.0.2" ]; }) + (sources."ws-2.0.3" // { + dependencies = [ + sources."ultron-1.1.0" + ]; + }) ]; }) (sources."string2compact-1.2.2" // { @@ -20446,7 +20577,7 @@ in sources."stream-transcoder-0.0.5" (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -20715,9 +20846,9 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -20742,9 +20873,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -20763,7 +20894,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" ]; }) ]; @@ -21147,7 +21278,7 @@ in }) (sources."npm-package-arg-4.2.0" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."semver-5.3.0" ]; }) @@ -21166,7 +21297,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -21289,7 +21420,7 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -21408,7 +21539,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -21497,7 +21628,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -21816,7 +21947,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -21880,7 +22011,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -22313,7 +22444,7 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -22684,7 +22815,7 @@ in sources."lodash-4.17.4" ]; }) - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."awscred-1.2.0" sources."ini-1.3.4" (sources."optimist-0.6.1" // { @@ -22776,7 +22907,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -22948,7 +23079,7 @@ in sources."minimist-1.2.0" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -23059,10 +23190,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.14.1"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz"; - sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz"; + sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2"; }; dependencies = [ (sources."babel-code-frame-6.22.0" // { @@ -23103,7 +23234,7 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -23295,14 +23426,14 @@ in sources."tryit-1.0.3" ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; }) (sources."json-stable-stringify-1.0.1" // { @@ -23359,7 +23490,7 @@ in sources."strip-json-comments-2.0.1" (sources."table-3.8.3" // { dependencies = [ - (sources."ajv-4.11.2" // { + (sources."ajv-4.11.3" // { dependencies = [ sources."co-4.6.0" ]; @@ -23625,7 +23756,7 @@ in (sources."fsevents-1.0.17" // { dependencies = [ sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.32" // { + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -23655,10 +23786,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -23694,7 +23824,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -23775,7 +23905,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -24239,7 +24369,7 @@ in }) (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -24973,13 +25103,14 @@ in }) ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) + sources."esprima-3.1.3" ]; }) (sources."mkdirp-0.5.1" // { @@ -25149,10 +25280,10 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; dependencies = [ (sources."argparse-1.0.9" // { @@ -25160,7 +25291,7 @@ in sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -25180,11 +25311,11 @@ in }; dependencies = [ sources."bluebird-3.4.7" - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -25328,7 +25459,7 @@ in (sources."fsevents-1.0.17" // { dependencies = [ sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.32" // { + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -25358,10 +25489,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -25397,7 +25527,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -25478,7 +25608,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -25787,7 +25917,7 @@ in sources."os-tmpdir-1.0.2" ]; }) - (sources."useragent-2.1.11" // { + (sources."useragent-2.1.12" // { dependencies = [ sources."lru-cache-2.2.4" ]; @@ -26097,7 +26227,7 @@ in sources."connect-restreamer-1.0.3" (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -26413,6 +26543,94 @@ in }; production = true; }; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; + sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; + }; + dependencies = [ + sources."browser-stdout-1.3.0" + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."diff-1.4.0" + sources."escape-string-regexp-1.0.5" + (sources."glob-7.0.5" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.6" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + sources."growl-1.9.2" + sources."json3-3.3.2" + (sources."lodash.create-3.1.1" // { + dependencies = [ + (sources."lodash._baseassign-3.2.0" // { + dependencies = [ + sources."lodash._basecopy-3.0.1" + (sources."lodash.keys-3.1.2" // { + dependencies = [ + sources."lodash._getnative-3.9.1" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + ]; + }) + ]; + }) + sources."lodash._basecreate-3.0.3" + sources."lodash._isiterateecall-3.0.9" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + (sources."supports-color-3.1.2" // { + dependencies = [ + sources."has-flag-1.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; + }; + production = true; + }; nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; @@ -26471,7 +26689,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -26491,7 +26709,7 @@ in }) (sources."npm-package-arg-4.2.0" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" ]; }) (sources."once-1.4.0" // { @@ -26502,7 +26720,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -26583,7 +26801,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -26661,7 +26879,7 @@ in sources."console-control-strings-1.1.0" (sources."gauge-2.6.0" // { dependencies = [ - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" @@ -26878,10 +27096,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -26915,7 +27132,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -26996,7 +27213,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -27128,7 +27345,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -27237,7 +27454,7 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -27372,7 +27589,7 @@ in (sources."v8-debug-0.7.7" // { dependencies = [ sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.32" // { + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -27403,10 +27620,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -27434,7 +27650,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -27515,7 +27731,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -27640,7 +27856,7 @@ in (sources."v8-profiler-5.6.5" // { dependencies = [ sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.32" // { + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -27671,10 +27887,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -27702,7 +27917,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -27783,7 +27998,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -28004,10 +28219,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -28043,7 +28257,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -28124,7 +28338,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -28369,7 +28583,7 @@ in (sources."fsevents-1.0.17" // { dependencies = [ sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.32" // { + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."mkdirp-0.5.1" // { dependencies = [ @@ -28399,10 +28613,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -28438,7 +28651,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -28519,7 +28732,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -28615,7 +28828,7 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29069,7 +29282,7 @@ in }) (sources."follow-redirects-1.2.1" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29359,7 +29572,7 @@ in dependencies = [ sources."uid2-0.0.3" sources."utils-merge-1.0.0" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29451,7 +29664,7 @@ in }) (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -29479,7 +29692,7 @@ in (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -29578,7 +29791,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -29608,7 +29821,7 @@ in }) ]; }) - (sources."node-red-node-email-0.1.15" // { + (sources."node-red-node-email-0.1.16" // { dependencies = [ (sources."nodemailer-1.11.0" // { dependencies = [ @@ -29628,7 +29841,7 @@ in sources."libqp-1.1.0" (sources."needle-0.10.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29642,7 +29855,7 @@ in }) (sources."needle-0.11.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -29716,7 +29929,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -29797,7 +30010,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -29858,10 +30071,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -29897,7 +30109,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -29978,7 +30190,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -30162,7 +30374,7 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -30302,10 +30514,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; - sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; + url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz"; + sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a"; }; dependencies = [ (sources."JSONStream-1.3.0" // { @@ -30315,6 +30527,7 @@ in ]; }) sources."abbrev-1.0.9" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" @@ -30417,7 +30630,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - (sources."mississippi-1.2.0" // { + (sources."mississippi-1.3.0" // { dependencies = [ (sources."concat-stream-1.6.0" // { dependencies = [ @@ -30441,6 +30654,11 @@ in }) sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + (sources."parallel-transform-1.1.0" // { + dependencies = [ + sources."cyclist-0.2.2" + ]; + }) sources."pump-1.0.2" sources."pumpify-1.3.5" (sources."stream-each-1.2.0" // { @@ -30507,9 +30725,8 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { @@ -30587,7 +30804,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -30659,7 +30876,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -30741,7 +30958,6 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" - sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -30792,7 +31008,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -30873,7 +31089,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -30959,10 +31175,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -31105,10 +31320,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.8.10"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz"; - sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz"; + sha1 = "9614c58ec84d31702a85881c844c3fb93611a585"; }; dependencies = [ sources."bluebird-3.4.7" @@ -31314,7 +31529,7 @@ in dependencies = [ (sources."array-index-1.0.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -31406,9 +31621,8 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { @@ -31481,7 +31695,7 @@ in (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -31553,7 +31767,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -31826,11 +32040,11 @@ in sources."is-arguments-1.0.2" ]; }) - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -32126,14 +32340,14 @@ in sources."gelfling-0.2.0" ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; }) sources."mediawiki-title-0.5.6" @@ -32144,7 +32358,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -32225,7 +32439,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -32263,7 +32477,7 @@ in sources."parseurl-1.3.1" ]; }) - (sources."service-runner-2.1.13" // { + (sources."service-runner-2.1.15" // { dependencies = [ sources."bluebird-3.4.7" (sources."bunyan-1.8.5" // { @@ -32363,8 +32577,9 @@ in }) ]; }) - (sources."yargs-5.0.0" // { + (sources."yargs-6.6.0" // { dependencies = [ + sources."camelcase-3.0.0" (sources."cliui-3.2.0" // { dependencies = [ (sources."strip-ansi-3.0.1" // { @@ -32377,7 +32592,6 @@ in }) sources."decamelize-1.2.0" sources."get-caller-file-1.0.2" - sources."lodash.assign-4.2.0" (sources."os-locale-1.4.0" // { dependencies = [ (sources."lcid-1.0.0" // { @@ -32428,7 +32642,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -32480,13 +32694,8 @@ in ]; }) sources."which-module-1.0.0" - sources."window-size-0.2.0" sources."y18n-3.2.1" - (sources."yargs-parser-3.2.0" // { - dependencies = [ - sources."camelcase-3.0.0" - ]; - }) + sources."yargs-parser-4.2.1" ]; }) ]; @@ -32557,7 +32766,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -32790,7 +32999,7 @@ in sources."map-obj-1.0.1" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -33082,9 +33291,9 @@ in sources."minimist-0.0.8" ]; }) - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -33094,7 +33303,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."thunky-1.0.1" + sources."thunky-1.0.2" ]; }) sources."hat-0.0.3" @@ -33204,7 +33413,7 @@ in sources."randombytes-2.0.3" ]; }) - (sources."k-rpc-socket-1.6.1" // { + (sources."k-rpc-socket-1.6.2" // { dependencies = [ sources."bencode-0.11.0" ]; @@ -33238,7 +33447,7 @@ in sources."unzip-response-2.0.1" ]; }) - (sources."simple-peer-6.2.1" // { + (sources."simple-peer-6.2.2" // { dependencies = [ sources."get-browser-rtc-1.0.2" sources."randombytes-2.0.3" @@ -33254,7 +33463,7 @@ in }) ]; }) - (sources."simple-websocket-4.2.0" // { + (sources."simple-websocket-4.3.0" // { dependencies = [ (sources."readable-stream-2.2.2" // { dependencies = [ @@ -33266,6 +33475,11 @@ in sources."util-deprecate-1.0.2" ]; }) + (sources."ws-2.0.3" // { + dependencies = [ + sources."ultron-1.1.0" + ]; + }) ]; }) (sources."string2compact-1.2.2" // { @@ -33283,7 +33497,7 @@ in }) ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -33657,7 +33871,7 @@ in sources."addr-to-ip-port-1.4.2" sources."bencode-0.7.0" sources."buffer-equal-0.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -33694,7 +33908,7 @@ in sources."bencode-0.6.0" sources."bn.js-1.3.0" sources."buffer-equal-0.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34004,7 +34218,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -34150,11 +34364,11 @@ in sources."minimist-0.0.8" ]; }) - sources."private-0.1.6" + sources."private-0.1.7" sources."q-1.4.1" - (sources."recast-0.11.20" // { + (sources."recast-0.11.21" // { dependencies = [ - sources."ast-types-0.9.4" + sources."ast-types-0.9.5" sources."esprima-3.1.3" sources."source-map-0.5.6" ]; @@ -34194,7 +34408,7 @@ in dependencies = [ (sources."xml2js-0.2.4" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" ]; }) sources."xmlbuilder-0.4.2" @@ -34250,7 +34464,7 @@ in ]; }) sources."cookie-signature-1.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34282,7 +34496,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -34363,7 +34577,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -34396,7 +34610,7 @@ in }) (sources."xml2js-0.4.17" // { dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."xmlbuilder-4.2.1" // { dependencies = [ sources."lodash-4.17.4" @@ -34536,11 +34750,11 @@ in }) ]; }) - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" sources."content-type-1.0.2" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -34602,14 +34816,14 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."js-yaml-3.7.0" // { + (sources."js-yaml-3.8.1" // { dependencies = [ (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) - sources."esprima-2.7.3" + sources."esprima-3.1.3" ]; }) (sources."cookies-0.6.2" // { @@ -34621,7 +34835,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -34697,7 +34911,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -34989,7 +35203,7 @@ in dependencies = [ sources."csv-generate-0.0.6" sources."csv-parse-1.2.0" - sources."stream-transform-0.1.1" + sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" ]; }) @@ -35127,7 +35341,7 @@ in dependencies = [ sources."asn1-0.2.3" sources."assert-plus-0.2.0" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -35195,7 +35409,7 @@ in sources."minimist-0.0.8" ]; }) - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -35251,7 +35465,7 @@ in sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" (sources."coa-1.0.1" // { dependencies = [ sources."q-1.4.1" @@ -35424,7 +35638,7 @@ in (sources."request-2.69.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.0.3" // { dependencies = [ (sources."readable-stream-2.0.6" // { @@ -35523,7 +35737,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -35605,7 +35819,7 @@ in (sources."request-2.78.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -35686,7 +35900,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -35747,10 +35961,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz"; - sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz"; + sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607"; }; buildInputs = globalBuildInputs; meta = { @@ -35827,10 +36041,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.3"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz"; - sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz"; + sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b"; }; dependencies = [ sources."async-2.1.4" @@ -36345,9 +36559,8 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" (sources."string-width-1.0.2" // { @@ -36424,7 +36637,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -36496,7 +36709,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -36619,7 +36832,7 @@ in sources."graceful-fs-4.1.11" (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -36639,7 +36852,7 @@ in }) (sources."npm-package-arg-4.2.0" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" ]; }) (sources."once-1.4.0" // { @@ -36650,7 +36863,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -36731,7 +36944,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -36781,10 +36994,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -36825,7 +37037,7 @@ in sources."passport-strategy-1.0.0" ]; }) - (sources."raven-1.1.1" // { + (sources."raven-1.1.2" // { dependencies = [ sources."cookie-0.3.1" sources."json-stringify-safe-5.0.1" @@ -37042,7 +37254,7 @@ in sources."component-emitter-1.1.2" sources."methods-1.0.1" sources."cookiejar-2.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -37150,7 +37362,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -37391,7 +37603,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -37503,9 +37715,9 @@ in sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; }; dependencies = [ - sources."acorn-4.0.4" + sources."acorn-4.0.11" sources."acorn-dynamic-import-2.0.1" - (sources."ajv-4.11.2" // { + (sources."ajv-4.11.3" // { dependencies = [ sources."co-4.6.0" (sources."json-stable-stringify-1.0.1" // { @@ -37521,7 +37733,7 @@ in sources."lodash-4.17.4" ]; }) - (sources."enhanced-resolve-3.0.3" // { + (sources."enhanced-resolve-3.1.0" // { dependencies = [ sources."graceful-fs-4.1.11" sources."object-assign-4.1.1" @@ -37611,9 +37823,9 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -37638,9 +37850,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.2" // { + (sources."elliptic-6.3.3" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" ]; }) @@ -37659,7 +37871,7 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.6" + sources."brorand-1.0.7" ]; }) ]; @@ -37922,7 +38134,7 @@ in (sources."fsevents-1.0.17" // { dependencies = [ sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.32" // { + (sources."node-pre-gyp-0.6.33" // { dependencies = [ (sources."nopt-3.0.6" // { dependencies = [ @@ -37947,10 +38159,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -37986,7 +38197,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -38067,7 +38278,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -38251,7 +38462,7 @@ in }) (sources."normalize-package-data-2.3.5" // { dependencies = [ - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" (sources."is-builtin-module-1.0.0" // { dependencies = [ sources."builtin-modules-1.1.1" @@ -38378,7 +38589,7 @@ in ]; }) sources."death-1.1.0" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -38572,10 +38783,9 @@ in ]; }) sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -38637,7 +38847,7 @@ in (sources."request-2.79.0" // { dependencies = [ sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" (sources."combined-stream-1.0.5" // { dependencies = [ @@ -38696,7 +38906,7 @@ in sources."assert-plus-1.0.0" sources."dashdash-1.14.1" sources."getpass-0.1.6" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -38815,4 +39025,4 @@ in }; production = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v6.nix b/pkgs/development/node-packages/node-packages-v6.nix index dc11038fcd0..fd7a6ed52fc 100644 --- a/pkgs/development/node-packages/node-packages-v6.nix +++ b/pkgs/development/node-packages/node-packages-v6.nix @@ -400,13 +400,13 @@ let sha1 = "56b558ba43b9cb5657662251dabe3cb34c16c56f"; }; }; - "azure-arm-cdn-1.0.0" = { + "azure-arm-cdn-1.0.2" = { name = "azure-arm-cdn"; packageName = "azure-arm-cdn"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.0.tgz"; - sha1 = "a400b0234734eb8f7a52f5b800dd05b4f1b69f85"; + url = "https://registry.npmjs.org/azure-arm-cdn/-/azure-arm-cdn-1.0.2.tgz"; + sha1 = "35eed81c93fb1b2fe1236b432c821a61bce6be96"; }; }; "azure-arm-commerce-0.2.0" = { @@ -418,13 +418,13 @@ let sha1 = "152105f938603c94ec476c4cbd46b4ba058262bd"; }; }; - "azure-arm-compute-0.19.1" = { + "azure-arm-compute-0.20.0" = { name = "azure-arm-compute"; packageName = "azure-arm-compute"; - version = "0.19.1"; + version = "0.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.19.1.tgz"; - sha1 = "04bd00758cfcc6fac616a4cf336bbdf83ab1decd"; + url = "https://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.20.0.tgz"; + sha1 = "f6d81c1e6093f4abae2d153a7b856963f5085e32"; }; }; "azure-arm-datalake-analytics-1.0.1-preview" = { @@ -535,13 +535,13 @@ let sha1 = "6972dd9844a0d12376d74014b541c49247caa37d"; }; }; - "azure-arm-rediscache-0.2.1" = { + "azure-arm-rediscache-0.2.3" = { name = "azure-arm-rediscache"; packageName = "azure-arm-rediscache"; - version = "0.2.1"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.1.tgz"; - sha1 = "22e516e7519dd12583e174cca4eeb3b20c993d02"; + url = "https://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.3.tgz"; + sha1 = "b6898abe8b4c3e1b2ec5be82689ef212bc2b1a06"; }; }; "azure-arm-devtestlabs-0.1.0" = { @@ -724,13 +724,13 @@ let sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; }; }; - "azure-servicefabric-0.1.4" = { + "azure-servicefabric-0.1.5" = { name = "azure-servicefabric"; packageName = "azure-servicefabric"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; - sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.5.tgz"; + sha1 = "bdc4b378292490ce77e788ee189f291ce5ae25a6"; }; }; "applicationinsights-0.16.0" = { @@ -1687,13 +1687,13 @@ let sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; }; }; - "aws4-1.5.0" = { + "aws4-1.6.0" = { name = "aws4"; packageName = "aws4"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.5.0.tgz"; - sha1 = "0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"; + url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; + sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; }; }; "bl-1.1.2" = { @@ -2155,13 +2155,13 @@ let sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; }; }; - "jsbn-0.1.0" = { + "jsbn-0.1.1" = { name = "jsbn"; packageName = "jsbn"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; - sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; + sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; }; }; "tweetnacl-0.14.5" = { @@ -2812,13 +2812,13 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; - "hosted-git-info-2.1.5" = { + "hosted-git-info-2.2.0" = { name = "hosted-git-info"; packageName = "hosted-git-info"; - version = "2.1.5"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; - sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.2.0.tgz"; + sha1 = "7a0d097863d886c0fabbdcd37bf1758d8becf8a5"; }; }; "is-builtin-module-1.0.0" = { @@ -3091,13 +3091,13 @@ let sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e"; }; }; - "debug-2.6.0" = { + "debug-2.6.1" = { name = "debug"; packageName = "debug"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; + url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; + sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; }; }; "ms-0.7.2" = { @@ -3172,13 +3172,13 @@ let sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d"; }; }; - "buffer-5.0.2" = { + "buffer-5.0.5" = { name = "buffer"; packageName = "buffer"; - version = "5.0.2"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.0.2.tgz"; - sha1 = "41d0407ff76782e9ec19f52f88e237ce6bb0de6d"; + url = "https://registry.npmjs.org/buffer/-/buffer-5.0.5.tgz"; + sha1 = "35c9393244a90aff83581063d16f0882cecc9418"; }; }; "cached-path-relative-1.0.0" = { @@ -3766,13 +3766,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.2" = { + "elliptic-6.3.3" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.2"; + version = "6.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; - sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.3.tgz"; + sha1 = "5482d9646d54bcb89fd7d994fc9e2e9568876e3f"; }; }; "parse-asn1-5.0.0" = { @@ -3784,13 +3784,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.6" = { + "brorand-1.0.7" = { name = "brorand"; packageName = "brorand"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; - sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.7.tgz"; + sha1 = "6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc"; }; }; "hash.js-1.0.3" = { @@ -4927,13 +4927,13 @@ let sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854"; }; }; - "random-access-file-1.4.0" = { + "random-access-file-1.5.0" = { name = "random-access-file"; packageName = "random-access-file"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.4.0.tgz"; - sha1 = "40972acb4d3d6f023522d08f3b2046c6d1ae5767"; + url = "https://registry.npmjs.org/random-access-file/-/random-access-file-1.5.0.tgz"; + sha1 = "dc1b137e5922c203cc6bc8b58564be68d5269a17"; }; }; "run-parallel-1.1.6" = { @@ -4945,13 +4945,13 @@ let sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039"; }; }; - "thunky-1.0.1" = { + "thunky-1.0.2" = { name = "thunky"; packageName = "thunky"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/thunky/-/thunky-1.0.1.tgz"; - sha1 = "3db1525aac0367b67bd2e532d2773e7c40be2e68"; + url = "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz"; + sha1 = "a862e018e3fb1ea2ec3fce5d55605cf57f247371"; }; }; "ip-1.1.4" = { @@ -5152,13 +5152,13 @@ let sha1 = "58cccb244f563326ba893bf5c06a35f644846daa"; }; }; - "k-rpc-socket-1.6.1" = { + "k-rpc-socket-1.6.2" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.6.1"; + version = "1.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.1.tgz"; - sha1 = "bf67128f89f0c62a19cec5afc3003c280111c78e"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.6.2.tgz"; + sha1 = "5c9e9f34a058f43ffe6512354d98957a41694f21"; }; }; "bencode-0.8.0" = { @@ -5197,22 +5197,22 @@ let sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9"; }; }; - "simple-peer-6.2.1" = { + "simple-peer-6.2.2" = { name = "simple-peer"; packageName = "simple-peer"; - version = "6.2.1"; + version = "6.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.1.tgz"; - sha1 = "0d6bf982afb32cca2fabbb969dee4fceaceb99fb"; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.2.2.tgz"; + sha1 = "9ea1a6e2c2e3656d04eac2a7b612e148f0d370ba"; }; }; - "simple-websocket-4.2.0" = { + "simple-websocket-4.3.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "4.2.0"; + version = "4.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.2.0.tgz"; - sha1 = "2517742a7dafc8d44fd4e093184b6718c817f2bf"; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.3.0.tgz"; + sha1 = "062990cc94709388c31fc978dfc2a790b1b3e6ea"; }; }; "string2compact-1.2.2" = { @@ -5251,6 +5251,24 @@ let sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9"; }; }; + "ws-2.0.3" = { + name = "ws"; + packageName = "ws"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-2.0.3.tgz"; + sha1 = "532fd499c3f7d7d720e543f1f807106cfc57d9cb"; + }; + }; + "ultron-1.1.0" = { + name = "ultron"; + packageName = "ultron"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ultron/-/ultron-1.1.0.tgz"; + sha1 = "b07a2e6a541a815fc6a34ccd4533baec307ca864"; + }; + }; "addr-to-ip-port-1.4.2" = { name = "addr-to-ip-port"; packageName = "addr-to-ip-port"; @@ -5548,13 +5566,13 @@ let sha1 = "f6e0579c8214d33a08109fd6e2e5c1dbc70463fc"; }; }; - "sax-1.2.1" = { + "sax-1.2.2" = { name = "sax"; packageName = "sax"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; + sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; }; }; "xmlbuilder-4.2.1" = { @@ -6655,6 +6673,15 @@ let sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; }; }; + "hosted-git-info-2.1.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; + sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + }; + }; "lockfile-1.0.3" = { name = "lockfile"; packageName = "lockfile"; @@ -9080,13 +9107,13 @@ let sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62"; }; }; - "js-yaml-3.7.0" = { + "js-yaml-3.8.1" = { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; }; "json-stable-stringify-1.0.1" = { @@ -9386,13 +9413,13 @@ let sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; - "esprima-2.7.3" = { + "esprima-3.1.3" = { name = "esprima"; packageName = "esprima"; - version = "2.7.3"; + version = "3.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; + sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; }; }; "prelude-ls-1.1.2" = { @@ -9467,13 +9494,13 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "ajv-4.11.2" = { + "ajv-4.11.3" = { name = "ajv"; packageName = "ajv"; - version = "4.11.2"; + version = "4.11.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.2.tgz"; - sha1 = "f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.11.3.tgz"; + sha1 = "ce30bdb90d1254f762c75af915fb3a63e7183d22"; }; }; "ajv-keywords-1.5.1" = { @@ -10061,13 +10088,13 @@ let sha1 = "3d7cf4464db6446ea644bf4b39507f9851008e8e"; }; }; - "gauge-2.7.2" = { + "gauge-2.7.3" = { name = "gauge"; packageName = "gauge"; - version = "2.7.2"; + version = "2.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/gauge/-/gauge-2.7.2.tgz"; - sha1 = "15cecc31b02d05345a5d6b0e171cdb3ad2307774"; + url = "https://registry.npmjs.org/gauge/-/gauge-2.7.3.tgz"; + sha1 = "1c23855f962f17b3ad3d0dc7443f304542edfe09"; }; }; "set-blocking-2.0.0" = { @@ -10079,13 +10106,13 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; - "aproba-1.0.4" = { + "aproba-1.1.1" = { name = "aproba"; packageName = "aproba"; - version = "1.0.4"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; - sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + url = "https://registry.npmjs.org/aproba/-/aproba-1.1.1.tgz"; + sha1 = "95d3600f07710aa0e9298c726ad5ecf2eacbabab"; }; }; "wide-align-1.1.0" = { @@ -11448,6 +11475,15 @@ let sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; }; }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; "handlebars-4.0.6" = { name = "handlebars"; packageName = "handlebars"; @@ -11520,13 +11556,13 @@ let sha1 = "f72d760be09b7f76d08ed8fae98b289a8d05fab3"; }; }; - "body-parser-1.16.0" = { + "body-parser-1.16.1" = { name = "body-parser"; packageName = "body-parser"; - version = "1.16.0"; + version = "1.16.1"; src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.0.tgz"; - sha1 = "924a5e472c6229fb9d69b85a20d5f2532dec788b"; + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.16.1.tgz"; + sha1 = "51540d045adfa7a0c6995a014bb6b1ed9b802329"; }; }; "combine-lists-1.0.1" = { @@ -11637,13 +11673,13 @@ let sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120"; }; }; - "useragent-2.1.11" = { + "useragent-2.1.12" = { name = "useragent"; packageName = "useragent"; - version = "2.1.11"; + version = "2.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/useragent/-/useragent-2.1.11.tgz"; - sha1 = "6a026e6a6c619b46ca7a0b2fdef6c1ac3da8ca29"; + url = "https://registry.npmjs.org/useragent/-/useragent-2.1.12.tgz"; + sha1 = "aa7da6cdc48bdc37ba86790871a7321d64edbaa2"; }; }; "bytes-2.4.0" = { @@ -12834,6 +12870,78 @@ let sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a"; }; }; + "browser-stdout-1.3.0" = { + name = "browser-stdout"; + packageName = "browser-stdout"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz"; + sha1 = "f351d32969d32fa5d7a5567154263d928ae3bd1f"; + }; + }; + "diff-1.4.0" = { + name = "diff"; + packageName = "diff"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; + sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; + }; + }; + "glob-7.0.5" = { + name = "glob"; + packageName = "glob"; + version = "7.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz"; + sha1 = "b4202a69099bbb4d292a7c1b95b6682b67ebdc95"; + }; + }; + "growl-1.9.2" = { + name = "growl"; + packageName = "growl"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz"; + sha1 = "0ea7743715db8d8de2c5ede1775e1b45ac85c02f"; + }; + }; + "lodash.create-3.1.1" = { + name = "lodash.create"; + packageName = "lodash.create"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz"; + sha1 = "d7f2849f0dbda7e04682bb8cd72ab022461debe7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "lodash._baseassign-3.2.0" = { + name = "lodash._baseassign"; + packageName = "lodash._baseassign"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; + sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; + }; + }; + "lodash._basecreate-3.0.3" = { + name = "lodash._basecreate"; + packageName = "lodash._basecreate"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz"; + sha1 = "1bc661614daa7fc311b7d03bf16806a0213cf821"; + }; + }; "optparse-1.0.5" = { name = "optparse"; packageName = "optparse"; @@ -13239,15 +13347,6 @@ let sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"; }; }; - "lodash._baseassign-3.2.0" = { - name = "lodash._baseassign"; - packageName = "lodash._baseassign"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"; - sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e"; - }; - }; "lodash._createassigner-3.1.1" = { name = "lodash._createassigner"; packageName = "lodash._createassigner"; @@ -13383,6 +13482,15 @@ let sha1 = "fddd8b491502c48967a62963bc722ff897cddea0"; }; }; + "js-yaml-3.7.0" = { + name = "js-yaml"; + packageName = "js-yaml"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; + sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + }; + }; "jsonata-1.0.10" = { name = "jsonata"; packageName = "jsonata"; @@ -13464,13 +13572,13 @@ let sha1 = "b0bf8a079d67732bcce019eaf8da1d7936658a7f"; }; }; - "node-red-node-email-0.1.15" = { + "node-red-node-email-0.1.16" = { name = "node-red-node-email"; packageName = "node-red-node-email"; - version = "0.1.15"; + version = "0.1.16"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.15.tgz"; - sha1 = "7a528596d3b693a077b1ee293300299855537142"; + url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.16.tgz"; + sha1 = "ede78397c857d28e6785f2f1425e7d89d3b1ed38"; }; }; "node-red-node-twitter-0.1.9" = { @@ -14031,6 +14139,15 @@ let sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; }; }; + "node-pre-gyp-0.6.32" = { + name = "node-pre-gyp"; + packageName = "node-pre-gyp"; + version = "0.6.32"; + src = fetchurl { + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz"; + sha1 = "fc452b376e7319b3d255f5f34853ef6fd8fe1fd5"; + }; + }; "mongoose-3.6.7" = { name = "mongoose"; packageName = "mongoose"; @@ -14616,6 +14733,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "aproba-1.0.4" = { + name = "aproba"; + packageName = "aproba"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/aproba/-/aproba-1.0.4.tgz"; + sha1 = "2713680775e7614c8ba186c065d4e2e52d1072c0"; + }; + }; "fstream-npm-1.2.0" = { name = "fstream-npm"; packageName = "fstream-npm"; @@ -14670,13 +14796,13 @@ let sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; - "mississippi-1.2.0" = { + "mississippi-1.3.0" = { name = "mississippi"; packageName = "mississippi"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; - sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.3.0.tgz"; + sha1 = "d201583eb12327e3c5c1642a404a9cacf94e34f5"; }; }; "node-gyp-3.5.0" = { @@ -14814,6 +14940,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "parallel-transform-1.1.0" = { + name = "parallel-transform"; + packageName = "parallel-transform"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz"; + sha1 = "d410f065b05da23081fcd10f28854c29bda33b06"; + }; + }; "stream-each-1.2.0" = { name = "stream-each"; packageName = "stream-each"; @@ -14823,6 +14958,15 @@ let sha1 = "1e95d47573f580d814dc0ff8cd0f66f1ce53c991"; }; }; + "cyclist-0.2.2" = { + name = "cyclist"; + packageName = "cyclist"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz"; + sha1 = "1b33792e11e914a2fd6d6ed6447464444e5fa640"; + }; + }; "stream-iterate-1.2.0" = { name = "stream-iterate"; packageName = "stream-iterate"; @@ -15310,15 +15454,6 @@ let sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04"; }; }; - "diff-1.4.0" = { - name = "diff"; - packageName = "diff"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz"; - sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf"; - }; - }; "domino-1.0.28" = { name = "domino"; packageName = "domino"; @@ -15384,13 +15519,13 @@ let sha1 = "78717d9b718ce7cab55e20b9f24388d5fa51d5c0"; }; }; - "service-runner-2.1.13" = { + "service-runner-2.1.15" = { name = "service-runner"; packageName = "service-runner"; - version = "2.1.13"; + version = "2.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.13.tgz"; - sha1 = "e8ff78b93230d7d831ea3ed5587aa2292b829ceb"; + url = "https://registry.npmjs.org/service-runner/-/service-runner-2.1.15.tgz"; + sha1 = "8b3d05729def7a0ce211e0483d9d907f13febbfb"; }; }; "simplediff-0.1.1" = { @@ -15519,13 +15654,13 @@ let sha1 = "ba055ff7dd3a267a65cc6be2deca4ea6bebbdb03"; }; }; - "yargs-5.0.0" = { + "yargs-6.6.0" = { name = "yargs"; packageName = "yargs"; - version = "5.0.0"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-5.0.0.tgz"; - sha1 = "3355144977d05757dbb86d6e38ec056123b3a66e"; + url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; + sha1 = "782ec21ef403345f830a808ca3d513af56065208"; }; }; "dtrace-provider-0.8.0" = { @@ -15655,6 +15790,15 @@ let sha1 = "ed17cbf68abd10e0aef8182713e297c5e4b500b0"; }; }; + "camelcase-3.0.0" = { + name = "camelcase"; + packageName = "camelcase"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; + sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; + }; + }; "get-caller-file-1.0.2" = { name = "get-caller-file"; packageName = "get-caller-file"; @@ -15664,15 +15808,6 @@ let sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; }; }; - "lodash.assign-4.2.0" = { - name = "lodash.assign"; - packageName = "lodash.assign"; - version = "4.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; - sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; - }; - }; "require-directory-2.1.1" = { name = "require-directory"; packageName = "require-directory"; @@ -15700,6 +15835,24 @@ let sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; }; }; + "yargs-parser-4.2.1" = { + name = "yargs-parser"; + packageName = "yargs-parser"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; + sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + }; + }; + "lodash.assign-4.2.0" = { + name = "lodash.assign"; + packageName = "lodash.assign"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz"; + sha1 = "0d99f3ccd7a6d261d19bdaeb9245005d285808e7"; + }; + }; "window-size-0.2.0" = { name = "window-size"; packageName = "window-size"; @@ -15709,24 +15862,6 @@ let sha1 = "b4315bb4214a3d7058ebeee892e13fa24d98b075"; }; }; - "yargs-parser-3.2.0" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-3.2.0.tgz"; - sha1 = "5081355d19d9d0c8c5d81ada908cb4e6d186664f"; - }; - }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; "yargs-parser-2.4.1" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -16663,40 +16798,31 @@ let sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a"; }; }; - "private-0.1.6" = { + "private-0.1.7" = { name = "private"; packageName = "private"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz"; - sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"; + url = "https://registry.npmjs.org/private/-/private-0.1.7.tgz"; + sha1 = "68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"; }; }; - "recast-0.11.20" = { + "recast-0.11.21" = { name = "recast"; packageName = "recast"; - version = "0.11.20"; + version = "0.11.21"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.11.20.tgz"; - sha1 = "2cb9bec269c03b36d0598118a936cd0a293ca3f3"; + url = "https://registry.npmjs.org/recast/-/recast-0.11.21.tgz"; + sha1 = "4e83081c6359ecb2e526d14f4138879333f20ac9"; }; }; - "ast-types-0.9.4" = { + "ast-types-0.9.5" = { name = "ast-types"; packageName = "ast-types"; - version = "0.9.4"; + version = "0.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.4.tgz"; - sha1 = "410d1f81890aeb8e0a38621558ba5869ae53c91b"; - }; - }; - "esprima-3.1.3" = { - name = "esprima"; - packageName = "esprima"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz"; - sha1 = "fdca51cee6133895e3c88d535ce49dbff62a4633"; + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.9.5.tgz"; + sha1 = "1a660a09945dbceb1f9c9cbb715002617424e04a"; }; }; "base62-0.1.1" = { @@ -17366,13 +17492,13 @@ let sha1 = "047b73868ab9a85746e885f637f9ed0fb645a425"; }; }; - "stream-transform-0.1.1" = { + "stream-transform-0.1.2" = { name = "stream-transform"; packageName = "stream-transform"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz"; - sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71"; + url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.2.tgz"; + sha1 = "7d8e6b4e03ac4781778f8c79517501bfb0762a9f"; }; }; "csv-stringify-0.0.8" = { @@ -17888,13 +18014,13 @@ let sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee"; }; }; - "raven-1.1.1" = { + "raven-1.1.2" = { name = "raven"; packageName = "raven"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/raven/-/raven-1.1.1.tgz"; - sha1 = "8837af64baa29ec32fc1cd8223255645ce3c9a42"; + url = "https://registry.npmjs.org/raven/-/raven-1.1.2.tgz"; + sha1 = "a5eb3db71f2fc3015a20145bcaf28015e7ae0718"; }; }; "signals-1.0.0" = { @@ -17924,15 +18050,6 @@ let sha1 = "0b48420d978c01804cf0230b648861598225a119"; }; }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; - }; - }; "color-convert-1.9.0" = { name = "color-convert"; packageName = "color-convert"; @@ -18140,6 +18257,15 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "mississippi-1.2.0" = { + name = "mississippi"; + packageName = "mississippi"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mississippi/-/mississippi-1.2.0.tgz"; + sha1 = "cd51bb9bbad3ddb13dee3cf60f1d0929c7a7fa4c"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -18167,15 +18293,6 @@ let sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae"; }; }; - "yargs-parser-4.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; - }; - }; "kew-0.1.7" = { name = "kew"; packageName = "kew"; @@ -18221,6 +18338,15 @@ let sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65"; }; }; + "acorn-4.0.11" = { + name = "acorn"; + packageName = "acorn"; + version = "4.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.11.tgz"; + sha1 = "edcda3bd937e7556410d42ed5860f67399c794c0"; + }; + }; "acorn-dynamic-import-2.0.1" = { name = "acorn-dynamic-import"; packageName = "acorn-dynamic-import"; @@ -18230,13 +18356,13 @@ let sha1 = "23f671eb6e650dab277fef477c321b1178a8cca2"; }; }; - "enhanced-resolve-3.0.3" = { + "enhanced-resolve-3.1.0" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.0.3.tgz"; - sha1 = "df14c06b5fc5eecade1094c9c5a12b4b3edc0b62"; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.1.0.tgz"; + sha1 = "9f4b626f577245edcf4b2ad83d86e17f4f421dec"; }; }; "json-loader-0.5.4" = { @@ -18583,10 +18709,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.8"; + version = "0.10.9"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.8.tgz"; - sha1 = "23622b6e536a6cdcb4be7a804884ef8b4d4985bc"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.9.tgz"; + sha1 = "f3f795f069c91fe7335d55f4199fc66c860496df"; }; dependencies = [ sources."adal-node-0.1.21" @@ -18598,9 +18724,9 @@ in ]; }) sources."azure-arm-authorization-2.0.0" - sources."azure-arm-cdn-1.0.0" + sources."azure-arm-cdn-1.0.2" sources."azure-arm-commerce-0.2.0" - sources."azure-arm-compute-0.19.1" + sources."azure-arm-compute-0.20.0" sources."azure-arm-datalake-analytics-1.0.1-preview" sources."azure-arm-datalake-store-1.0.1-preview" sources."azure-arm-hdinsight-0.2.2" @@ -18613,7 +18739,7 @@ in sources."azure-arm-trafficmanager-0.10.5" sources."azure-arm-dns-0.11.1" sources."azure-arm-website-0.11.4" - sources."azure-arm-rediscache-0.2.1" + sources."azure-arm-rediscache-0.2.3" sources."azure-arm-devtestlabs-0.1.0" sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" @@ -18648,7 +18774,7 @@ in }) sources."azure-arm-batch-0.3.0" sources."azure-batch-0.5.2" - sources."azure-servicefabric-0.1.4" + sources."azure-servicefabric-0.1.5" sources."applicationinsights-0.16.0" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -18794,7 +18920,7 @@ in sources."cycle-1.0.3" sources."isstream-0.1.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -18866,7 +18992,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -18994,7 +19120,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -19054,7 +19180,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."q-1.4.1" - sources."debug-2.6.0" + sources."debug-2.6.1" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -19089,7 +19215,7 @@ in ]; }) sources."browserify-zlib-0.1.4" - sources."buffer-5.0.2" + sources."buffer-5.0.5" sources."cached-path-relative-1.0.0" (sources."concat-stream-1.5.2" // { dependencies = [ @@ -19186,9 +19312,9 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.2" + sources."elliptic-6.3.3" sources."parse-asn1-5.0.0" - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -19251,7 +19377,7 @@ in sources."chalk-1.0.0" sources."chromecast-player-0.2.3" sources."debounced-seeker-1.0.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."diveSync-0.3.0" sources."got-1.2.2" sources."internal-ip-1.2.0" @@ -19340,7 +19466,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -19454,7 +19580,7 @@ in (sources."fs-chunk-store-1.6.4" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) @@ -19466,10 +19592,10 @@ in sources."rimraf-2.5.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) @@ -19519,33 +19645,38 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.1" + sources."k-rpc-socket-1.6.2" sources."bn.js-4.11.6" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-peer-6.2.1" // { + (sources."simple-peer-6.2.2" // { dependencies = [ sources."readable-stream-2.2.2" sources."isarray-1.0.0" ]; }) - (sources."simple-websocket-4.2.0" // { + (sources."simple-websocket-4.3.0" // { dependencies = [ sources."readable-stream-2.2.2" + sources."ws-2.0.3" sources."isarray-1.0.0" ]; }) sources."string2compact-1.2.2" - sources."ws-1.1.1" + (sources."ws-1.1.1" // { + dependencies = [ + sources."ultron-1.0.2" + ]; + }) sources."ipaddr.js-1.2.0" sources."get-browser-rtc-1.0.2" sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" + sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" - sources."ultron-1.0.2" sources."pad-0.0.5" sources."single-line-log-0.4.1" (sources."request-2.16.6" // { @@ -19587,7 +19718,7 @@ in sources."commander-2.9.0" sources."typedarray-0.0.6" sources."graceful-readlink-1.0.1" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."underscore-1.6.0" ]; buildInputs = globalBuildInputs; @@ -19710,6 +19841,7 @@ in (sources."npm-2.15.11" // { dependencies = [ sources."glob-7.0.6" + sources."hosted-git-info-2.1.5" sources."nopt-3.0.6" sources."npm-package-arg-4.1.1" sources."readable-stream-2.1.5" @@ -19878,9 +20010,9 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.2" + sources."elliptic-6.3.3" sources."parse-asn1-5.0.0" - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -19975,7 +20107,7 @@ in }) sources."validate-npm-package-license-3.0.1" sources."validate-npm-package-name-2.2.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."mute-stream-0.0.7" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" @@ -20066,7 +20198,7 @@ in sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -20119,7 +20251,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -20545,7 +20677,7 @@ in dependencies = [ sources."JSONStream-1.3.0" sources."async-2.1.4" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."awscred-1.2.0" sources."ini-1.3.4" sources."optimist-0.6.1" @@ -20618,7 +20750,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -20706,7 +20838,7 @@ in sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -20744,16 +20876,16 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.14.1"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.14.1.tgz"; - sha1 = "8a62175f2255109494747a1b25128d97b8eb3d97"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.15.0.tgz"; + sha1 = "bdcc6a6c5ffe08160e7b93c066695362a91e30f2"; }; dependencies = [ sources."babel-code-frame-6.22.0" sources."chalk-1.1.3" sources."concat-stream-1.6.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."doctrine-1.5.0" sources."escope-3.6.0" sources."espree-3.4.0" @@ -20767,7 +20899,7 @@ in sources."inquirer-0.12.0" sources."is-my-json-valid-2.15.0" sources."is-resolvable-1.0.0" - sources."js-yaml-3.7.0" + sources."js-yaml-3.8.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" sources."lodash-4.17.4" @@ -20874,7 +21006,7 @@ in sources."is-property-1.0.2" sources."tryit-1.0.3" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" sources."prelude-ls-1.1.2" @@ -20889,7 +21021,7 @@ in sources."interpret-1.0.1" sources."rechoir-0.6.2" sources."resolve-1.2.0" - sources."ajv-4.11.2" + sources."ajv-4.11.3" sources."ajv-keywords-1.5.1" sources."slice-ansi-0.0.4" sources."co-4.6.0" @@ -21062,7 +21194,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.32" + sources."node-pre-gyp-0.6.33" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -21088,15 +21220,14 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { + (sources."gauge-2.7.3" // { dependencies = [ sources."object-assign-4.1.1" ]; }) sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -21110,7 +21241,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -21131,17 +21262,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -21174,7 +21302,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -21356,7 +21484,7 @@ in sources."acorn-globals-1.0.9" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" sources."nan-2.5.1" @@ -21708,7 +21836,11 @@ in sources."source-map-0.4.4" ]; }) - sources."js-yaml-3.7.0" + (sources."js-yaml-3.8.1" // { + dependencies = [ + sources."esprima-3.1.3" + ]; + }) (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -21884,14 +22016,14 @@ in js-yaml = nodeEnv.buildNodePackage { name = "js-yaml"; packageName = "js-yaml"; - version = "3.7.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz"; - sha1 = "5c967ddd837a9bfdca5f2de84253abe8a1c03b80"; + url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.8.1.tgz"; + sha1 = "782ba50200be7b9e5a8537001b7804db3ad02628"; }; dependencies = [ sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" ]; buildInputs = globalBuildInputs; @@ -21912,7 +22044,7 @@ in }; dependencies = [ sources."bluebird-3.4.7" - sources."body-parser-1.16.0" + sources."body-parser-1.16.1" sources."chokidar-1.6.1" sources."colors-1.1.2" (sources."combine-lists-1.0.1" // { @@ -21964,10 +22096,10 @@ in }) sources."source-map-0.5.6" sources."tmp-0.0.28" - sources."useragent-2.1.11" + sources."useragent-2.1.12" sources."bytes-2.4.0" sources."content-type-1.0.2" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."depd-1.1.0" sources."http-errors-1.5.1" sources."iconv-lite-0.4.15" @@ -22034,7 +22166,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.32" + sources."node-pre-gyp-0.6.33" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" @@ -22061,11 +22193,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -22080,7 +22211,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -22099,17 +22230,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -22142,7 +22270,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -22396,7 +22524,7 @@ in sources."oauth-0.9.15" sources."passport-oauth2-1.4.0" sources."uid2-0.0.3" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" ]; @@ -22572,6 +22700,57 @@ in }; production = true; }; + mocha = nodeEnv.buildNodePackage { + name = "mocha"; + packageName = "mocha"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz"; + sha1 = "7dc4f45e5088075171a68896814e6ae9eb7a85e3"; + }; + dependencies = [ + sources."browser-stdout-1.3.0" + sources."commander-2.9.0" + sources."debug-2.2.0" + sources."diff-1.4.0" + sources."escape-string-regexp-1.0.5" + sources."glob-7.0.5" + sources."growl-1.9.2" + sources."json3-3.3.2" + sources."lodash.create-3.1.1" + sources."mkdirp-0.5.1" + sources."supports-color-3.1.2" + sources."graceful-readlink-1.0.1" + sources."ms-0.7.1" + sources."fs.realpath-1.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + sources."lodash._baseassign-3.2.0" + sources."lodash._basecreate-3.0.3" + sources."lodash._isiterateecall-3.0.9" + sources."lodash._basecopy-3.0.1" + sources."lodash.keys-3.1.2" + sources."lodash._getnative-3.9.1" + sources."lodash.isarguments-3.1.0" + sources."lodash.isarray-3.0.4" + sources."minimist-0.0.8" + sources."has-flag-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "simple, flexible, fun test framework"; + homepage = https://mochajs.org/; + license = "MIT"; + }; + production = true; + }; nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; @@ -22646,7 +22825,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."minimist-0.0.8" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -22655,7 +22834,7 @@ in sources."spdx-license-ids-1.2.2" sources."wrappy-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -22718,7 +22897,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -22738,7 +22917,7 @@ in sources."gauge-2.6.0" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" @@ -22813,7 +22992,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -22823,8 +23002,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -22838,7 +23016,7 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -22859,17 +23037,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -22902,7 +23077,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -22931,7 +23106,7 @@ in dependencies = [ sources."async-0.9.2" sources."biased-opener-0.2.8" - sources."debug-2.6.0" + sources."debug-2.6.1" (sources."express-4.14.1" // { dependencies = [ sources."debug-2.2.0" @@ -22998,7 +23173,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -23090,7 +23265,7 @@ in sources."strip-json-comments-1.0.4" sources."truncate-1.0.5" sources."nan-2.5.1" - (sources."node-pre-gyp-0.6.32" // { + (sources."node-pre-gyp-0.6.33" // { dependencies = [ sources."rimraf-2.5.4" sources."semver-5.3.0" @@ -23118,7 +23293,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -23127,8 +23302,7 @@ in sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" @@ -23137,7 +23311,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.1.1" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -23156,16 +23330,13 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -23196,7 +23367,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -23256,7 +23427,7 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -23267,8 +23438,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -23283,7 +23453,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -23304,17 +23474,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -23347,7 +23514,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -23390,7 +23557,7 @@ in }; dependencies = [ sources."chokidar-1.6.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -23459,7 +23626,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.32" + sources."node-pre-gyp-0.6.33" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-4.0.2" @@ -23483,11 +23650,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" - sources."supports-color-0.2.0" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -23502,7 +23668,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -23523,17 +23689,14 @@ in sources."uuid-3.0.1" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -23566,7 +23729,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -23678,7 +23841,7 @@ in sources."express-4.14.0" (sources."follow-redirects-1.2.1" // { dependencies = [ - sources."debug-2.6.0" + sources."debug-2.6.1" sources."ms-0.7.2" ]; }) @@ -23714,7 +23877,7 @@ in sources."ws-1.1.1" sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.7" - sources."node-red-node-email-0.1.15" + sources."node-red-node-email-0.1.16" (sources."node-red-node-twitter-0.1.9" // { dependencies = [ sources."request-2.79.0" @@ -23938,7 +24101,7 @@ in sources."longest-1.0.1" sources."options-0.0.6" sources."ultron-1.0.2" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."xmlbuilder-4.2.1" sources."lodash-4.17.4" (sources."feedparser-1.1.3" // { @@ -23957,7 +24120,7 @@ in sources."addressparser-0.1.3" sources."array-indexofobject-0.0.1" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" @@ -24018,7 +24181,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -24098,14 +24261,10 @@ in }) sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -24185,7 +24344,7 @@ in sources."methods-0.0.1" sources."send-0.1.0" sources."cookie-signature-1.0.1" - (sources."debug-2.6.0" // { + (sources."debug-2.6.1" // { dependencies = [ sources."ms-0.7.2" ]; @@ -24260,14 +24419,15 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "4.1.2"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-4.1.2.tgz"; - sha1 = "daaa77d631947135b36528c304573243f5cd2e07"; + url = "https://registry.npmjs.org/npm/-/npm-4.2.0.tgz"; + sha1 = "d4eeb6791b996fe3085535d749338d1fe48df13a"; }; dependencies = [ sources."JSONStream-1.3.0" sources."abbrev-1.0.9" + sources."ansi-regex-2.1.1" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" @@ -24302,7 +24462,7 @@ in sources."lodash.union-4.6.0" sources."lodash.uniq-4.5.0" sources."lodash.without-4.4.0" - sources."mississippi-1.2.0" + sources."mississippi-1.3.0" sources."mkdirp-0.5.1" (sources."node-gyp-3.5.0" // { dependencies = [ @@ -24359,7 +24519,6 @@ in sources."which-1.2.12" sources."wrappy-1.0.2" sources."write-file-atomic-1.3.1" - sources."ansi-regex-2.1.1" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -24400,22 +24559,23 @@ in }) sources."flush-write-stream-1.0.2" sources."from2-2.3.0" + sources."parallel-transform-1.1.0" sources."pump-1.0.2" sources."pumpify-1.3.5" sources."stream-each-1.2.0" sources."through2-2.0.3" sources."typedarray-0.0.6" sources."stream-shift-1.0.0" + sources."cyclist-0.2.2" sources."xtend-4.0.1" sources."minimist-0.0.8" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -24436,7 +24596,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -24456,17 +24616,14 @@ in sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -24498,7 +24655,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -24572,7 +24729,7 @@ in sources."couch-login-0.1.20" sources."npmlog-4.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -24635,7 +24792,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -24655,11 +24812,7 @@ in sources."concat-map-0.0.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" sources."readable-stream-2.2.2" @@ -24669,7 +24822,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" @@ -24717,10 +24870,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "2.8.10"; + version = "2.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.8.10.tgz"; - sha1 = "20a65b4293a4594df74e98dbc5cfbddee39a756b"; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.10.2.tgz"; + sha1 = "9614c58ec84d31702a85881c844c3fb93611a585"; }; dependencies = [ sources."bluebird-3.4.7" @@ -24812,8 +24965,7 @@ in sources."npm-user-validate-0.1.5" (sources."npmlog-4.0.2" // { dependencies = [ - sources."gauge-2.7.2" - sources."supports-color-0.2.0" + sources."gauge-2.7.3" ]; }) sources."once-1.4.0" @@ -24887,7 +25039,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" sources."array-index-1.0.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."es6-symbol-3.1.0" sources."ms-0.7.2" sources."d-0.1.1" @@ -24912,7 +25064,7 @@ in sources."mute-stream-0.0.7" sources."util-extend-1.0.3" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" (sources."bl-1.1.2" // { dependencies = [ sources."readable-stream-2.0.6" @@ -24969,7 +25121,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -25047,7 +25199,7 @@ in dependencies = [ sources."async-0.9.2" sources."babybird-0.0.1" - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."content-type-1.0.2" ]; @@ -25081,7 +25233,7 @@ in ]; }) sources."gelf-stream-0.2.4" - sources."js-yaml-3.7.0" + sources."js-yaml-3.8.1" sources."mediawiki-title-0.5.6" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."node-uuid-1.4.7" @@ -25094,13 +25246,13 @@ in }) sources."semver-5.3.0" sources."serve-favicon-2.3.2" - (sources."service-runner-2.1.13" // { + (sources."service-runner-2.1.15" // { dependencies = [ sources."gelf-stream-1.1.1" - sources."yargs-5.0.0" + sources."yargs-6.6.0" sources."gelfling-0.3.1" + sources."camelcase-3.0.0" sources."cliui-3.2.0" - sources."window-size-0.2.0" ]; }) sources."simplediff-0.1.1" @@ -25115,7 +25267,7 @@ in sources."asap-2.0.5" sources."is-arguments-1.0.2" sources."bytes-2.4.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."depd-1.1.0" sources."http-errors-1.5.1" sources."iconv-lite-0.4.15" @@ -25224,10 +25376,10 @@ in sources."foreach-2.0.5" sources."gelfling-0.2.0" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -25288,7 +25440,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -25352,7 +25504,6 @@ in ]; }) sources."get-caller-file-1.0.2" - sources."lodash.assign-4.2.0" sources."os-locale-1.4.0" sources."read-pkg-up-1.0.1" sources."require-directory-2.1.1" @@ -25361,7 +25512,7 @@ in sources."string-width-1.0.2" sources."which-module-1.0.0" sources."y18n-3.2.1" - (sources."yargs-parser-3.2.0" // { + (sources."yargs-parser-4.2.1" // { dependencies = [ sources."camelcase-3.0.0" ]; @@ -25381,7 +25532,7 @@ in sources."error-ex-1.3.0" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -25391,6 +25542,7 @@ in sources."code-point-at-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."number-is-nan-1.0.1" + sources."lodash.assign-4.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -25516,7 +25668,7 @@ in sources."currently-unhandled-0.4.1" sources."signal-exit-3.0.2" sources."array-find-index-1.0.2" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" sources."validate-npm-package-license-3.0.1" @@ -25586,7 +25738,7 @@ in (sources."fs-chunk-store-1.6.4" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) @@ -25598,16 +25750,16 @@ in sources."rimraf-2.5.4" sources."torrent-discovery-5.4.0" sources."torrent-piece-1.1.0" - (sources."random-access-file-1.4.0" // { + (sources."random-access-file-1.5.0" // { dependencies = [ sources."mkdirp-0.5.1" - sources."thunky-1.0.1" + sources."thunky-1.0.2" sources."minimist-0.0.8" ]; }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."ms-0.7.2" sources."flatten-0.0.1" sources."fifo-0.1.4" @@ -25649,20 +25801,28 @@ in }) sources."lru-2.0.1" sources."buffer-equal-0.0.1" - sources."k-rpc-socket-1.6.1" + sources."k-rpc-socket-1.6.2" sources."bn.js-4.11.6" sources."compact2string-1.4.0" sources."random-iterate-1.0.1" sources."run-series-1.1.4" - sources."simple-peer-6.2.1" - sources."simple-websocket-4.2.0" + sources."simple-peer-6.2.2" + (sources."simple-websocket-4.3.0" // { + dependencies = [ + sources."ws-2.0.3" + ]; + }) sources."string2compact-1.2.2" - sources."ws-1.1.1" + (sources."ws-1.1.1" // { + dependencies = [ + sources."ultron-1.0.2" + ]; + }) sources."ipaddr.js-1.2.0" sources."get-browser-rtc-1.0.2" + sources."ultron-1.1.0" sources."addr-to-ip-port-1.4.2" sources."options-0.0.6" - sources."ultron-1.0.2" ]; buildInputs = globalBuildInputs; meta = { @@ -25897,13 +26057,13 @@ in sources."bitfield-0.1.0" (sources."bittorrent-dht-3.2.6" // { dependencies = [ - sources."debug-2.6.0" + sources."debug-2.6.1" ]; }) (sources."bittorrent-tracker-2.12.1" // { dependencies = [ sources."bencode-0.6.0" - sources."debug-2.6.0" + sources."debug-2.6.1" ]; }) sources."bncode-0.5.3" @@ -26057,7 +26217,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -26114,9 +26274,9 @@ in sources."graceful-fs-4.1.11" sources."iconv-lite-0.4.15" sources."mkdirp-0.5.1" - sources."private-0.1.6" + sources."private-0.1.7" sources."q-1.4.1" - sources."recast-0.11.20" + sources."recast-0.11.21" sources."graceful-readlink-1.0.1" sources."acorn-3.3.0" sources."defined-1.0.0" @@ -26130,7 +26290,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."minimist-0.0.8" - sources."ast-types-0.9.4" + sources."ast-types-0.9.5" sources."esprima-3.1.3" sources."source-map-0.5.6" sources."base62-0.1.1" @@ -26179,7 +26339,7 @@ in sources."crypto-0.0.3" sources."xml2js-0.2.4" sources."xmlbuilder-0.4.2" - sources."sax-1.2.1" + sources."sax-1.2.2" sources."coffee-script-1.6.3" sources."node-uuid-1.4.1" (sources."connect-2.11.0" // { @@ -26195,7 +26355,7 @@ in sources."methods-0.1.0" sources."send-0.1.4" sources."cookie-signature-1.0.1" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."qs-0.6.5" sources."bytes-0.2.1" sources."pause-0.0.1" @@ -26225,7 +26385,7 @@ in sources."formidable-1.0.11" sources."crc-0.2.0" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -26290,7 +26450,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -26331,10 +26491,10 @@ in dependencies = [ sources."express-5.0.0-alpha.3" sources."express-json5-0.1.0" - (sources."body-parser-1.16.0" // { + (sources."body-parser-1.16.1" // { dependencies = [ sources."bytes-2.4.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."iconv-lite-0.4.15" sources."qs-6.2.1" sources."raw-body-2.2.0" @@ -26347,7 +26507,7 @@ in ]; }) sources."commander-2.9.0" - sources."js-yaml-3.7.0" + sources."js-yaml-3.8.1" sources."cookies-0.6.2" (sources."request-2.79.0" // { dependencies = [ @@ -26427,11 +26587,11 @@ in sources."on-headers-1.0.1" sources."graceful-readlink-1.0.1" sources."argparse-1.0.9" - sources."esprima-2.7.3" + sources."esprima-3.1.3" sources."sprintf-js-1.0.3" sources."keygrip-1.0.1" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -26490,7 +26650,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -26687,7 +26847,7 @@ in sources."precond-0.2.3" sources."csv-generate-0.0.6" sources."csv-parse-1.2.0" - sources."stream-transform-0.1.1" + sources."stream-transform-0.1.2" sources."csv-stringify-0.0.8" sources."asn1-0.1.11" sources."ctype-0.5.3" @@ -26734,7 +26894,7 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -26757,7 +26917,7 @@ in dependencies = [ sources."css-parse-1.7.0" sources."mkdirp-0.5.1" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."sax-0.5.8" sources."glob-7.0.6" sources."source-map-0.1.43" @@ -26792,7 +26952,7 @@ in sha1 = "9f5772413952135c6fefbf40afe6a4faa88b4bb5"; }; dependencies = [ - sources."sax-1.2.1" + sources."sax-1.2.2" sources."coa-1.0.1" sources."js-yaml-3.7.0" sources."colors-1.1.2" @@ -26928,7 +27088,7 @@ in sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."bl-1.0.3" sources."caseless-0.11.0" sources."combined-stream-1.0.5" @@ -26997,7 +27157,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -27041,10 +27201,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-2.1.5.tgz"; - sha1 = "6fe9479e00e01855247cea216e7561bafcdbcd4a"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.1.6.tgz"; + sha1 = "40c7e6e9e5da7961b7718b55505f9cac9487a607"; }; buildInputs = globalBuildInputs; meta = { @@ -27092,10 +27252,10 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.1.3"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.1.3.tgz"; - sha1 = "d07fd8486b5f82d65b3452671d30b16c59e13303"; + url = "https://registry.npmjs.org/ungit/-/ungit-1.1.7.tgz"; + sha1 = "eb4ba66b38ec553396fe21ec338181b88c72bf4b"; }; dependencies = [ sources."async-2.1.4" @@ -27163,7 +27323,7 @@ in sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" - (sources."raven-1.1.1" // { + (sources."raven-1.1.2" // { dependencies = [ sources."json-stringify-safe-5.0.1" sources."uuid-3.0.0" @@ -27500,10 +27660,9 @@ in sources."builtin-modules-1.1.1" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - sources."gauge-2.7.2" + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."supports-color-0.2.0" sources."object-assign-4.1.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -27523,7 +27682,7 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."extend-3.0.0" sources."har-validator-2.0.6" @@ -27533,17 +27692,14 @@ in sources."stringstream-0.0.5" sources."tough-cookie-2.3.2" sources."asynckit-0.4.0" - (sources."chalk-1.1.3" // { - dependencies = [ - sources."supports-color-2.0.0" - ]; - }) + sources."chalk-1.1.3" sources."commander-2.9.0" sources."is-my-json-valid-2.15.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" @@ -27571,7 +27727,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -27809,7 +27965,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -27856,12 +28012,12 @@ in sha1 = "7bb1d72ae2087dd1a4af526afec15eed17dda475"; }; dependencies = [ - sources."acorn-4.0.4" + sources."acorn-4.0.11" sources."acorn-dynamic-import-2.0.1" - sources."ajv-4.11.2" + sources."ajv-4.11.3" sources."ajv-keywords-1.5.1" sources."async-2.1.4" - sources."enhanced-resolve-3.0.3" + sources."enhanced-resolve-3.1.0" sources."interpret-1.0.1" sources."json-loader-0.5.4" sources."loader-runner-2.3.0" @@ -27957,9 +28113,9 @@ in sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.2" + sources."elliptic-6.3.3" sources."parse-asn1-5.0.0" - sources."brorand-1.0.6" + sources."brorand-1.0.7" sources."hash.js-1.0.3" sources."asn1.js-4.9.1" sources."ripemd160-1.0.1" @@ -28031,7 +28187,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."nan-2.5.1" - sources."node-pre-gyp-0.6.32" + sources."node-pre-gyp-0.6.33" sources."nopt-3.0.6" sources."npmlog-4.0.2" (sources."rc-1.1.6" // { @@ -28052,14 +28208,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."signal-exit-3.0.2" sources."string-width-1.0.2" @@ -28073,7 +28225,7 @@ in sources."ini-1.3.4" sources."strip-json-comments-1.0.4" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."extend-3.0.0" @@ -28136,7 +28288,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -28181,7 +28333,7 @@ in sources."error-ex-1.3.0" sources."is-arrayish-0.2.1" sources."is-utf8-0.2.1" - sources."hosted-git-info-2.1.5" + sources."hosted-git-info-2.2.0" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" sources."builtin-modules-1.1.1" @@ -28229,7 +28381,7 @@ in sources."cmd-shim-2.0.2" sources."commander-2.9.0" sources."death-1.1.0" - sources."debug-2.6.0" + sources."debug-2.6.1" sources."defaults-1.0.3" sources."detect-indent-4.0.0" sources."diff-2.2.3" @@ -28332,14 +28484,10 @@ in sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" - (sources."gauge-2.7.2" // { - dependencies = [ - sources."supports-color-0.2.0" - ]; - }) + sources."gauge-2.7.3" sources."set-blocking-2.0.0" sources."delegates-1.0.0" - sources."aproba-1.0.4" + sources."aproba-1.1.1" sources."has-unicode-2.0.1" sources."wide-align-1.1.0" sources."os-homedir-1.0.2" @@ -28347,7 +28495,7 @@ in sources."retry-0.10.1" sources."is-finite-1.0.2" sources."aws-sign2-0.6.0" - sources."aws4-1.5.0" + sources."aws4-1.6.0" sources."caseless-0.11.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" @@ -28398,7 +28546,7 @@ in sources."assert-plus-1.0.0" ]; }) - sources."jsbn-0.1.0" + sources."jsbn-0.1.1" sources."tweetnacl-0.14.5" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" @@ -28425,4 +28573,4 @@ in }; production = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 89f0075a3a3..5f48cb9b02e 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -33,6 +33,7 @@ , { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" } , "lcov-result-merger" , "meat" +, "mocha" , "nijs" , "node2nix" , "node-gyp" From 8a1fcaf5bdde62d316b10d923cae9fb4f1d100b2 Mon Sep 17 00:00:00 2001 From: Karn Kallio Date: Sun, 12 Feb 2017 19:09:24 -0400 Subject: [PATCH 085/138] Fix sessions with sddm. --- nixos/modules/services/x11/display-managers/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 7418ce56357..e8b897fb605 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -32,6 +32,9 @@ let '' #! ${pkgs.bash}/bin/bash + # Handle being called by SDDM. + if test "''${1:0:1}" = / ; then eval exec $1 $2 ; fi + ${optionalString cfg.displayManager.logToJournal '' if [ -z "$_DID_SYSTEMD_CAT" ]; then _DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t xsession -- "$0" "$@" From 59e77daf5b077d6f9b1e940a6c884bf0637f1732 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 12 Feb 2017 18:16:18 -0500 Subject: [PATCH 086/138] nixos tests: make getTTYText smart about tty size --- nixos/lib/test-driver/Machine.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm index 14c39e859bc..85bc376f67f 100644 --- a/nixos/lib/test-driver/Machine.pm +++ b/nixos/lib/test-driver/Machine.pm @@ -508,7 +508,7 @@ sub screenshot { sub getTTYText { my ($self, $tty) = @_; - my ($status, $out) = $self->execute("fold -w 80 /dev/vcs${tty}"); + my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}"); return $out; } From 96d767de621242a5df6de5db82a9b088d24ef606 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 12 Feb 2017 18:17:08 -0500 Subject: [PATCH 087/138] pam_oath: require OATH and pam_unix credentials to be valid --- nixos/modules/security/pam.nix | 4 +- nixos/release.nix | 1 + nixos/tests/pam-oath-login.nix | 126 +++++++++++++++++++++++++++++++++ 3 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/pam-oath-login.nix diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 96e7c45d496..67652fbd1e7 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -253,6 +253,8 @@ let "auth sufficient ${pkgs.pam_u2f}/lib/security/pam_u2f.so"} ${optionalString cfg.usbAuth "auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so"} + ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth + "auth requisite ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} '' + # Modules in this block require having the password set in PAM_AUTHTOK. # pam_unix is marked as 'sufficient' on NixOS which means nothing will run @@ -271,8 +273,6 @@ let "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} - ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth - "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"} ${optionalString use_ldap "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"} ${optionalString config.services.sssd.enable diff --git a/nixos/release.nix b/nixos/release.nix index c061b9801a0..0f93deddf26 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -283,6 +283,7 @@ in rec { tests.leaps = callTest tests/leaps.nix { }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; + tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callTest tests/postgresql.nix {}; diff --git a/nixos/tests/pam-oath-login.nix b/nixos/tests/pam-oath-login.nix new file mode 100644 index 00000000000..4364d6e354a --- /dev/null +++ b/nixos/tests/pam-oath-login.nix @@ -0,0 +1,126 @@ +import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: + +let + oathSnakeoilSecret = "cdd4083ef8ff1fa9178c6d46bfb1a3"; + + # With HOTP mode the password is calculated based on a counter of + # how many passwords have been made. In this env, we'll always be on + # the 0th counter, so the password is static. + # + # Generated in nix-shell -p oathToolkit + # via: oathtool -v -d6 -w10 cdd4083ef8ff1fa9178c6d46bfb1a3 + # and picking a the first 4: + oathSnakeOilPassword1 = "143349"; + oathSnakeOilPassword2 = "801753"; + oathSnakeOilPassword3 = "019933"; + oathSnakeOilPassword4 = "403895"; + + alicePassword = "foobar"; + # Generated via: mkpasswd -m sha-512 and passing in "foobar" + hashedAlicePassword = "$6$MsMrE1q.1HrCgTS$Vq2e/uILzYjSN836TobAyN9xh9oi7EmCmucnZID25qgPoibkw8qTCugiAPnn4eCGvn1A.7oEBFJaaGUaJsQQY."; + +in +{ + name = "pam-oath-login"; + + machine = + { config, pkgs, lib, ... }: + { + security.pam.oath = { + enable = true; + }; + + users.extraUsers.alice = { + isNormalUser = true; + name = "alice"; + uid = 1000; + hashedPassword = hashedAlicePassword; + extraGroups = [ "wheel" ]; + createHome = true; + home = "/home/alice"; + }; + + + systemd.services.setupOathSnakeoilFile = { + wantedBy = [ "default.target" ]; + before = [ "default.target" ]; + unitConfig = { + type = "oneshot"; + RemainAfterExit = true; + }; + script = '' + touch /etc/users.oath + chmod 600 /etc/users.oath + chown root /etc/users.oath + echo "HOTP/E/6 alice - ${oathSnakeoilSecret}" > /etc/users.oath + ''; + }; + }; + + testScript = + '' + $machine->waitForUnit('multi-user.target'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty1'"); + $machine->screenshot("postboot"); + + + subtest "Invalid password", sub { + $machine->fail("pgrep -f 'agetty.*tty2'"); + $machine->sendKeys("alt-f2"); + $machine->waitUntilSucceeds("[ \$(fgconsole) = 2 ]"); + $machine->waitForUnit('getty@tty2.service'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty2'"); + + $machine->waitUntilTTYMatches(2, "login: "); + $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(2, "login: alice"); + $machine->waitUntilSucceeds("pgrep login"); + + $machine->waitUntilTTYMatches(2, "One-time password"); + $machine->sendChars("${oathSnakeOilPassword1}\n"); + $machine->waitUntilTTYMatches(2, "Password: "); + $machine->sendChars("blorg\n"); + $machine->waitUntilTTYMatches(2, "Login incorrect"); + }; + + subtest "Invalid oath token", sub { + $machine->fail("pgrep -f 'agetty.*tty3'"); + $machine->sendKeys("alt-f3"); + $machine->waitUntilSucceeds("[ \$(fgconsole) = 3 ]"); + $machine->waitForUnit('getty@tty3.service'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty3'"); + + $machine->waitUntilTTYMatches(3, "login: "); + $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(3, "login: alice"); + $machine->waitUntilSucceeds("pgrep login"); + $machine->waitUntilTTYMatches(3, "One-time password"); + $machine->sendChars("000000\n"); + $machine->waitUntilTTYMatches(3, "Login incorrect"); + $machine->waitUntilTTYMatches(3, "login:"); + }; + + subtest "Happy path (both passwords are mandatory to get us in)", sub { + $machine->fail("pgrep -f 'agetty.*tty4'"); + $machine->sendKeys("alt-f4"); + $machine->waitUntilSucceeds("[ \$(fgconsole) = 4 ]"); + $machine->waitForUnit('getty@tty4.service'); + $machine->waitUntilSucceeds("pgrep -f 'agetty.*tty4'"); + + $machine->waitUntilTTYMatches(4, "login: "); + $machine->sendChars("alice\n"); + $machine->waitUntilTTYMatches(4, "login: alice"); + $machine->waitUntilSucceeds("pgrep login"); + $machine->waitUntilTTYMatches(4, "One-time password"); + $machine->sendChars("${oathSnakeOilPassword2}\n"); + $machine->waitUntilTTYMatches(4, "Password: "); + $machine->sendChars("${alicePassword}\n"); + + $machine->waitUntilSucceeds("pgrep -u alice bash"); + $machine->sendChars("touch done4\n"); + $machine->waitForFile("/home/alice/done4"); + }; + + ''; + +}) From a77705748bf85b70807b52b3b27ff446826dde17 Mon Sep 17 00:00:00 2001 From: ndowens Date: Sun, 12 Feb 2017 14:36:37 -0600 Subject: [PATCH 088/138] worker: init at 3.8.5 modified: pkgs/top-level/all-packages.nix pick 8096649e47 worker: init at 3.8.5 squash 9267acbd46 modified: pkgs/top-level/all-packages.nix worker: updated default.nix license field Added myself to lib/maintainers.nix squash 28173341fa worker: updated default.nix license field squash b22407cf5c Added myself to lib/maintainers.nix Fixed indent and added missing > in maintainers.nix Fixed curly bracket indent --- lib/maintainers.nix | 1 + pkgs/applications/misc/worker/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 pkgs/applications/misc/worker/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 15167408786..3753a6955c8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -336,6 +336,7 @@ Nate-Devv = "Nathan Moore "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; + ndowens = "Nathan Owens "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; nhooyr = "Anmol Sethi "; diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix new file mode 100644 index 00000000000..63349670d01 --- /dev/null +++ b/pkgs/applications/misc/worker/default.nix @@ -0,0 +1,20 @@ +{pkgs, stdenv, xorg, fetchurl }: + +stdenv.mkDerivation rec { + name = "worker"; + version = "3.8.5"; + + src = fetchurl { + url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz"; + sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; +}; + +buildInputs = with pkgs; [ xorg.libX11 ]; + + meta = with stdenv.lib; { + description = "a two-pane file manager with advanced file manipulation features"; + homepage = "http://www.boomerangsworld.de/cms/worker/index.html"; + license = licenses.gpl2; + maintainers = [ maintainers.ndowens ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5ddc9d3428..f9ddc52ea22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15588,6 +15588,8 @@ with pkgs; wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; wordnet = callPackage ../applications/misc/wordnet { }; + + worker = callPackage ../applications/misc/worker { }; workrave = callPackage ../applications/misc/workrave { inherit (gnome2) GConf gconfmm; From f5a82e4714371a65ed5ccc5ae46c5f106c953f83 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 13 Feb 2017 00:55:12 +0100 Subject: [PATCH 089/138] gitlab service: fix database creation Providing custom a username and database name was broken. They were hardcoded to "gitlab". --- nixos/modules/services/misc/gitlab.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 1fc3a5cc869..36db4fb9660 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -528,8 +528,8 @@ in { if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then if ! test -e "${cfg.statePath}/db-created"; then - psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" - ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true + psql postgres -c "CREATE ROLE ${cfg.databaseUsername} WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" + ${config.services.postgresql.package}/bin/createdb --owner ${cfg.databaseUsername} ${cfg.databaseName} || true touch "${cfg.statePath}/db-created" fi fi From 836ab672a89c300a1a6f7a55a4f77bd67107dcbf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 13 Feb 2017 01:02:09 +0100 Subject: [PATCH 090/138] worker: fix indentation --- pkgs/applications/misc/worker/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 63349670d01..fade4905cfc 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "worker"; version = "3.8.5"; - src = fetchurl { - url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz"; - sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; -}; + src = fetchurl { + url = "http://www.boomerangsworld.de/cms/worker/downloads/${name}-${version}.tar.gz"; + sha256 = "1xy02jdf60wg2jycinl6682xg4zvphdj80f8xgs26ip45iqgkmvw"; + }; -buildInputs = with pkgs; [ xorg.libX11 ]; + buildInputs = with pkgs; [ xorg.libX11 ]; meta = with stdenv.lib; { description = "a two-pane file manager with advanced file manipulation features"; From 005a9d2d9da3a393bf1a595447487b26b4d96a18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 12 Feb 2017 23:46:43 +0100 Subject: [PATCH 091/138] vimPlugins: update to latest --- pkgs/misc/vim-plugins/default.nix | 564 +++++++++++++++--------------- 1 file changed, 277 insertions(+), 287 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 3ee8f32da0c..f7274219bdc 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -123,11 +123,11 @@ rec { }; CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2015-06-22"; + name = "CheckAttach-2017-02-12"; src = fetchgit { url = "git://github.com/chrisbra/CheckAttach"; - rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68"; - sha256 = "0scshz5vc5j2lhjj5is4y392xarwsdh4z3y7kyibq3d7fmszksgn"; + rev = "17e8e37e348a93f2a2104f07f1224c9c8798f85e"; + sha256 = "0i8y0h840bpj5s0vf603ghjnpfyds5q7y8c4p8a58qzw20i2v88g"; }; dependencies = []; @@ -178,11 +178,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-12-23"; + name = "Syntastic-2017-02-07"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "78c0d21a9b0329766732ca2743a848af1c49e791"; - sha256 = "1n744grp4ajn4zfra5kfg97sj8rjkqcw1sgx2jbj5qq8l3p5ghad"; + rev = "53a3db5e3bfbafb660ebbdbc8210e3b30cb60c10"; + sha256 = "0kinqr5azlcs01q8czynxvbjswfdjh30xww26a8lf2h9750qzyhi"; }; dependencies = []; @@ -200,22 +200,22 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2017-01-03"; + name = "Tagbar-2017-02-12"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "18b536ce43f1be88be380e5f3b7cd0fd930b4908"; - sha256 = "0k4c5f3qvszn3a9ndkcl984w832vk2g4hfwl4nkvy9bwqg7q89ya"; + rev = "9d051c1e2d9f3dc88d3ae00485e55934b06d42f7"; + sha256 = "055n6armj80vmyv9kc8jhd84wl6nrr8qf7fj6b5vxp221y86wf3x"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2016-12-15"; + name = "The_NERD_Commenter-2017-01-22"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "18cfe815501c8264844223a944eb388285b48caa"; - sha256 = "05dg5v1pal5ly8shc4rlnqip5zsdx9901h4336a2k81lss269wd4"; + rev = "607253203dc2fc1798dbe2ea9a3471db9c12e005"; + sha256 = "1z7rg52153vm5vj5xpvqny0aikvlr7nk9nfkrwnfxcs4jq8i752d"; }; dependencies = []; @@ -233,11 +233,11 @@ rec { }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-12-16"; + name = "UltiSnips-2017-01-20"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "f974e0317f549c7cf54fa231ee0501206aed6882"; - sha256 = "0kvpgdkfc70phj2zf6lcblxb25hliiaz2cwg61bq7ip06sbk0fq0"; + rev = "5352d98f212e273b3e8b1d84efdbe2d6a6d557e9"; + sha256 = "0d27823qnfd9qcj2a2x77slsw725jfa9s40ilw4qp9ab03bma1ci"; }; dependencies = []; @@ -281,28 +281,6 @@ rec { sourceRoot = "."; }; - vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-highlightedyank-2017-01-04"; - src = fetchgit { - url = "git://github.com/machakann/vim-highlightedyank"; - rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640"; - sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a"; - }; - dependencies = []; - - }; - - alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "alchemist.vim-2017-01-02"; - src = fetchgit { - url = "git://github.com/slashmili/alchemist.vim"; - rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4"; - sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf"; - }; - dependencies = []; - - }; - commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "commentary-2016-03-10"; src = fetchgit { @@ -330,11 +308,11 @@ rec { }; ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2016-09-02"; + name = "ctrlp-py-matcher-2017-01-05"; src = fetchgit { url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1"; - sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d"; + rev = "a0710a4937ab9dc10bc0a8b56b41fcc88534147c"; + sha256 = "198y8998sx2maarn2vawx8hqldsfbnn4i6rlg56qw6brsrssssx2"; }; dependencies = []; @@ -351,17 +329,6 @@ rec { }; - delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "delimitMate-2016-07-19"; - src = fetchgit { - url = "git://github.com/Raimondi/delimitMate"; - rev = "b5719054beebe0135c94f4711a06dc7588041f09"; - sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3"; - }; - dependencies = []; - - }; - extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "extradite-2015-09-22"; src = fetchgit { @@ -374,22 +341,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-11-13"; + name = "fugitive-2017-02-10"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "b754bc2031f21a532c083dd0d072ba373bbe3a37"; - sha256 = "1sig8dl3m1dw5zjxdsp00n1cacmcwdvas3iz04zk88v6xsm8rj22"; - }; - dependencies = []; - - }; - - vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-lawrencium-2017-01-10"; - src = fetchgit { - url = "git://github.com/ludovicchabant/vim-lawrencium"; - rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f"; - sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab"; + rev = "f44845e4408aae03e018e98afb7fbf0c2ee87dd5"; + sha256 = "1rd6iqg1q8wchsypm0mg75mfc93y871xsx6cl733771w83zi91hq"; }; dependencies = []; @@ -407,22 +363,22 @@ rec { }; vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2016-09-12"; + name = "vim-auto-save-2017-01-16"; src = fetchgit { url = "git://github.com/907th/vim-auto-save"; - rev = "28300c8a7b8cea137c065a48fd9bcc2348f08707"; - sha256 = "0n3xbp8vf3xsh6y6f855q313scldqm9593bhxydyszy1parvxwb5"; + rev = "8301d9a7bb60151f8b07b3be1a9b66a7c8aa81c5"; + sha256 = "1yp117kfgrg5hsgm48k9ahh6pgirl1nx2z9k36ixpg80cj2wyj2y"; }; dependencies = []; }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-12-13"; + name = "vim-autoformat-2017-02-06"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "3715e166a5aa006353ca5bfad2386767676fe848"; - sha256 = "0ki41pdrl5y4fry3xqn4sdx48zvvd3gc59qzs1nssvn9zp0k9il5"; + rev = "56170ff0d3c4e7b9acf0d373425ae2b2f047036e"; + sha256 = "0q4jz79jn6w9nkfvy9dk41d2krccx6pn91lm51987j9viijb6kyq"; }; dependencies = []; @@ -439,12 +395,34 @@ rec { }; + tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "tsuquyomi-2017-01-31"; + src = fetchgit { + url = "git://github.com/Quramy/tsuquyomi"; + rev = "201d84d37ac9077855942dc9c6e6e235e285f20f"; + sha256 = "1rcibh4clxw8sq2n8072i4x52msvfxim9r9rwqi264jm31s81yyx"; + }; + dependencies = []; + + }; + + delimitMate = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "delimitMate-2016-07-19"; + src = fetchgit { + url = "git://github.com/Raimondi/delimitMate"; + rev = "b5719054beebe0135c94f4711a06dc7588041f09"; + sha256 = "03nmkiq138w6kq4s3mh4yyr6bjvqwj8hg6qlji1ng4vnzb0638q3"; + }; + dependencies = []; + + }; + deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2017-01-04"; + name = "deoplete-nvim-2017-02-09"; src = fetchgit { url = "git://github.com/Shougo/deoplete.nvim"; - rev = "90569837af21ad0438448582b34d8418b745ffeb"; - sha256 = "1qkzvgvjg397zaj1i56ld9i0gf2w9y5x2if5gbmag56nhxcwfw32"; + rev = "2e9fd874b7d974a03df8af10a090e2601b16c7f0"; + sha256 = "1zj80jxsnff2s16wkim56sxks7p2nj5dv073v30nbscbxacq6hvp"; }; dependencies = []; @@ -473,22 +451,22 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-10-11"; + name = "vim-css-color-2017-02-09"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "27903efc1b5330230d5c8c336c26ac7a8ac2e5dc"; - sha256 = "0kr9xf2y001d42x7fam50qbd09fb3rr374qv8m2p5z2d9c21par1"; + rev = "2411b84298eb6db034001f35ce7cc32c36f9b43b"; + sha256 = "1igqshk7wkh1wgihnmxnlh84fb98fm9lm8lfyjpcz6x8rg5vpmwc"; }; dependencies = []; }; clighter8 = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "clighter8-2017-01-03"; + name = "clighter8-2017-02-12"; src = fetchgit { url = "git://github.com/bbchung/clighter8"; - rev = "89d70129ab5437c749041094fa71da97c95bda3f"; - sha256 = "147i6rhz6ri86k6p0sim72vpsc5f6y8dvwxn7am6vyi21avy4zrz"; + rev = "357a0292438dfad356ce52c94f96840063fad80d"; + sha256 = "0rd5ikq7ln0n2a1alhjzcjhqdfa5m5laylsg24xl1py32lcqayak"; }; dependencies = []; preFixup = '' @@ -498,11 +476,11 @@ rec { }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2017-01-04"; + name = "neomake-2017-02-12"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "9794f6caef063ba1283bb728ac3befda477935f3"; - sha256 = "11rpc98nv9viyv82j5y4l29jc62bmd2rddp90a6740p8dx5gvx5q"; + rev = "375684a1c81ffe24a8e2dfb1e92d164498f38653"; + sha256 = "1yhkh94fpnwk335s6xd17jl5w6mrzj8vz9aw3g39gf5m4lwlqn8w"; }; dependencies = []; @@ -520,33 +498,33 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2016-09-03"; + name = "vim-tmux-navigator-2017-01-28"; src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; - rev = "e79d4c0c24c43d3ada283b1f5a1b8fa6cf820a70"; - sha256 = "1p4kb8ja86pa3l9jh8yfjvdvdik4fwnpbpl34npjwbga52pawn65"; + rev = "34f8fbf1d4ebaa1bf1db6715b17a197eaffe1ad8"; + sha256 = "074isx0kksl7kc72n1n8ywqcx5vj7ndz01jaih14nwqpqshv2zgx"; }; dependencies = []; }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2016-12-02"; + name = "spacevim-2017-01-22"; src = fetchgit { url = "git://github.com/ctjhoa/spacevim"; - rev = "9bb2a04b14964a7db1d4131e1af1ed8bd31e910b"; - sha256 = "0hq6g8czi73hgpkpigi177kp49dslh8xny3j7wjl03bjxsq9fkmk"; + rev = "bd6ebf63a9a6742823d3d090f992fabe500240c5"; + sha256 = "10rwqsnd9k255anppj27xjqlcfj91k8jy7c377jk7hqbn5h7dmzn"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-11-29"; + name = "ctrlp-vim-2017-01-13"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "2868678a987834563bbc384763135462c2423eb8"; - sha256 = "0s98nqj22i4x79mqspjkz6b6rpg8hf79iblv4md2ivzlj7ffccx3"; + rev = "7fa89fec125ce60a341f7c37dd769a8a31c49359"; + sha256 = "12x1bkipvqbz2jczl80rj6yd61hq18g3g2cx2r1yk19f6n8nfjvc"; }; dependencies = []; @@ -575,18 +553,18 @@ rec { }; vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jade-2016-10-31"; + name = "vim-jade-2017-02-01"; src = fetchgit { url = "git://github.com/digitaltoad/vim-jade"; - rev = "cc1bddc890f4856aa0511fdfd7c55d2e66f688b5"; - sha256 = "1d5rbaslvr14lcdffrxp0ycsm2nzvq5zyjk0x0nzwhzvvs4fqi40"; + rev = "eb8c6b23b86fdc93cd2a34217adfe5f6b2d7d05d"; + sha256 = "1y325pq8r4njx6mz5y2hk0j6dpkbw9f6cxp0n2hdfp4xj9qgx9v1"; }; dependencies = []; }; - dracula = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "dracula-2016-09-21"; + vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-2016-09-21"; src = fetchgit { url = "git://github.com/dracula/vim"; rev = "926dfbab01128322f6326bdd10de2856b1fa3232"; @@ -607,17 +585,6 @@ rec { }; - neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-vim-2017-01-16"; - src = fetchgit { - url = "git://github.com/shougo/neco-vim"; - rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa"; - sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3"; - }; - dependencies = []; - - }; - editorconfig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "editorconfig-vim-2016-07-16"; src = fetchgit { @@ -640,23 +607,34 @@ rec { }; + vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-elixir-2017-01-24"; + src = fetchgit { + url = "git://github.com/elixir-lang/vim-elixir"; + rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f"; + sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4"; + }; + dependencies = []; + + }; + elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2016-11-26"; + name = "elm-vim-2017-01-13"; src = fetchgit { url = "git://github.com/elmcast/elm-vim"; - rev = "16a9a380a514e23c02d4bd7374112aa2dac1f3a4"; - sha256 = "1mjccw7yx8hrn4vriickzag9z5g3xzqd6qh6w3xkw0nfh8mx2sgn"; + rev = "0c1fbfdf12f165681b8134ed2cae2c148105ac40"; + sha256 = "0l871hzg55ysns5h6v7xq63lwf4135m3xggm2s4q2pmzizivk0x2"; }; dependencies = []; }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2016-11-08"; + name = "vim-localvimrc-2017-02-07"; src = fetchgit { url = "git://github.com/embear/vim-localvimrc"; - rev = "9f6de2ddfea2a397bc3e5335779bc93a8260ff99"; - sha256 = "0ks8x7zjqnbm06y3niidj9h0ccqky29b2vpdkvs1vwnli10bg6sh"; + rev = "775ea57b9f433bdaf83c42c26d51137e1e7b3b98"; + sha256 = "094jmnfzl1girjwhpg4kq48lrdcfrx4x1baq1n8rjlm2zln2sbdx"; }; dependencies = []; @@ -685,11 +663,11 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2017-01-01"; + name = "vim-go-2017-02-02"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "d7c628ff228c2e6a4d4d5808f198471a775cf8b5"; - sha256 = "1375qz8id08d10p6i7ppvk3khq778996bx1n7qarz6vx6kb19zcn"; + rev = "1425decf6d4e1b313955cefe08c859d07c2c2822"; + sha256 = "1pql4m5iiajqk6qfb3nahlf2q2ixp425lg5bni16rk78r173wqvl"; }; dependencies = []; @@ -707,11 +685,11 @@ rec { }; floobits-neovim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "floobits-neovim-2016-10-07"; + name = "floobits-neovim-2017-02-08"; src = fetchgit { url = "git://github.com/floobits/floobits-neovim"; - rev = "85d3493d05ac1d7f5606d40fbe619df16af917bc"; - sha256 = "16c12dgk60mmhyijfk4f33k8i48r1hpjlnxlvdk5kymv7b2xq0fa"; + rev = "9755412fcd68cfc76a36aa000682a84d96013650"; + sha256 = "1mn6kikygk86xblxg8kklkrrxagil4az76z0mzid847g4jw4hfd1"; }; dependencies = []; @@ -740,55 +718,55 @@ rec { }; vim-jsdoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsdoc-2016-10-30"; + name = "vim-jsdoc-2017-02-11"; src = fetchgit { url = "git://github.com/heavenshell/vim-jsdoc"; - rev = "45c7c7cef440a29f7bf24436640413e3d5d578ff"; - sha256 = "0kr4p01pyrz9w7yfh50gsz6n60qvnqxsr1055hvsyx36nzw6l3za"; + rev = "cd8f084c3b4bd198620d45a007cee6b009b57b35"; + sha256 = "0a2d9jwxjws8l7y89yn7xl07r5yh7r7987a8hfalvz12qmdmff1j"; }; dependencies = []; }; vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2016-11-06"; + name = "vim-leader-guide-2017-02-12"; src = fetchgit { url = "git://github.com/hecal3/vim-leader-guide"; - rev = "b1dd2667cb74147c06853c39530984fbc629eb48"; - sha256 = "0xacamv3dcnkdh9xclvw76fp20rxgqb1m3068l582c6g5p7lj0yi"; + rev = "b545f700ae13e5b6c3e8c1d6e9796305690ba2da"; + sha256 = "0d1d8w1kp0h4j5hgh2ighvn6l00rq714fwxbswx07l5r931prwy1"; }; dependencies = []; }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2016-07-29"; + name = "idris-vim-2017-01-27"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "7ef7a2ed9135d69a0dea6b571a20ddf2b0bf7a90"; - sha256 = "0py7vyg38yn6bl7pwyyhylpqp14smqjzbfj7rjzjfnlq33v7ysij"; + rev = "c9b8066730fd8e62cf20eecf0e2c60f225ff12c8"; + sha256 = "0nkr2qwykl57xky3dpz40m5gy7s1kjfsgb1kzj7z9jqm6a41m2bb"; }; dependencies = []; }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-12-06"; + name = "calendar-vim-2017-02-09"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "6cf60f08a42c8b22ea3ae191a89e1faa4fdd3dae"; - sha256 = "172xgsmzwpy890bg813d89wz210lfdhckvispdl45l15armdy99y"; + rev = "e6fef6c6f7bdab98026cd2fa1a3900ce2bd0b852"; + sha256 = "0330vjkd54mx22qyxbgrxnz2k2ybm6izvi5wl6qm5p39dkqwg8ip"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2016-12-03"; + name = "lightline-vim-2017-02-12"; src = fetchgit { url = "git://github.com/itchyny/lightline.vim"; - rev = "059888ab650fa192dd441e52bd9f41f08b247529"; - sha256 = "1pa627jjmrhlfbd8yms8lvfgnm0gj9xkr29jkq122icfl6hv3fwx"; + rev = "a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a"; + sha256 = "13fpf1rdaswz5c3wgpc1jjrzw47jhm896q5z0dc82lrfwsggp5a5"; }; dependencies = []; @@ -805,17 +783,6 @@ rec { }; - typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "typescript-vim-2016-08-10"; - src = fetchgit { - url = "git://github.com/leafgarland/typescript-vim"; - rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a"; - sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk"; - }; - dependencies = []; - - }; - vim-ipython = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-ipython-2015-06-23"; src = fetchgit { @@ -839,22 +806,22 @@ rec { }; vim-orgmode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-orgmode-2016-11-12"; + name = "vim-orgmode-2017-01-31"; src = fetchgit { url = "git://github.com/jceb/vim-orgmode"; - rev = "67a693c37bac75ba163d35b9972efd0c7e0deb71"; - sha256 = "1rdcyfdyq4lbfh9ya63kf05aqcr9g6q7r4ngzn1fgy7pmqdpk7vf"; + rev = "37fc5db4d167ca0def23febcb06d984ab72015be"; + sha256 = "19cyd7l7xf9yhrx2k735hksd40hxy8izj30l1bl3a8v01lwv088x"; }; dependencies = []; }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2016-10-19"; + name = "vim-buffergator-2017-02-05"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "c07d16dd3df10bbb5adc3e9b009e341bfa1f673e"; - sha256 = "0bj70lkqizfzmaxwrxcqv1151kx37v2v57aaqy4vcnfn04wq3h95"; + rev = "04dfbc0c78b0a29b340a99d0ff36ecf8f16e017d"; + sha256 = "1z13qqmvzismz7f6ss2pk956adnqh14df8qrlzk9rgplknm4w6k7"; }; dependencies = []; @@ -872,22 +839,22 @@ rec { }; auto-pairs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "auto-pairs-2016-11-21"; + name = "auto-pairs-2017-01-26"; src = fetchgit { url = "git://github.com/jiangmiao/auto-pairs"; - rev = "84518168107c34fb540ee4f8cde743ceaf682bae"; - sha256 = "104mahfn956vb98psfml0b4x1yhwn8w6af3hkym3fdxy4ksh4fj4"; + rev = "e915d857fe927309ef0090e830f892204b750c43"; + sha256 = "11scssclvrri1lix3bbx2xrrznjihvd2g4c5d5xqv1ab14yrs6q4"; }; dependencies = []; }; vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nerdtree-tabs-2016-09-19"; + name = "vim-nerdtree-tabs-2017-02-12"; src = fetchgit { url = "git://github.com/jistr/vim-nerdtree-tabs"; - rev = "5a91230193fea7f9c8d792cb5c635998d868337d"; - sha256 = "08g587bnd8n61nj44ghjadwqpbbqya4hig56afna6rhs341zwlpm"; + rev = "de6a60909e71790baf5d46f863643379ec19bc4c"; + sha256 = "1h9r9c9b788b6fz56s12ih85zyf1vv0bzrl7k54vl4cncryyw37y"; }; dependencies = []; @@ -927,11 +894,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2016-12-25"; + name = "fzf-vim-2017-02-08"; src = fetchgit { url = "git://github.com/junegunn/fzf.vim"; - rev = "2066643243eddf2ed1f5d3a1a5485d6ff71851a4"; - sha256 = "0svw41n4x1j7s9l7qh5s0mk2s5ibdfq4pzdiknvfb342na6xi2b5"; + rev = "dade777e6dad6a318630d7ce26b9761761522c40"; + sha256 = "0yixz5nr6c6719yfcpci21fhx6kk6wa0213zlkipj8aij2y6ygfy"; }; dependencies = []; @@ -949,11 +916,11 @@ rec { }; vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2016-08-05"; + name = "vim-peekaboo-2017-01-13"; src = fetchgit { url = "git://github.com/junegunn/vim-peekaboo"; - rev = "9c8415c022ab24ce51af13aa43255d5a7c7ef670"; - sha256 = "10c8j4wcg7g3i3vyvlcc21j0a3xmbl5ii5fl5k27iy2icf5rm018"; + rev = "9de6fd70ad20cbf568664c06d673c69e2f622287"; + sha256 = "0b5bfvwzy5l8g8s5z1h60c0y3phw2x0gyh1516sdlaq0nmvg2dky"; }; dependencies = []; @@ -981,6 +948,17 @@ rec { }; + typescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "typescript-vim-2016-08-10"; + src = fetchgit { + url = "git://github.com/leafgarland/typescript-vim"; + rev = "7e25a901af7cd993498cc9ecfc833ca2ac21db7a"; + sha256 = "0n5lrn741ar6wkvsi86kf7hgdjdwq34sn3ppzcddhvic5hayrkyk"; + }; + dependencies = []; + + }; + vim-jinja = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-jinja-2016-11-16"; src = fetchgit { @@ -993,11 +971,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2017-01-03"; + name = "vimtex-2017-02-09"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "4c76e8f74025c6c753167f23a6be0bcfc1e39af7"; - sha256 = "1syl4wyffn59i43q6kcy3hz5kzwmp0wj4xmwsahg81fxq4wzdz3n"; + rev = "de61b31cf89b6fd4653dc812d779abcf21ed33d0"; + sha256 = "0cg0l4jm9zfmg7nx0zha5cpv9c9szyj7fmfs19v1r7bzc3dvi492"; }; dependencies = []; @@ -1014,6 +992,17 @@ rec { }; + vim-lawrencium = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-lawrencium-2017-01-10"; + src = fetchgit { + url = "git://github.com/ludovicchabant/vim-lawrencium"; + rev = "88077183e1f5a9a1f741aeab7a1374cfed9e917f"; + sha256 = "0z31v93wjycq4lqvbl1jzxi7i5i1vl919m4dyyzphybcqrjjpnab"; + }; + dependencies = []; + + }; + rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "rainbow-2016-10-28"; src = fetchgit { @@ -1040,12 +1029,23 @@ rec { buildInputs = [ xkb_switch ]; }; + vim-highlightedyank = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-highlightedyank-2017-01-04"; + src = fetchgit { + url = "git://github.com/machakann/vim-highlightedyank"; + rev = "17327fd1072ac15a30f596a2fc0b6cef122e0640"; + sha256 = "08rc1br8npvkxxh3jn9hmn4yh4nlxy04c8nwyrnpndhw05kca33a"; + }; + dependencies = []; + + }; + vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-startify-2017-01-02"; + name = "vim-startify-2017-02-04"; src = fetchgit { url = "git://github.com/mhinz/vim-startify"; - rev = "c26fcfcd17cfa64e051c8aa97f78894d91a21604"; - sha256 = "0rcvh612qvcsbf0bagq44dk2hbarhcc2v9a8n7lc5f7rsgdhxp7w"; + rev = "5e9e6a48c992d9255a3be2f96765c9bb80faae97"; + sha256 = "1gnpg59i81hwhqva5grjd4f5lnjaclwwra58sgv30mrxkjg4d741"; }; dependencies = []; @@ -1096,22 +1096,22 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2016-12-29"; + name = "haskell-vim-2017-02-08"; src = fetchgit { url = "git://github.com/neovimhaskell/haskell-vim"; - rev = "434f5903556e2bea99d433d48adb681cb4967d27"; - sha256 = "0lwclld3yqh4mf0bqqaxvqsfqsjq8q5pl27q1byqrr9x3ngjx5zz"; + rev = "c07c2b63f393252412b9c65726f2693bcacef71b"; + sha256 = "09xcsh3411l1wj7w0cwalcpd26rdw4k9idd2mclywrzlrlfddl9b"; }; dependencies = []; }; cpsm = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "cpsm-2016-09-21"; + name = "cpsm-2017-02-12"; src = fetchgit { url = "git://github.com/nixprime/cpsm"; - rev = "565ab53a66fa52c46d80adf6981b07f4bdffcb1d"; - sha256 = "125gcnqrg2276sp715q924cxwjxwsv3j4m0n1zj17w9srnpn4r1k"; + rev = "8e61bf3e30868c57ad7cf1fe4315b2352d61467c"; + sha256 = "0qcc10dx48wyvcgz9q3nid9l1wxvl9m97608s289lj4zps8iqpcs"; }; dependencies = []; buildInputs = [ @@ -1151,22 +1151,22 @@ rec { }; vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-markdown-2016-05-19"; + name = "vim-markdown-2017-02-02"; src = fetchgit { url = "git://github.com/plasticboy/vim-markdown"; - rev = "a3169545f330ec8080244c3ad755bb2211eca8a0"; - sha256 = "1ycqx280xpc5gvfx8rrnmkqlv8q8g51hgiryx6yvd9a8ci805cx1"; + rev = "d6d59eef6f604b6430fd6adade9e18364666232b"; + sha256 = "1p2ygvlg9abi4v52v9jh0aj76ll490w5d0gfsds33gy88hzl4js6"; }; dependencies = []; }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2017-01-04"; + name = "vim-racer-2017-02-08"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "3bd56cc87518c1bf02b681d586447366ae8e815a"; - sha256 = "0wq2iwgb7wpg62r68f9j5g3kycyap8sks735p9mcsq63rrqmw6l4"; + rev = "34f806e26fcd9271b0de5d34aab7f4e8ac13050e"; + sha256 = "07wmf40f7wvcb4wqdx6qqwhvbgaaawa2vxb6y1b28njzc05b01cd"; }; dependencies = []; @@ -1184,11 +1184,11 @@ rec { }; vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-grammarous-2017-01-03"; + name = "vim-grammarous-2017-02-12"; src = fetchgit { url = "git://github.com/rhysd/vim-grammarous"; - rev = "33f9b3a0f8d6fb01e3c565948bd6185f5079d732"; - sha256 = "0l4qbd5phqqxdz1g7xz20p2fql1x2ccsv6v7sgal8bvk6b5f8dk0"; + rev = "3e096ed4d5b702167470f771ba2a40b31949dddf"; + sha256 = "0lxfy6gilcpjjypgpmw37hy3gk27bf51vggjkkrh3270xwxkmqj0"; }; dependencies = []; @@ -1206,66 +1206,77 @@ rec { }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2016-12-24"; + name = "neoformat-2017-02-11"; src = fetchgit { url = "git://github.com/sbdchd/neoformat"; - rev = "a0460e8ef4e48d8d1ee9c377546820a6164fee16"; - sha256 = "0jlvvc1ijpkadjqix6gr17y8gnfc0rhjqzbg08biw8jpks4fh44p"; + rev = "21117552efdc3fa8bac0d6977a30ba247c20e67b"; + sha256 = "09mrfbzpqi0kk39f9k76nmwq2b5pr0pvrdak9p13774kxm76gwvm"; }; dependencies = []; }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2016-12-20"; + name = "vim-polyglot-2017-02-02"; src = fetchgit { url = "git://github.com/sheerun/vim-polyglot"; - rev = "e404a658b1647fad396a954776eda0bdabf8353c"; - sha256 = "11q4k3yj1spxzhxjcwnild4njqmafznm179scvcw8lci8sm8w3hm"; + rev = "fbeb019a8516939bd904983ddc341e65c2ea19cb"; + sha256 = "1b645k07spg95lm6x7dq222v86lxsgnsvdcgy1srh9vx11lhvyny"; + }; + dependencies = []; + + }; + + neco-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "neco-vim-2017-01-16"; + src = fetchgit { + url = "git://github.com/shougo/neco-vim"; + rev = "d28e1ea78f90d72636895dbd758de6b35aae2dfa"; + sha256 = "1qsyicxykl350zz86j7k6k9rflcf5nwrc5jbk9135zs5i8g1lqf3"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2017-01-01"; + name = "neocomplete-vim-2017-01-08"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "7904f0ff33ce667dfb203e812b783bf443c983cf"; - sha256 = "1gxvmzmlk8ga45vs8c24in92k6i9z3vxpmcpqpjjc40f4l8hqyds"; + rev = "9617d825c0d4acdb18aec903e9c1c0443058d18b"; + sha256 = "0a6mhh0ylzgjddlnwqaa5zq4abpv2dhhw7wv7w9lmwa82w31j5ya"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-11-05"; + name = "neosnippet-snippets-2017-01-24"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "4431bf176650696d5a8dd93814812afd0d06212c"; - sha256 = "0fbwzlvdbrmia97pyzgyffbqrimp2dxjn6cc45ia1kqgnhwdk4pd"; + rev = "8e2b1c0cab9ed9a832b3743dbb65e9966a64331a"; + sha256 = "151wpvbj6jb9jdkbhj3b77f5sq7y328spvwfbqyj1y32rg4ifmc6"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2017-01-02"; + name = "neosnippet-vim-2017-02-09"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "65af2b9bcad50ba1543b38a8dd30df1aee2142ce"; - sha256 = "107xb0pvqc4ivqpz5i7z8xfk26577y3jsxzvm86bizbxc2wi92m9"; + rev = "db828325268ca28c17674bd876b40be895daa27e"; + sha256 = "1l3zxxj90341slf0k6hprjgjy4slsajbc95v4l46bchcsyxsrh3i"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-12-14"; + name = "unite-vim-2017-02-10"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "be09b0e5784c4c4c13aefae4f16313696c6f51de"; - sha256 = "1nd09llf9v09acyizdmwgjkkdg1b14f8d02b5h3bgidv753dbx64"; + rev = "97e634117ff05d3c867d625940da5c7947cebf63"; + sha256 = "1qc7k5n7whw5z78czhi363fbllj9znz1gqlps096aiwhapfv3m1z"; }; dependencies = []; @@ -1311,6 +1322,17 @@ rec { }; + alchemist-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "alchemist-vim-2017-01-24"; + src = fetchgit { + url = "git://github.com/slashmili/alchemist.vim"; + rev = "c22d4883b7e2bfed78b70b557d816bf0491d7dd4"; + sha256 = "0iv91mfj3lxc41xb8sxhl9mby5dllzyvw8508igrj5lvyrd1ikkf"; + }; + dependencies = []; + + }; + vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-hardtime-2016-12-19"; src = fetchgit { @@ -1345,11 +1367,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-12-14"; + name = "vim-quickrun-2017-01-22"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "f968a467781f0f3c788768b95487d80efa6ceb28"; - sha256 = "0kd6qi7zqahrgr3y773x3q885ww41ladgl10lx0r1x2yjr5y8nv4"; + rev = "95da1f83c4a1988a3808492e2b2e169ed408d3e2"; + sha256 = "0j3jg06flspb36v5hj7pljaljncv5160zw01s3v1605d1q8b43mv"; }; dependencies = []; @@ -1422,11 +1444,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2017-01-04"; + name = "youcompleteme-2017-02-11"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "3fde57b029f760baedeaf7c0c880326e32f5c4d9"; - sha256 = "1bilzzv02ksqv6m44alp32s61scxqqj5cxx1klr70mhm81k2ksb9"; + rev = "1d1a4f4cff04ed32ab924dda20666e67eabdefb4"; + sha256 = "12xz019jrvr6wgjbp0w052awpmhwbpkwy6j7v0f0ldx242rv9sr8"; }; dependencies = []; buildInputs = [ @@ -1467,22 +1489,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-12-09"; + name = "vim-airline-themes-2016-12-31"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "2a97d9ee410d7b9980a7741fc6e705d53eea23c2"; - sha256 = "1crqpryfvamjqw8wqn6nlfqbflgwcfxqf4jk3j58rjxssl0vrfbc"; + rev = "6026eb78bf362cb3aa875aff8487f65728d0f7d8"; + sha256 = "13ijkavh1r0935cn2rjsfbdd1q3ka8bi26kw0bdkrqlrqxwvpss8"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-12-16"; + name = "vim-pandoc-2017-02-07"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "56b0940954c98c9a089948e1cbbafd2e6e7369e7"; - sha256 = "0yn4cc3i71vxickvwz4g94fc39pgg9phqdz7sc6kf6xran6p0jdy"; + rev = "32ebfb105cf86b191b72e6c9aaf8d6230d05684c"; + sha256 = "0k79bj9lb65w5nxsb226bf3r0ppqh9p9g8yigbs0qgfx8aidwnsw"; }; dependencies = []; @@ -1500,11 +1522,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-11-05"; + name = "vim-pandoc-syntax-2017-01-19"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "c76442ccbdd7889184683dc1d39c16c612c2c19f"; - sha256 = "1ad60ls4xrbf01sjprksrx2j9x2y4m6gd7hq3p9ygrcmcxw64khm"; + rev = "89341527b2bde3fbd473f5677e1df09072c319b5"; + sha256 = "106h40vbcgap4jqqwcc6k01q65ss8r99594g6144kacnk0jixg52"; }; dependencies = []; @@ -1599,22 +1621,22 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-11-01"; + name = "vim-wakatime-2017-02-08"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "5fb34105de863ca90f3f8568b85fa017a42568af"; - sha256 = "1flsdmf60fp8z0k080qfzdcpcb761zrj5qa3np2y9w24wbff9m5p"; + rev = "3d343f656521ef0521a3277b81e4cd9af8be671a"; + sha256 = "0xr6q39a20121kkscjpz1bly9j0z3lbzwj34gl3msba91mv1glb1"; }; dependencies = []; buildInputs = [ python ]; }; command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "command-t-2016-10-27"; + name = "command-t-2017-01-08"; src = fetchgit { url = "git://github.com/wincent/command-t"; - rev = "d2467c84af8a1f1a2d0366127550d0a241dd2548"; - sha256 = "1r81a0wlj9aqx0s11h6ddkdwbahxbg1l425jdyrwvxwd973nwkj6"; + rev = "ce9daf8d792c945d32d0bf8878149eaa8aee2b81"; + sha256 = "13ylc9bwf5qxsc8i62ppbcr446m35iyp243293ahn7xdrlnv2f9g"; }; dependencies = []; buildInputs = [ perl ruby ]; @@ -1638,14 +1660,14 @@ rec { }; deoplete-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-go-2016-12-22"; + name = "deoplete-go-2017-02-10"; src = fetchgit { url = "git://github.com/zchee/deoplete-go"; - rev = "3762a44995559277ea6b0bbcd3242dc5250d438e"; - sha256 = "16hdp7gq3mxddwbi4qbpqknc67yfr8xr52v198189jgnwajs3c6x"; + rev = "85a9c1847aa76e13e0e6e59e9694927281f3f15a"; + sha256 = "0i0hfkr7xnm8v8rz2788xvz65yrwhw6i2sin17hymkfwscjdds86"; }; dependencies = []; - buildInputs = [ python3 ]; + buildInputs = [ python3 ]; buildPhase = '' pushd ./rplugin/python3/deoplete/ujson python3 setup.py build --build-base=$PWD/build --build-lib=$PWD/build @@ -1655,11 +1677,11 @@ rec { }; deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2016-12-01"; + name = "deoplete-jedi-2017-01-16"; src = fetchgit { url = "git://github.com/zchee/deoplete-jedi"; - rev = "13c69a4baefdcf3be4288d82b9a75405fff06838"; - sha256 = "15w53k5mxrpj6qaybxgyvmbxizkk6r06hsmw9hff8aig4xd3dw74"; + rev = "6240de812f06263524f46379ad08a0d3d539730f"; + sha256 = "00hn00dv7klywqv14zhicsa0gd9iiv5va155ayr6mpj74p9lp2a1"; }; dependencies = []; @@ -1798,11 +1820,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2016-09-28"; + name = "table-mode-2017-01-05"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "441c30c35aec9d5c2de1d58a77a7d22aa8d93b06"; - sha256 = "04fdd2hgrcrgqqflzlvv7j9c53m8f2divi075p75g6grkxxyninv"; + rev = "30a3eba81628fdd099adc6dfdec8aa627c4783f7"; + sha256 = "0pw3mvrx3iyyj5xz05gixhvnrqxpl274cv04449mxm50q32zvmhr"; }; dependencies = []; @@ -1840,17 +1862,6 @@ rec { }; - tsuquyomi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tsuquyomi-2017-01-02"; - src = fetchgit { - url = "git://github.com/Quramy/tsuquyomi"; - rev = "473aa2703950816748329acca56c069df7339c96"; - sha256 = "0h5gbhs4gsvyjsin2wvdlbrr6ykpcmipmpwpf39595j1dlqnab59"; - }; - dependencies = []; - - }; - undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "undotree-2016-07-19"; src = fetchgit { @@ -2028,11 +2039,11 @@ rec { }; vim-addon-sql = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-addon-sql-2014-01-18"; + name = "vim-addon-sql-2017-02-11"; src = fetchgit { url = "git://github.com/MarcWeber/vim-addon-sql"; - rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; - sha256 = "15l2201jkfml08znvkkpy7fm3wn87n91zgd9ysrf5h73amjx9y2w"; + rev = "048a139af36829fce670c8ff80d3aad927557ee6"; + sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; }; dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; @@ -2072,11 +2083,11 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-12-29"; + name = "vim-airline-2017-02-11"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "a2431f2adb23a003abdfe5294861bbd69de52e52"; - sha256 = "1qd5f133rg3pqdm889zg0hxhrmgzd71maz6jif4a4hjbghi61wjs"; + rev = "b66c1ef07005fad6a70957b90d4f47bb932e33e2"; + sha256 = "0y8adl6dl7c501na2k2j38cs200ykm6pjva19xshiv0h2f916l2b"; }; dependencies = []; @@ -2094,26 +2105,16 @@ rec { }; vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easy-align-2016-03-06"; + name = "vim-easy-align-2017-02-08"; src = fetchgit { url = "git://github.com/junegunn/vim-easy-align"; - rev = "0cb6b98fc155717b0a56c110551ac57d1d951ddb"; - sha256 = "10j1fz7si7xqqs4p7h66jd0xzr116cv3xjyac9p20fc0yyyg1wbh"; + rev = "3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9"; + sha256 = "0nqvzxr2i9jsyx1qhspf636q0j4b0d8y98yqhxklcpq18ap442zp"; }; dependencies = []; }; - vim-elixir = buildVimPluginFrom2Nix { - name = "vim-elixir-2017-02-01"; - src = fetchgit { - url = "https://github.com/elixir-lang/vim-elixir"; - rev = "9cbb3ee3865c594ed017f8118a80b355cd7e238f"; - sha256 = "14mlnjpmgfal4vai2k8jjmhszwgyhnf3v75rssj05n47qnzlddk4"; - }; - dependencies = []; - }; - vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-gista-2016-09-21"; src = fetchgit { @@ -2126,11 +2127,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-12-23"; + name = "vim-gitgutter-2017-02-06"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "7b81a8a22607f073b76b106e2d5e63cc936b0d25"; - sha256 = "19v2akrhhfb9zy7mvljjwvi7lqrnviw88gxh4xmpy82vghiwdrfs"; + rev = "5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143"; + sha256 = "19iz6k1wb8jy51lpr8pwp3fy80ww4sw6n6mp56lw59n8227gffc1"; }; dependencies = []; @@ -2158,17 +2159,6 @@ rec { }; - vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-misc-2015-05-21"; - src = fetchgit { - url = "git://github.com/xolox/vim-misc"; - rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; - sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; - }; - dependencies = []; - - }; - vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-multiple-cursors-2016-06-03"; src = fetchgit { @@ -2192,22 +2182,22 @@ rec { }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-12-31"; + name = "vim-signify-2017-02-10"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "32d8797d887b0980514cdf7f11c9c1379d597e57"; - sha256 = "1jhb6pljqbz8mlcc4zfjqzhyyp4yz5b6h7s0224m7vm4xvsphq8y"; + rev = "a2c28f654087735a276ec7c1f558b782db5488a5"; + sha256 = "0zhm26d5s68gcj1lmw866m0gcfss46mr4z79zggiara83x5abbxp"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-12-27"; + name = "vim-snippets-2017-02-07"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "e24d33f96a95332dde0edaa7e7e3e7a64244de56"; - sha256 = "1clba2x05klqab5ifkg19cxm22ibx6ycdfdn71clglk96wli1h0f"; + rev = "b8c340daf084f243a487f8853a0984504909dfda"; + sha256 = "1173hck15aijhvh00rjdsyiv21ax6hp9h7w2yph514zi9mhzgg8q"; }; dependencies = []; @@ -2236,11 +2226,11 @@ rec { }; vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimwiki-2016-12-18"; + name = "vimwiki-2017-01-30"; src = fetchgit { url = "git://github.com/vimwiki/vimwiki"; - rev = "3a8743700581923c6fd2684510dad48a8b2b8c64"; - sha256 = "19b27h0zsmi1xphzf1qhmry11gca4j1mh0mli12yvkr9v61rnj6b"; + rev = "be79f68a9292cbe53d330cb37fd18d835e8f74d4"; + sha256 = "0n43vaxh90v5wbgqld61bwlhzr11s0c72dgrp0cirj7ri7xajq8z"; }; dependencies = []; From 4c0aae964c9e8d3f3e9361583a88c9c4561f6895 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 13 Feb 2017 01:32:37 +0000 Subject: [PATCH 092/138] ssm-agent: init at 2.0.633.0 --- .../networking/cluster/ssm-agent/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/networking/cluster/ssm-agent/default.nix diff --git a/pkgs/applications/networking/cluster/ssm-agent/default.nix b/pkgs/applications/networking/cluster/ssm-agent/default.nix new file mode 100644 index 00000000000..bb179606b36 --- /dev/null +++ b/pkgs/applications/networking/cluster/ssm-agent/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, buildGoPackage }: + +buildGoPackage rec { + name = "${pname}-${version}"; + pname = "amazon-ssm-agent"; + version = "2.0.633.0"; + + goPackagePath = "github.com/aws/${pname}"; + subPackages = [ "agent" ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "aws"; + repo = pname; + sha256 = "10arshfn2k3m3zzgw8b3xc6ywd0ss73746nq5srh2jir7mjzi4xv"; + }; + + preBuild = '' + mv go/src/${goPackagePath}/vendor strange-vendor + mv strange-vendor/src go/src/${goPackagePath}/vendor + ''; + + meta = with stdenv.lib; { + description = "Agent to enable remote management of your Amazon EC2 instance configuration"; + homepage = "https://github.com/aws/amazon-ssm-agent"; + license = licenses.asl20; + platforms = platforms.linux; + maintainers = with maintainers; [ copumpkin ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67dcb8bedbe..1ad48f262d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5960,6 +5960,8 @@ with pkgs; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix { }; spidermonkey = spidermonkey_31; + ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; + supercollider = callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; From 4450327c062a41f7df2f6756057df4ebb6548011 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Sun, 12 Feb 2017 20:52:37 -0500 Subject: [PATCH 093/138] flow: pin ocaml to ocaml_4_02 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index a63e9f65e5c..c1cb4412b9c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lib, ocaml_4_02, libelf, cf-private, CoreServices }: +{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices }: with lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp bin/flow $out/bin/ ''; - buildInputs = [ ocaml_4_02 libelf ] + buildInputs = [ ocaml libelf ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ]; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ad48f262d2..855de099cba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6363,6 +6363,7 @@ with pkgs; flow = callPackage ../development/tools/analysis/flow { inherit (darwin.apple_sdk.frameworks) CoreServices; inherit (darwin) cf-private; + ocaml = ocaml_4_02; }; framac = callPackage ../development/tools/analysis/frama-c { }; @@ -15600,7 +15601,7 @@ with pkgs; wmii_hg = callPackage ../applications/window-managers/wmii-hg { }; wordnet = callPackage ../applications/misc/wordnet { }; - + worker = callPackage ../applications/misc/worker { }; workrave = callPackage ../applications/misc/workrave { From e928cb1c631fedde3837dabc518931ea12522163 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 13 Feb 2017 04:01:28 +0000 Subject: [PATCH 094/138] ssm-agent NixOS module: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/ssm-agent.nix | 45 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 nixos/modules/services/misc/ssm-agent.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 9bf6a400b09..cf791a67f53 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -294,6 +294,7 @@ ./services/misc/siproxd.nix ./services/misc/sonarr.nix ./services/misc/spice-vdagentd.nix + ./services/misc/ssm-agent.nix ./services/misc/sssd.nix ./services/misc/subsonic.nix ./services/misc/sundtek.nix diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix new file mode 100644 index 00000000000..b04959a9686 --- /dev/null +++ b/nixos/modules/services/misc/ssm-agent.nix @@ -0,0 +1,45 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.ssm-agent; + + # The SSM agent doesn't pay attention to our /etc/os-release yet, and the lsb-release tool + # in nixpkgs doesn't seem to work properly on NixOS, so let's just fake the two fields SSM + # looks for. See https://github.com/aws/amazon-ssm-agent/issues/38 for upstream fix. + fake-lsb-release = pkgs.writeScriptBin "lsb_release" '' + #!${pkgs.stdenv.shell} + + case "$1" in + -i) echo "nixos";; + -r) echo "${config.system.nixosVersion}";; + esac + ''; +in { + options.services.ssm-agent = { + enable = mkEnableOption "AWS SSM agent"; + + package = mkOption { + type = types.path; + description = "The SSM agent package to use"; + default = pkgs.ssm-agent; + }; + }; + + config = mkIf cfg.enable { + systemd.services.ssm-agent = { + inherit (cfg.package.meta) description; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + path = [ fake-lsb-release ]; + serviceConfig = { + ExecStart = "${cfg.package.bin}/bin/agent"; + KillMode = "process"; + Restart = "on-failure"; + RestartSec = "15min"; + }; + }; + }; +} + From e63d15f1732b2a27c362d376337ecb231f638649 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Mon, 13 Feb 2017 04:06:22 +0000 Subject: [PATCH 095/138] ecs-agent NixOS module: enable docker --- nixos/modules/virtualisation/ecs-agent.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix index ed17fbf4931..18e45e0b845 100644 --- a/nixos/modules/virtualisation/ecs-agent.nix +++ b/nixos/modules/virtualisation/ecs-agent.nix @@ -22,6 +22,10 @@ in { }; config = lib.mkIf cfg.enable { + # This service doesn't run if docker isn't running, and unlike potentially remote services like e.g., postgresql, docker has + # to be running locally so `docker.enable` will always be set if the ECS agent is enabled. + virtualisation.docker.enable = true; + systemd.services.ecs-agent = { inherit (cfg.package.meta) description; after = [ "network.target" ]; From 8616c0d39194291da44af0cb503b5120eb0485a6 Mon Sep 17 00:00:00 2001 From: Tim Digel Date: Thu, 26 Jan 2017 08:30:50 +0100 Subject: [PATCH 096/138] tsearch-extras: init at 0.2 --- .../sql/postgresql/tsearch_extras/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/sql/postgresql/tsearch_extras/default.nix diff --git a/pkgs/servers/sql/postgresql/tsearch_extras/default.nix b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix new file mode 100644 index 00000000000..d434fa98e09 --- /dev/null +++ b/pkgs/servers/sql/postgresql/tsearch_extras/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, postgresql }: + +stdenv.mkDerivation rec { + name = "tsearch-extras-${version}"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "zulip"; + repo = "tsearch_extras"; + rev = version; + sha256 = "1ivg9zn7f1ks31ixxwywifwhzxn6py8s5ky1djyxnb0s60zckfjg"; + }; + + nativebuildInputs = [ pkgconfig ]; + buildInputs = [ postgresql ]; + + installPhase = '' + mkdir -p $out/bin + install -D tsearch_extras.so -t $out/lib/ + install -D ./{tsearch_extras--1.0.sql,tsearch_extras.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Provides a few PostgreSQL functions for a lower-level data full text search"; + homepage = https://github.com/zulip/tsearch_extras/; + license = licenses.postgresql; + maintainers = with maintainers; [ DerTim1 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 496d6e9e236..e798e1db26a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15310,6 +15310,8 @@ with pkgs; # We need QtWebkit which was deprecated in Qt 5.6 although it can still be build trojita = with qt55; callPackage ../applications/networking/mailreaders/trojita { }; + tsearch_extras = callPackage ../servers/sql/postgresql/tsearch_extras { }; + tudu = callPackage ../applications/office/tudu { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; From eff0752dbc36f52fce9c27ff10b8db41a5f632f4 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 13 Feb 2017 08:54:10 +0000 Subject: [PATCH 097/138] Use default qemu for azure image generation, and use option to enforce sizing of image to be compliant with Azure/HyperV. (cherry picked from commit e16db5666af987f8a76be82ff219e138e92af442) --- nixos/modules/virtualisation/azure-image.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 9fac543b03d..91fae88fc98 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -16,14 +16,14 @@ in cyl=$(((${diskSize}*1024*1024)/(512*63*255))) size=$(($cyl*255*63*512)) roundedsize=$((($size/(1024*1024)+1)*(1024*1024))) - ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize + ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize mv closure xchg/ ''; postVM = '' mkdir -p $out - ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd + ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd rm $diskImage ''; diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; From af3732b6c6adb11f45cc9d72c3ddf33fd51c47e0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Mon, 13 Feb 2017 09:54:18 +0000 Subject: [PATCH 098/138] Azure: switch back to qemu 2.2.0 for generating image. Seems to work best. (cherry picked from commit 2da8a5dac8674501ba9ed10e44650088b466688a) --- nixos/modules/virtualisation/azure-image.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 91fae88fc98..33f84986cac 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -16,14 +16,14 @@ in cyl=$(((${diskSize}*1024*1024)/(512*63*255))) size=$(($cyl*255*63*512)) roundedsize=$((($size/(1024*1024)+1)*(1024*1024))) - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize + ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize mv closure xchg/ ''; postVM = '' mkdir -p $out - ${pkgs.qemu}/bin/qemu-img convert -f raw -o force_size -O vpc $diskImage $out/disk.vhd + ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -o subformat=fixed -O vpc $diskImage $out/disk.vhd rm $diskImage ''; diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw"; From 4af79a73316981a7ba96cfa9501ab210f589a2a8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Feb 2017 12:16:39 +0100 Subject: [PATCH 099/138] Revert "linux: Apply 9p veryloose patch to 4.9" This reverts commit a82810c7a7e62848b75739b1cccddca8f1363c75. Fixes #22695. --- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index ea93815e786..1f528f9412b 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -175,12 +175,12 @@ rec { }; }; - p9_caching_4_9 = rec + p9_caching_4_4 = rec { name = "9p-caching.patch"; patch = fetchpatch { inherit name; - url = https://github.com/edolstra/linux/commit/7e20254412c780a2102761fee92cb1d32ceeaefd.patch; - sha256 = "001kf1sdy6pirn8sqnfgbfahvwwkc7n7vr5i8fy2n74xph1kks5a"; + url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; + sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 855de099cba..0bd5f1e490d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11282,6 +11282,7 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" + kernelPatches.p9_caching_4_4 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11298,7 +11299,6 @@ with pkgs; # !!! 4.7 patch doesn't apply, 4.9 patch not up yet, will keep checking # kernelPatches.cpu-cgroup-v2."4.7" kernelPatches.modinst_arg_list_too_long - kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11311,7 +11311,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.modinst_arg_list_too_long - kernelPatches.p9_caching_4_9 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill From a4ec1841da14fc98c5c35cc72242c23bb698d4ac Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Feb 2017 12:18:10 +0100 Subject: [PATCH 100/138] VM tests: veryloose -> cache=loose --- nixos/modules/virtualisation/qemu-vm.nix | 4 ++-- pkgs/build-support/vm/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index e0b3bb2c683..56a05028b1d 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -440,7 +440,7 @@ in ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} = { device = "store"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; + options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; neededForBoot = true; }; "/tmp" = mkIf config.boot.tmpOnTmpfs @@ -453,7 +453,7 @@ in "/tmp/xchg" = { device = "xchg"; fsType = "9p"; - options = [ "trans=virtio" "version=9p2000.L" "veryloose" ]; + options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ]; neededForBoot = true; }; "/tmp/shared" = diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 36cb068d93d..461bdd08fb5 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -130,7 +130,7 @@ rec { echo "mounting Nix store..." mkdir -p /fs${storeDir} - mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,veryloose + mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp @@ -139,7 +139,7 @@ rec { echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg - mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,veryloose + mount -t 9p xchg /fs/tmp/xchg -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/proc mount -t proc none /fs/proc From 5d3bb96f622e62062945aa8e70a827449c21f686 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 10:41:07 +0100 Subject: [PATCH 101/138] LTS Haskell 8.0 This includes an update to hackage-packages.nix, which was generated by hackage2nix v2.0.4-11-gd82133a from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/53fcf983669a3f0cdfd795fec28ecb40740a64ca. --- .../configuration-hackage2nix.yaml | 1307 ++- .../haskell-modules/hackage-packages.nix | 9646 +++-------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 2108 insertions(+), 8847 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 634648b9175..0a05cc6ca81 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -1,34 +1,34 @@ # pkgs/development/haskell-modules/configuration-hackage2nix.yaml -compiler: ghc-8.0.1 +compiler: ghc-8.0.2 core-packages: - array-0.5.1.1 - - base-4.9.0.0 + - base-4.9.1.0 - binary-0.8.3.0 - bytestring-0.10.8.1 - - Cabal-1.24.0.0 + - Cabal-1.24.2.0 - containers-0.5.7.1 - deepseq-1.4.2.0 - - directory-1.2.6.2 - - filepath-1.4.1.0 - - ghc-8.0.1 - - ghc-boot-8.0.1 - - ghc-boot-th-8.0.1 + - directory-1.3.0.0 + - filepath-1.4.1.1 + - ghc-8.0.2 + - ghc-boot-8.0.2 + - ghc-boot-th-8.0.2 + - ghci-8.0.2 - ghc-prim-0.5.0.0 - - ghci-8.0.1 - - haskeline-0.7.2.3 + - haskeline-0.7.3.0 - hoopl-3.10.2.1 - hpc-0.6.0.3 - integer-gmp-1.0.0.1 - pretty-1.1.3.3 - - process-1.4.2.0 + - process-1.4.3.0 - rts-1.0 - - template-haskell-2.11.0.0 + - template-haskell-2.11.1.0 - terminfo-0.4.0.2 - time-1.6.0.1 - transformers-0.5.2.0 - - unix-2.7.2.0 + - unix-2.7.2.1 - xhtml-3000.2.1 # Hack: The following package is a core package of GHCJS. If we don't declare @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 7.19 + # LTS Haskell 8.0 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Vector ==2.3.2 @@ -46,106 +46,124 @@ default-package-overrides: - ace ==0.6 - acid-state ==0.14.2 - action-permutations ==0.0.0.1 - - active ==0.2.0.10 + - active ==0.2.0.12 - ad ==4.3.2.1 - adjunctions ==4.3 - adler32 ==0.1.1.0 - - aeson ==0.11.3.0 + - aeson ==1.0.2.1 - aeson-better-errors ==0.9.1.0 - aeson-casing ==0.1.0.5 - aeson-compat ==0.3.6 + - aeson-extra ==0.4.0.0 - aeson-generic-compat ==0.0.1.0 - aeson-injector ==1.0.7.0 - aeson-pretty ==0.8.2 - aeson-qq ==0.8.1 - aeson-utils ==0.3.0.2 - - Agda ==2.5.1.1 + - Agda ==2.5.2 - airship ==0.6.0 - alarmclock ==0.4.0.2 - - alex ==3.1.7 - - amazonka ==1.4.3 - - amazonka-apigateway ==1.4.3 - - amazonka-application-autoscaling ==1.4.3 - - amazonka-autoscaling ==1.4.3 - - amazonka-certificatemanager ==1.4.3 - - amazonka-cloudformation ==1.4.3 - - amazonka-cloudfront ==1.4.3 - - amazonka-cloudhsm ==1.4.3 - - amazonka-cloudsearch ==1.4.3 - - amazonka-cloudsearch-domains ==1.4.3 - - amazonka-cloudtrail ==1.4.3 - - amazonka-cloudwatch ==1.4.3 - - amazonka-cloudwatch-events ==1.4.3 - - amazonka-cloudwatch-logs ==1.4.3 - - amazonka-codecommit ==1.4.3 - - amazonka-codedeploy ==1.4.3 - - amazonka-codepipeline ==1.4.3 - - amazonka-cognito-identity ==1.4.3 - - amazonka-cognito-idp ==1.4.3 - - amazonka-cognito-sync ==1.4.3 - - amazonka-config ==1.4.3 - - amazonka-core ==1.4.3 - - amazonka-datapipeline ==1.4.3 - - amazonka-devicefarm ==1.4.3 - - amazonka-directconnect ==1.4.3 - - amazonka-discovery ==1.4.3 - - amazonka-dms ==1.4.3 - - amazonka-ds ==1.4.3 - - amazonka-dynamodb ==1.4.3 - - amazonka-dynamodb-streams ==1.4.3 - - amazonka-ec2 ==1.4.3 - - amazonka-ecr ==1.4.3 - - amazonka-ecs ==1.4.3 - - amazonka-efs ==1.4.3 - - amazonka-elasticache ==1.4.3 - - amazonka-elasticbeanstalk ==1.4.3 - - amazonka-elasticsearch ==1.4.3 - - amazonka-elastictranscoder ==1.4.3 - - amazonka-elb ==1.4.3 - - amazonka-emr ==1.4.3 - - amazonka-gamelift ==1.4.3 - - amazonka-glacier ==1.4.3 - - amazonka-iam ==1.4.3 - - amazonka-importexport ==1.4.3 - - amazonka-inspector ==1.4.3 - - amazonka-iot ==1.4.3 - - amazonka-iot-dataplane ==1.4.3 - - amazonka-kinesis ==1.4.3 - - amazonka-kinesis-firehose ==1.4.3 - - amazonka-kms ==1.4.3 - - amazonka-lambda ==1.4.3 - - amazonka-marketplace-analytics ==1.4.3 - - amazonka-marketplace-metering ==1.4.3 - - amazonka-ml ==1.4.3 - - amazonka-opsworks ==1.4.3 - - amazonka-rds ==1.4.3 - - amazonka-redshift ==1.4.3 - - amazonka-route53 ==1.4.3 - - amazonka-route53-domains ==1.4.3 - - amazonka-s3 ==1.4.3 - - amazonka-sdb ==1.4.3 - - amazonka-ses ==1.4.3 - - amazonka-sns ==1.4.3 - - amazonka-sqs ==1.4.3 - - amazonka-ssm ==1.4.3 - - amazonka-storagegateway ==1.4.3 - - amazonka-sts ==1.4.3 - - amazonka-support ==1.4.3 - - amazonka-swf ==1.4.3 - - amazonka-test ==1.4.3 - - amazonka-waf ==1.4.3 - - amazonka-workspaces ==1.4.3 + - alex ==3.2.1 + - alternators ==0.1.1.0 + - ALUT ==2.4.0.2 + - amazonka ==1.4.5 + - amazonka-apigateway ==1.4.5 + - amazonka-application-autoscaling ==1.4.5 + - amazonka-appstream ==1.4.5 + - amazonka-autoscaling ==1.4.5 + - amazonka-budgets ==1.4.5 + - amazonka-certificatemanager ==1.4.5 + - amazonka-cloudformation ==1.4.5 + - amazonka-cloudfront ==1.4.5 + - amazonka-cloudhsm ==1.4.5 + - amazonka-cloudsearch ==1.4.5 + - amazonka-cloudsearch-domains ==1.4.5 + - amazonka-cloudtrail ==1.4.5 + - amazonka-cloudwatch ==1.4.5 + - amazonka-cloudwatch-events ==1.4.5 + - amazonka-cloudwatch-logs ==1.4.5 + - amazonka-codebuild ==1.4.5 + - amazonka-codecommit ==1.4.5 + - amazonka-codedeploy ==1.4.5 + - amazonka-codepipeline ==1.4.5 + - amazonka-cognito-identity ==1.4.5 + - amazonka-cognito-idp ==1.4.5 + - amazonka-cognito-sync ==1.4.5 + - amazonka-config ==1.4.5 + - amazonka-core ==1.4.5 + - amazonka-datapipeline ==1.4.5 + - amazonka-devicefarm ==1.4.5 + - amazonka-directconnect ==1.4.5 + - amazonka-discovery ==1.4.5 + - amazonka-dms ==1.4.5 + - amazonka-ds ==1.4.5 + - amazonka-dynamodb ==1.4.5 + - amazonka-dynamodb-streams ==1.4.5 + - amazonka-ec2 ==1.4.5 + - amazonka-ecr ==1.4.5 + - amazonka-ecs ==1.4.5 + - amazonka-efs ==1.4.5 + - amazonka-elasticache ==1.4.5 + - amazonka-elasticbeanstalk ==1.4.5 + - amazonka-elasticsearch ==1.4.5 + - amazonka-elastictranscoder ==1.4.5 + - amazonka-elb ==1.4.5 + - amazonka-elbv2 ==1.4.5 + - amazonka-emr ==1.4.5 + - amazonka-gamelift ==1.4.5 + - amazonka-glacier ==1.4.5 + - amazonka-health ==1.4.5 + - amazonka-iam ==1.4.5 + - amazonka-importexport ==1.4.5 + - amazonka-inspector ==1.4.5 + - amazonka-iot ==1.4.5 + - amazonka-iot-dataplane ==1.4.5 + - amazonka-kinesis ==1.4.5 + - amazonka-kinesis-analytics ==1.4.5 + - amazonka-kinesis-firehose ==1.4.5 + - amazonka-kms ==1.4.5 + - amazonka-lambda ==1.4.5 + - amazonka-lightsail ==1.4.5 + - amazonka-marketplace-analytics ==1.4.5 + - amazonka-marketplace-metering ==1.4.5 + - amazonka-ml ==1.4.5 + - amazonka-opsworks ==1.4.5 + - amazonka-opsworks-cm ==1.4.5 + - amazonka-pinpoint ==1.4.5 + - amazonka-polly ==1.4.5 + - amazonka-rds ==1.4.5 + - amazonka-redshift ==1.4.5 + - amazonka-rekognition ==1.4.5 + - amazonka-route53 ==1.4.5 + - amazonka-route53-domains ==1.4.5 + - amazonka-s3 ==1.4.5 + - amazonka-s3-streaming ==0.1.0.4 + - amazonka-sdb ==1.4.5 + - amazonka-servicecatalog ==1.4.5 + - amazonka-ses ==1.4.5 + - amazonka-shield ==1.4.5 + - amazonka-sms ==1.4.5 + - amazonka-snowball ==1.4.5 + - amazonka-sns ==1.4.5 + - amazonka-sqs ==1.4.5 + - amazonka-ssm ==1.4.5 + - amazonka-stepfunctions ==1.4.5 + - amazonka-storagegateway ==1.4.5 + - amazonka-sts ==1.4.5 + - amazonka-support ==1.4.5 + - amazonka-swf ==1.4.5 + - amazonka-test ==1.4.5 + - amazonka-waf ==1.4.5 + - amazonka-workspaces ==1.4.5 + - amazonka-xray ==1.4.5 - amqp ==0.14.1 - - angel ==0.6.2 - annotated-wl-pprint ==0.7.0 - - anonymous-sums ==0.4.0.0 + - anonymous-sums ==0.6.0.0 - ansi-terminal ==0.6.2.3 - ansi-wl-pprint ==0.6.7.3 - - ansigraph ==0.2.0.0 - - api-field-json-th ==0.1.0.1 + - ansigraph ==0.3.0.2 - app-settings ==0.2.0.10 - appar ==0.1.4 - - apply-refact ==0.3.0.0 - arbtt ==0.9.0.12 - arithmoi ==0.4.3.0 - array-memoize ==0.6.0 @@ -157,24 +175,29 @@ default-package-overrides: - asn1-types ==0.3.2 - async ==2.1.1 - async-dejafu ==0.1.3.0 - - atndapi ==0.1.1.0 - - atom-conduit ==0.3.1.2 + - async-extra ==0.1.0.0 + - atom-basic ==0.2.4 + - atom-conduit ==0.4.0.1 - atomic-primops ==0.8.0.4 - atomic-write ==0.2.0.5 - attoparsec ==0.13.1.0 - attoparsec-binary ==0.2 - attoparsec-expr ==0.1.1.2 - authenticate ==1.3.3.2 - - authenticate-oauth ==1.5.1.2 + - authenticate-oauth ==1.6 - auto ==0.4.3.1 - auto-update ==0.1.4 - - autoexporter ==0.2.3 - - aws ==0.14.1 + - autoexporter ==1.0.0 + - avers ==0.0.17.1 + - avers-api ==0.0.18.0 + - avers-api-docs ==0.0.18.0 + - avers-server ==0.0.18.0 + - avwx ==0.3.0.2 - b9 ==0.5.31 - - bake ==0.4 + - bake ==0.5 - bank-holidays-england ==0.1.0.5 - base-compat ==0.9.1 - - base-noprelude ==4.9.0.0 + - base-noprelude ==4.9.1.0 - base-orphans ==0.5.4 - base-prelude ==1.0.1.1 - base-unicode-symbols ==0.2.2.4 @@ -193,9 +216,11 @@ default-package-overrides: - bimap-server ==0.1.0.1 - binary-bits ==0.5 - binary-conduit ==1.2.4.1 + - binary-ieee754 ==0.1.0.0 - binary-list ==1.1.1.2 - binary-orphans ==0.1.6.0 - binary-parser ==0.5.2 + - binary-parsers ==0.2.3.0 - binary-search ==1.0.0.3 - binary-tagged ==0.1.4.2 - binary-typed ==1.0 @@ -208,15 +233,13 @@ default-package-overrides: - biofasta ==0.0.3 - biofastq ==0.1 - biopsl ==0.4 - - bitcoin-api ==0.12.1 - - bitcoin-api-extra ==0.9.1 + - bitarray ==0.0.1.1 - bitcoin-block ==0.13.1 - - bitcoin-payment-channel ==0.3.0.1 - bitcoin-script ==0.11.1 - bitcoin-tx ==0.13.1 - bitcoin-types ==0.9.2 - bits ==0.5 - - bitx-bitcoin ==0.10.0.0 + - bitx-bitcoin ==0.11.0.0 - blake2 ==0.2.0 - blank-canvas ==0.6 - BlastHTTP ==1.2.1 @@ -227,23 +250,29 @@ default-package-overrides: - blaze-markup ==0.7.1.1 - blaze-svg ==0.3.6 - blaze-textual ==0.2.1.0 - - bloodhound ==0.11.0.0 - - blosum ==0.1.1.2 + - BlogLiterately ==0.8.4.3 + - BlogLiterately-diagrams ==0.2.0.5 + - bloodhound ==0.12.1.0 + - blosum ==0.1.1.4 - bmp ==1.2.6.3 + - bool-extras ==0.4.0 - Boolean ==0.2.3 + - boolean-like ==0.1.1.0 - boolsimplifier ==0.1.8 - boomerang ==1.4.5.2 - both ==0.1.1.0 - BoundedChan ==1.0.3.0 - boundingboxes ==0.2.3 - - bower-json ==0.8.1 + - bower-json ==1.0.0.1 - boxes ==0.1.4 + - brick ==0.17 - broadcast-chan ==0.1.1 - bson ==0.3.2.3 - bson-lens ==0.1.1 - - btrfs ==0.1.2.0 + - btrfs ==0.1.2.3 + - buffer-builder ==0.2.4.4 - bumper ==0.6.0.3 - - bustle ==0.5.4 + - bv ==0.4.1 - byteable ==0.1.1 - bytedump ==1.0 - byteorder ==1.0.4 @@ -260,28 +289,26 @@ default-package-overrides: - bzlib-conduit ==0.2.1.4 - c2hs ==0.28.1 - Cabal ==1.24.2.0 - - cabal-dependency-licenses ==0.1.2.0 + - cabal-dependency-licenses ==0.2.0.0 - cabal-doctest ==1 - cabal-file-th ==0.2.4 - cabal-helper ==0.7.3.0 - - cabal-rpm ==0.10.1 - - cabal-sort ==0.0.5.3 - - cabal-src ==0.3.0.2 + - cabal-rpm ==0.11 - cache ==0.1.0.0 - - cacophony ==0.8.0 + - cacophony ==0.9.1 - cairo ==0.13.3.1 - call-stack ==0.1.0 - - camfort ==0.900 + - camfort ==0.901 - carray ==0.1.6.5 - cartel ==0.18.0.2 - case-insensitive ==1.2.0.7 - cased ==0.1.0.0 - - cases ==0.1.3.1 + - cases ==0.1.3.2 - cassava ==0.4.5.1 - - cassava-conduit ==0.3.2 + - cassava-conduit ==0.3.5.1 - cassava-megaparsec ==0.1.0 - cassette ==0.1.0 - - cayley-client ==0.2.1.1 + - cayley-client ==0.4.0 - cereal ==0.5.4.0 - cereal-conduit ==0.7.3 - cereal-text ==0.1.0.2 @@ -293,6 +320,7 @@ default-package-overrides: - Chart ==1.8.1 - Chart-cairo ==1.8.1 - Chart-diagrams ==1.8.1 + - chart-unit ==0.1.0.0 - ChasingBottoms ==1.3.1.2 - cheapskate ==0.1.0.5 - cheapskate-highlight ==0.1.0.0 @@ -300,7 +328,7 @@ default-package-overrides: - check-email ==1.0 - checkers ==0.4.6 - chell ==0.4.0.1 - - chell-quickcheck ==0.2.5 + - choice ==0.2.0 - chunked-data ==0.3.0 - cipher-aes ==0.2.11 - cipher-aes128 ==0.7.0.3 @@ -309,27 +337,30 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.5 - - clash-lib ==0.6.21 - - clash-prelude ==0.10.14 - - clash-systemverilog ==0.6.10 - - clash-verilog ==0.6.10 - - clash-vhdl ==0.6.16 - - classy-prelude ==1.0.2 - - classy-prelude-conduit ==1.0.2 - - classy-prelude-yesod ==1.0.2 - - clay ==0.11 - - clckwrks ==0.23.19.2 + - clang-pure ==0.2.0.2 + - clash-ghc ==0.7.0.1 + - clash-lib ==0.7 + - clash-prelude ==0.11 + - clash-systemverilog ==0.7 + - clash-verilog ==0.7 + - clash-vhdl ==0.7 + - classy-prelude ==1.2.0 + - classy-prelude-conduit ==1.2.0 + - classy-prelude-yesod ==1.2.0 + - clay ==0.12.1 + - clckwrks ==0.24.0.3 - clckwrks-cli ==0.2.17.1 - - clckwrks-plugin-media ==0.6.16.2 - - clckwrks-plugin-page ==0.4.3.5 + - clckwrks-plugin-media ==0.6.16.3 + - clckwrks-plugin-page ==0.4.3.9 - clckwrks-theme-bootstrap ==0.4.2.1 - cli ==0.1.2 - clientsession ==0.9.1.2 - Clipboard ==2.3.1.0 - clock ==0.7.2 + - clock-extras ==0.1.0.2 - clumpiness ==0.17.0.0 - - ClustalParser ==1.1.4 - - clustering ==0.2.1 + - ClustalParser ==1.2.1 + - clustering ==0.3.1 - cmark ==0.5.5 - cmark-highlight ==0.2.0.0 - cmark-lucid ==0.1.0.0 @@ -337,22 +368,21 @@ default-package-overrides: - code-builder ==0.1.3 - code-page ==0.1.1 - codo-notation ==0.5.2 + - colorful-monoids ==0.2.1.0 - colour ==2.3.3 - commutative ==0.0.1.4 - comonad ==5 - comonad-transformers ==4.0 - comonads-fd ==4.0 - compactmap ==0.1.4.2 - - compdata ==0.10.1 - composition ==1.0.2.1 - composition-extra ==2.0.0 - - concatenative ==1.0.1 - concurrency ==1.0.0.0 - - concurrent-extra ==0.7.0.10 - concurrent-output ==1.7.8 - concurrent-supply ==0.1.8 - - conduit ==1.2.8 - - conduit-combinators ==1.0.8.3 + - conduit ==1.2.9 + - conduit-combinators ==1.1.0 + - conduit-connection ==0.1.0.3 - conduit-extra ==1.1.15 - conduit-iconv ==0.1.1.1 - conduit-parse ==0.1.2.0 @@ -361,31 +391,35 @@ default-package-overrides: - configurator ==0.3.0.0 - configurator-export ==0.1.0.1 - connection ==0.2.7 - - constraints ==0.8 - - consul-haskell ==0.3 + - console-style ==0.0.2.1 + - constraints ==0.9 + - consul-haskell ==0.4.2 - containers-unicode-symbols ==0.3.1.1 - - continued-fractions ==0.9.1.1 - contravariant ==1.4 - contravariant-extras ==0.3.3.1 - control-bool ==0.2.1 - control-monad-free ==0.6.1 - control-monad-loop ==0.1 - control-monad-omega ==0.3.1 - - converge ==0.1.0.1 + - convert-annotation ==0.5.0.1 - convertible ==1.1.1.0 - cookie ==0.4.2.1 - countable ==1.0 - courier ==0.1.1.4 - - cpphs ==1.20.2 + - cpphs ==1.20.3 - cprng-aes ==0.6.1 - cpu ==0.1.2 - - crackNum ==1.5 - - criterion ==1.1.1.0 - - cron ==0.4.2 + - cpuinfo ==0.1.0.1 + - cql ==3.1.1 + - cql-io ==0.16.0 + - crackNum ==1.9 + - criterion ==1.1.4.0 + - cron ==0.5.0 - crypto-api ==0.13.2 - crypto-api-tests ==0.3 - crypto-cipher-tests ==0.0.11 - crypto-cipher-types ==0.0.9 + - crypto-enigma ==0.0.2.8 - crypto-numbers ==0.2.7 - crypto-pubkey ==0.2.8 - crypto-pubkey-types ==0.4.3 @@ -400,12 +434,16 @@ default-package-overrides: - cryptohash-sha256 ==0.11.100.1 - cryptol ==2.4.0 - cryptonite ==0.21 - - cryptonite-conduit ==0.1 + - cryptonite-conduit ==0.2.0 + - cryptonite-openssl ==0.5 - css-syntax ==0.0.5 - css-text ==0.1.2.2 - csv ==0.1.2 + - csv-conduit ==0.6.7 - ctrie ==0.1.1.0 + - cubicbezier ==0.5.0.0 - cubicspline ==0.1.2 + - cue-sheet ==0.1.0 - curl ==1.3.8 - darcs ==2.12.5 - data-accessor ==0.2.2.7 @@ -421,39 +459,39 @@ 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-or ==1.0.0.5 - data-ordlist ==0.4.7.0 - data-reify ==0.6.1 + - datasets ==0.2.1 - dataurl ==0.1.0.0 - DAV ==1.3.1 - dawg-ord ==0.5.1.0 - - dbus ==0.10.12 - debian-build ==0.10.1.0 - Decimal ==0.4.2 - - declarative ==0.2.3 + - declarative ==0.5.1 - deepseq-generics ==0.2.0.0 - dejafu ==0.4.0.0 - dependent-map ==0.2.4.0 - - dependent-sum ==0.3.2.2 - - dependent-sum-template ==0.0.0.5 - - derive ==2.5.26 + - dependent-sum ==0.4 - deriving-compat ==0.3.5 - descriptive ==0.9.4 - - diagrams ==1.3.0.1 - - diagrams-cairo ==1.3.1.1 - - diagrams-canvas ==1.3.0.6 - - diagrams-contrib ==1.3.0.12 - - diagrams-core ==1.3.0.8 - - diagrams-gtk ==1.3.0.2 - - diagrams-html5 ==1.3.0.7 - - diagrams-lib ==1.3.1.4 - - diagrams-postscript ==1.3.0.7 - - diagrams-rasterific ==1.3.1.8 + - diagrams ==1.4 + - diagrams-builder ==0.8.0.1 + - diagrams-cairo ==1.4 + - diagrams-canvas ==1.4 + - diagrams-contrib ==1.4.0.1 + - diagrams-core ==1.4 + - diagrams-gtk ==1.4 + - diagrams-html5 ==1.4 + - diagrams-lib ==1.4.0.1 + - diagrams-postscript ==1.4 + - diagrams-rasterific ==1.4 - diagrams-solve ==0.1.0.1 - - diagrams-svg ==1.4.0.3 + - diagrams-svg ==1.4.1 - dice ==0.1 - Diff ==0.3.4 - - diff3 ==0.2.0.3 + - diff3 ==0.3.0 - digest ==0.0.1.2 - digits ==0.3.1 - dimensional ==1.0.1.3 @@ -461,23 +499,29 @@ default-package-overrides: - directory-tree ==0.12.1 - discount ==0.1.1 - disk-free-space ==0.1.0.1 + - distance ==0.1.0.0 - distributed-closure ==0.3.3.0 + - distributed-process ==0.6.6 + - distributed-process-simplelocalnet ==0.2.3.3 - distributed-static ==0.3.5.0 - distribution-nixpkgs ==1.0.0.1 - distributive ==0.5.2 - - diversity ==0.8.0.1 + - diversity ==0.8.0.2 - djinn-ghc ==0.0.2.3 - djinn-lib ==0.0.1.2 - dlist ==0.8.0.2 - dlist-instances ==0.1.1.1 + - dmenu ==0.3.1.1 + - dmenu-pkill ==0.1.0.1 + - dmenu-pmount ==0.1.0.1 + - dmenu-search ==0.1.0.1 - dns ==2.0.10 - do-list ==1.0.1 - dockerfile ==0.1.0.1 - docopt ==0.7.0.5 + - doctemplates ==0.1.0.2 - doctest ==0.11.1 - doctest-discover ==0.1.0.7 - - doctest-prop ==0.2.0.1 - - docvim ==0.3.2.1 - dotenv ==0.3.1.0 - dotnet-timespan ==0.0.1.0 - double-conversion ==2.0.2.0 @@ -486,13 +530,14 @@ default-package-overrides: - drawille ==0.1.2.0 - DRBG ==0.5.5 - drifter ==0.2.2 - - drifter-postgresql ==0.0.2 + - drifter-postgresql ==0.1.0 - dual-tree ==0.2.0.9 - dynamic-state ==0.2.2.0 - dyre ==0.8.12 - Earley ==0.11.0.1 - easy-file ==0.2.1 - Ebnf2ps ==1.0.15 + - echo ==0.1.3 - ed25519 ==0.0.5.0 - ede ==0.2.8.7 - EdisonAPI ==1.3.1 @@ -505,26 +550,34 @@ default-package-overrides: - ekg ==0.4.0.12 - ekg-core ==0.1.1.1 - ekg-json ==0.1.0.4 + - ekg-statsd ==0.2.1.0 - elerea ==2.9.0 - - elm-bridge ==0.3.0.2 + - elm-bridge ==0.4.0 - elm-core-sources ==1.0.0 + - elm-export ==0.6.0.1 + - elm-export-persistent ==0.1.2 - email-validate ==2.2.0 - - emailaddress ==0.1.6.0 + - emailaddress ==0.2.0.0 - enclosed-exceptions ==1.0.2 - encoding-io ==0.0.1 + - EntrezHTTP ==1.0.3 - entropy ==0.3.7 - enummapset-th ==0.6.1.1 - - envelope ==0.1.0.0 + - envelope ==0.2.1.0 + - envparse ==0.4 + - envy ==1.3.0.1 + - epub-metadata ==4.5 - eq ==4.0.4 - - equivalence ==0.3.1 + - equivalence ==0.3.2 - erf ==2.0.0.0 - errors ==2.1.3 - ersatz ==0.3.1 + - esqueleto ==2.5.1 - etcd ==1.0.5 - ether ==0.4.0.2 - euphoria ==0.8.0.0 - event ==0.1.4 - - eventstore ==0.13.1.2 + - eventstore ==0.14.0.1 - exact-combinatorics ==0.2.0.8 - exact-pi ==0.4.1.2 - exception-mtl ==0.4.0.1 @@ -533,28 +586,26 @@ default-package-overrides: - exceptions ==0.8.3 - executable-hash ==0.2.0.4 - executable-path ==0.0.3 - - exp-pairs ==0.1.5.1 + - exhaustive ==1.1.3 + - exp-pairs ==0.1.5.2 - expiring-cache-map ==0.0.6.1 - - explicit-exception ==0.1.8 - extensible ==0.3.7 - extensible-effects ==1.11.0.4 - extensible-exceptions ==0.1.1.4 - - extra ==1.4.10 - - extract-dependencies ==0.2.0.1 + - extra ==1.5.1 - fail ==4.9.0.0 - farmhash ==0.1.0.5 - fast-builder ==0.0.0.6 - fast-digits ==0.2.1.0 - fast-logger ==2.4.10 - - fasta ==0.10.4.0 - - fay ==0.23.1.12 + - fasta ==0.10.4.1 + - fay ==0.23.1.16 - fay-base ==0.20.0.1 - fay-builder ==0.2.0.5 - fay-dom ==0.5.0.1 - fay-jquery ==0.6.1.0 - fay-text ==0.3.2.2 - fay-uri ==0.2.0.0 - - fb ==1.0.13 - fclabels ==2.0.3.2 - feature-flags ==0.1.0.1 - feed ==0.3.12.0 @@ -567,15 +618,17 @@ default-package-overrides: - filecache ==0.2.9 - filelock ==0.1.0.1 - filemanip ==0.3.6.3 - - find-clumpiness ==0.2.0.1 - - FindBin ==0.0.5 - fingertree ==0.1.1.0 - fingertree-psqueue ==0.3 + - finite-typelits ==0.1.1.0 - fixed ==0.2.1.1 - - fixed-vector ==0.8.1.0 + - fixed-vector ==0.9.0.0 - fixed-vector-hetero ==0.3.1.1 - - flat-mcmc ==1.0.1 + - flac ==0.1.1 + - flac-picture ==0.1.0 + - flat-mcmc ==1.5.0 - flexible-defaults ==0.0.1.2 + - FloatingHex ==0.4 - flock ==0.3.1.8 - flow ==1.0.7 - fmlist ==0.9 @@ -584,43 +637,44 @@ default-package-overrides: - fold-debounce ==0.2.0.5 - fold-debounce-conduit ==0.1.0.5 - foldl ==1.2.3 + - foldl-statistics ==0.1.4.2 + - folds ==0.7.1 - FontyFruity ==0.5.3.2 - force-layout ==0.4.0.6 - - forecast-io ==0.2.0.0 - foreign-store ==0.2 + - format-numbers ==0.1.0.0 - formatting ==6.2.4 - fortran-src ==0.1.0.4 - Frames ==0.1.9 - free ==4.12.4 - free-vl ==0.1.4 - freenect ==1.2.1 - - freer ==0.2.4.1 - friendly-time ==0.4 - frisby ==0.2 + - from-sum ==0.2.1.0 - frontmatter ==0.1.0.2 - fsnotify ==0.2.1 - fsnotify-conduit ==0.1.0.0 - funcmp ==1.8 - fuzzcheck ==0.1.1 - - gamma ==0.9.0.2 - gd ==3000.7.3 - Genbank ==1.0.3 - generic-aeson ==0.2.0.8 - generic-deriving ==1.11.1 + - generic-random ==0.4.0.0 - generic-xmlpickler ==0.1.0.5 - GenericPretty ==1.2.1 - generics-eot ==0.2.1.1 - generics-sop ==0.2.4.0 - generics-sop-lens ==0.1.2.1 - geniplate-mirror ==0.7.4 - - genvalidity ==0.2.0.4 - - genvalidity-hspec ==0.2.0.5 - getopt-generics ==0.13 - ghc-events ==0.4.4.0 - - ghc-exactprint ==0.5.2.1 + - ghc-exactprint ==0.5.3.0 - ghc-heap-view ==0.5.7 - - ghc-mod ==5.6.0.0 + - 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-tcplugins-extra ==0.2 - ghc-typelits-extra ==0.2.2 @@ -629,138 +683,145 @@ default-package-overrides: - ghcid ==0.6.6 - ghcjs-codemirror ==0.0.0.1 - ghcjs-hplay ==0.3.4.2 - - ghcjs-perch ==0.3.3 - - gi-atk ==2.0.3 - - gi-cairo ==1.0.3 - - gi-gdk ==3.0.3 - - gi-gdkpixbuf ==2.0.3 - - gi-gio ==2.0.3 - - gi-glib ==2.0.3 - - gi-gobject ==2.0.3 - - gi-gtk ==3.0.3 - - gi-javascriptcore ==3.0.3 - - gi-pango ==1.0.3 - - gi-soup ==2.4.3 - - gi-webkit ==3.0.3 + - ghcjs-perch ==0.3.3.1 + - gi-atk ==2.0.11 + - gi-cairo ==1.0.11 + - gi-gdk ==3.0.11 + - gi-gdkpixbuf ==2.0.11 + - gi-gio ==2.0.11 + - gi-glib ==2.0.11 + - gi-gobject ==2.0.11 + - gi-gtk ==3.0.11 + - gi-javascriptcore ==3.0.11 + - gi-pango ==1.0.11 + - gi-soup ==2.4.11 + - gi-webkit ==3.0.11 + - ginger ==0.3.9.1 - gio ==0.13.3.1 - gipeda ==0.3.3.1 - - giphy-api ==0.4.0.0 - - git-fmt ==0.4.1.0 + - giphy-api ==0.5.2.0 + - github ==0.15.0 + - github-release ==1.0.1 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 + - github-webhook-handler-snap ==0.0.7 - gitlib ==3.1.1 - gitlib-libgit2 ==3.1.1 - gitlib-test ==3.1.0.3 - gitrev ==1.2.0 - gitson ==0.5.2 - - gl ==0.7.8.1 - - glabrous ==0.1.3.0 + - glabrous ==0.3.1 + - glaze ==0.2.0.2 + - glazier ==0.7.0.0 + - glazier-pipes ==0.1.4.0 - GLFW-b ==1.4.8.1 - glib ==0.13.4.1 - Glob ==0.7.14 + - glob-posix ==0.1.0.1 - gloss ==1.10.2.5 - gloss-rendering ==1.10.3.5 - GLURaw ==2.0.0.3 - GLUT ==2.7.0.11 - - gogol ==0.1.0 - - gogol-adexchange-buyer ==0.1.0 - - gogol-adexchange-seller ==0.1.0 - - gogol-admin-datatransfer ==0.1.0 - - gogol-admin-directory ==0.1.0 - - gogol-admin-emailmigration ==0.1.0 - - gogol-admin-reports ==0.1.0 - - gogol-adsense ==0.1.0 - - gogol-adsense-host ==0.1.0 - - gogol-affiliates ==0.1.0 - - gogol-analytics ==0.1.0 - - gogol-android-enterprise ==0.1.0 - - gogol-android-publisher ==0.1.0 - - gogol-appengine ==0.1.0 - - gogol-apps-activity ==0.1.0 - - gogol-apps-calendar ==0.1.0 - - gogol-apps-licensing ==0.1.0 - - gogol-apps-reseller ==0.1.0 - - gogol-apps-tasks ==0.1.0 - - gogol-appstate ==0.1.0 - - gogol-autoscaler ==0.1.0 - - gogol-bigquery ==0.1.0 - - gogol-billing ==0.1.0 - - gogol-blogger ==0.1.0 - - gogol-books ==0.1.0 - - gogol-civicinfo ==0.1.0 - - gogol-classroom ==0.1.0 - - gogol-cloudmonitoring ==0.1.0 - - gogol-cloudtrace ==0.1.0 - - gogol-compute ==0.1.0 - - gogol-container ==0.1.0 - - gogol-core ==0.1.0 - - gogol-customsearch ==0.1.0 - - gogol-dataflow ==0.1.0 - - gogol-dataproc ==0.1.0 - - gogol-datastore ==0.1.0 - - gogol-debugger ==0.1.0 - - gogol-deploymentmanager ==0.1.0 - - gogol-dfareporting ==0.1.0 - - gogol-discovery ==0.1.0 - - gogol-dns ==0.1.0 - - gogol-doubleclick-bids ==0.1.0 - - gogol-doubleclick-search ==0.1.0 - - gogol-drive ==0.1.0 - - gogol-firebase-rules ==0.1.0 - - gogol-fitness ==0.1.0 - - gogol-fonts ==0.1.0 - - gogol-freebasesearch ==0.1.0 - - gogol-fusiontables ==0.1.0 - - gogol-games ==0.1.0 - - gogol-games-configuration ==0.1.0 - - gogol-games-management ==0.1.0 - - gogol-genomics ==0.1.0 - - gogol-gmail ==0.1.0 - - gogol-groups-migration ==0.1.0 - - gogol-groups-settings ==0.1.0 - - gogol-identity-toolkit ==0.1.0 - - gogol-kgsearch ==0.1.0 - - gogol-latencytest ==0.1.0 - - gogol-logging ==0.1.0 - - gogol-maps-coordinate ==0.1.0 - - gogol-maps-engine ==0.1.0 - - gogol-mirror ==0.1.0 - - gogol-monitoring ==0.1.0 - - gogol-oauth2 ==0.1.0 - - gogol-pagespeed ==0.1.0 - - gogol-partners ==0.1.0 - - gogol-people ==0.1.0 - - gogol-play-moviespartner ==0.1.0 - - gogol-plus ==0.1.0 - - gogol-plus-domains ==0.1.0 - - gogol-prediction ==0.1.0 - - gogol-proximitybeacon ==0.1.0 - - gogol-pubsub ==0.1.0 - - gogol-qpxexpress ==0.1.0 - - gogol-replicapool ==0.1.0 - - gogol-replicapool-updater ==0.1.0 - - gogol-resourcemanager ==0.1.0 - - gogol-resourceviews ==0.1.0 - - gogol-script ==0.1.0 - - gogol-sheets ==0.1.0 - - gogol-shopping-content ==0.1.0 - - gogol-siteverification ==0.1.0 - - gogol-spectrum ==0.1.0 - - gogol-sqladmin ==0.1.0 - - gogol-storage ==0.1.0 - - gogol-storage-transfer ==0.1.0 - - gogol-tagmanager ==0.1.0 - - gogol-taskqueue ==0.1.0 - - gogol-translate ==0.1.0 - - gogol-urlshortener ==0.1.0 - - gogol-useraccounts ==0.1.0 - - gogol-vision ==0.1.0 - - gogol-webmaster-tools ==0.1.0 - - gogol-youtube ==0.1.0 - - gogol-youtube-analytics ==0.1.0 - - gogol-youtube-reporting ==0.1.0 + - gogol ==0.1.1 + - gogol-adexchange-buyer ==0.1.1 + - gogol-adexchange-seller ==0.1.1 + - gogol-admin-datatransfer ==0.1.1 + - gogol-admin-directory ==0.1.1 + - gogol-admin-emailmigration ==0.1.1 + - gogol-admin-reports ==0.1.1 + - gogol-adsense ==0.1.1 + - gogol-adsense-host ==0.1.1 + - gogol-affiliates ==0.1.1 + - gogol-analytics ==0.1.1 + - gogol-android-enterprise ==0.1.1 + - gogol-android-publisher ==0.1.1 + - gogol-appengine ==0.1.1 + - gogol-apps-activity ==0.1.1 + - gogol-apps-calendar ==0.1.1 + - gogol-apps-licensing ==0.1.1 + - gogol-apps-reseller ==0.1.1 + - gogol-apps-tasks ==0.1.1 + - gogol-appstate ==0.1.1 + - gogol-autoscaler ==0.1.1 + - gogol-bigquery ==0.1.1 + - gogol-billing ==0.1.1 + - gogol-blogger ==0.1.1 + - gogol-books ==0.1.1 + - gogol-civicinfo ==0.1.1 + - gogol-classroom ==0.1.1 + - gogol-cloudmonitoring ==0.1.1 + - gogol-cloudtrace ==0.1.1 + - gogol-compute ==0.1.1 + - gogol-container ==0.1.1 + - gogol-core ==0.1.1 + - gogol-customsearch ==0.1.1 + - gogol-dataflow ==0.1.1 + - gogol-dataproc ==0.1.1 + - gogol-datastore ==0.1.1 + - gogol-debugger ==0.1.1 + - gogol-deploymentmanager ==0.1.1 + - gogol-dfareporting ==0.1.1 + - gogol-discovery ==0.1.1 + - gogol-dns ==0.1.1 + - gogol-doubleclick-bids ==0.1.1 + - gogol-doubleclick-search ==0.1.1 + - gogol-drive ==0.1.1 + - gogol-firebase-rules ==0.1.1 + - gogol-fitness ==0.1.1 + - gogol-fonts ==0.1.1 + - gogol-freebasesearch ==0.1.1 + - gogol-fusiontables ==0.1.1 + - gogol-games ==0.1.1 + - gogol-games-configuration ==0.1.1 + - gogol-games-management ==0.1.1 + - gogol-genomics ==0.1.1 + - gogol-gmail ==0.1.1 + - gogol-groups-migration ==0.1.1 + - gogol-groups-settings ==0.1.1 + - gogol-identity-toolkit ==0.1.1 + - gogol-kgsearch ==0.1.1 + - gogol-latencytest ==0.1.1 + - gogol-logging ==0.1.1 + - gogol-maps-coordinate ==0.1.1 + - gogol-maps-engine ==0.1.1 + - gogol-mirror ==0.1.1 + - gogol-monitoring ==0.1.1 + - gogol-oauth2 ==0.1.1 + - gogol-pagespeed ==0.1.1 + - gogol-partners ==0.1.1 + - gogol-people ==0.1.1 + - gogol-play-moviespartner ==0.1.1 + - gogol-plus ==0.1.1 + - gogol-plus-domains ==0.1.1 + - gogol-prediction ==0.1.1 + - gogol-proximitybeacon ==0.1.1 + - gogol-pubsub ==0.1.1 + - gogol-qpxexpress ==0.1.1 + - gogol-replicapool ==0.1.1 + - gogol-replicapool-updater ==0.1.1 + - gogol-resourcemanager ==0.1.1 + - gogol-resourceviews ==0.1.1 + - gogol-script ==0.1.1 + - gogol-sheets ==0.1.1 + - gogol-shopping-content ==0.1.1 + - gogol-siteverification ==0.1.1 + - gogol-spectrum ==0.1.1 + - gogol-sqladmin ==0.1.1 + - gogol-storage ==0.1.1 + - gogol-storage-transfer ==0.1.1 + - gogol-tagmanager ==0.1.1 + - gogol-taskqueue ==0.1.1 + - gogol-translate ==0.1.1 + - gogol-urlshortener ==0.1.1 + - gogol-useraccounts ==0.1.1 + - gogol-vision ==0.1.1 + - gogol-webmaster-tools ==0.1.1 + - gogol-youtube ==0.1.1 + - gogol-youtube-analytics ==0.1.1 + - gogol-youtube-reporting ==0.1.1 - google-cloud ==0.0.4 - google-oauth2-jwt ==0.1.3 + - google-translate ==0.3 - gpolyline ==0.1.0.1 - graph-core ==0.3.0.0 - graph-wrapper ==0.2.5.1 @@ -779,53 +840,64 @@ default-package-overrides: - gtksourceview3 ==0.13.3.1 - H ==0.9.0.1 - hackage-db ==1.22 - - hackage-mirror ==0.1.1.1 - hackage-security ==0.5.2.2 - - hackage-whatsnew ==0.1.0.1 - - hackmanager ==0.1.0.0 - - haddock-api ==2.17.3 + - hackernews ==1.1.1.0 - haddock-library ==1.4.2 - hailgun ==0.4.1.1 + - hailgun-simple ==0.1.0.0 + - hakyll ==4.9.5.1 - half ==0.2.2.3 + - hamilton ==0.1.0.0 - hamlet ==1.2.0 - HandsomeSoup ==0.4.2 - - handwriting ==0.1.0.3 - hapistrano ==0.2.1.2 - happstack-authenticate ==2.3.4.7 - happstack-clientsession ==7.3.1 - happstack-hsp ==7.3.7.1 - happstack-jmacro ==7.0.11 - - happstack-server ==7.4.6.2 + - happstack-server ==7.4.6.3 - happstack-server-tls ==7.1.6.2 - happy ==1.19.5 - - HaRe ==0.8.3.0 - harp ==0.4.2 - - hashable ==1.2.4.0 - - hashable-extras ==0.2.3 + - hashable ==1.2.5.0 - hashable-time ==0.2 - hashmap ==1.3.2 - hashtables ==1.2.1.0 - - haskeline ==0.7.3.0 - - haskell-gi ==0.18 - - haskell-gi-base ==0.18.4 + - haskeline ==0.7.3.1 + - haskell-gi ==0.20 + - haskell-gi-base ==0.20 - haskell-lexer ==1.0.1 - - haskell-names ==0.7.0 + - haskell-names ==0.8.0 - haskell-neo4j-client ==0.3.2.4 - - haskell-packages ==0.4 + - haskell-packages ==0.5 - haskell-spacegoo ==0.2.0.1 - haskell-src ==1.0.2.0 - - haskell-src-exts ==1.17.1 - - haskell-src-meta ==0.6.0.14 + - haskell-src-exts ==1.18.2 + - haskell-src-exts-simple ==1.19.0.0 + - haskell-src-meta ==0.7.0.1 + - haskell-tools-ast ==0.5.0.0 + - haskell-tools-backend-ghc ==0.5.0.0 + - haskell-tools-cli ==0.5.0.0 + - haskell-tools-daemon ==0.5.0.0 + - haskell-tools-debug ==0.5.0.0 + - haskell-tools-demo ==0.5.0.0 + - haskell-tools-prettyprint ==0.5.0.0 + - haskell-tools-refactor ==0.5.0.0 + - haskell-tools-rewrite ==0.5.0.0 - HaskellNet ==0.5.1 - HaskellNet-SSL ==0.3.3.0 - - haskintex ==0.6.0.1 - - haskoin-core ==0.4.0 + - haskintex ==0.7.0.1 - hasql ==0.19.16 + - hasql-migration ==0.1.3 + - hasql-transaction ==0.5 - hastache ==0.6.1 - - hasty-hamiltonian ==1.1.5 + - hasty-hamiltonian ==1.3.0 - HaTeX ==3.17.1.0 - hatex-guide ==1.3.1.6 - - hbayes ==0.5.2 + - haxl ==0.5.0.0 + - haxl-amazonka ==0.1.1 + - HaXml ==1.25.3 + - haxr ==3000.11.2 - hbeanstalk ==0.2.4 - Hclip ==3.0.0.4 - HCodecs ==0.5 @@ -839,37 +911,43 @@ default-package-overrides: - hedis ==0.9.7 - here ==1.2.9 - heredoc ==0.2.0.0 + - heterocephalus ==1.0.4.0 - hex ==0.1.2 + - hexml ==0.3.1 - hexstring ==0.11.1 - hflags ==0.4.2 - hformat ==0.1.0.1 - hfsevents ==0.1.6 - - hgettext ==0.1.30 - hid ==0.2.2 - hidapi ==0.1.4 - hierarchical-clustering ==0.4.6 + - highjson ==0.4.0.0 + - highjson-swagger ==0.4.0.0 + - highjson-th ==0.4.0.0 - highlighting-kate ==0.6.4 - hinotify ==0.3.9 - hint ==0.6.0 - - hip ==1.2.0.0 + - hip ==1.5.2.0 - histogram-fill ==0.8.4.1 - hit ==0.6.3 + - hjpath ==3.0.1 - hjsmin ==0.2.0.2 - - hjsonpointer ==1.0.0.2 - - hjsonschema ==1.1.0.1 - - hlibgit2 ==0.18.0.15 + - hjson ==1.3.2 + - hjsonpointer ==1.1.0.2 + - hjsonschema ==1.5.0.1 + - hlibgit2 ==0.18.0.16 - hlibsass ==0.1.5.0 - - hlint ==1.9.35 - - hmatrix ==0.17.0.2 - - hmatrix-gsl ==0.17.0.0 - - hmatrix-gsl-stats ==0.4.1.4 + - hlint ==1.9.41 + - hmatrix ==0.18.0.0 + - hmatrix-gsl ==0.18.0.1 + - hmatrix-gsl-stats ==0.4.1.6 + - hmatrix-repa ==0.1.2.2 - hmatrix-special ==0.4.0.1 - hmpfr ==0.4.2.1 - hmt ==0.15 - - hoauth2 ==0.5.4.0 - - hocilib ==0.1.0 + - hoauth2 ==0.5.7 + - hocilib ==0.2.0 - holy-project ==0.2.0.1 - - homplexity ==0.4.3.3 - hOpenPGP ==2.5.5 - hopenpgp-tools ==0.19.4 - hopenssl ==1.7 @@ -877,29 +955,30 @@ default-package-overrides: - hostname ==1.0 - hostname-validate ==1.0.0 - hourglass ==0.2.10 - - hpack-convert ==0.14.6 - hpc-coveralls ==1.0.8 - hPDB ==1.2.0.9 - hPDB-examples ==1.2.0.7 - HPDF ==1.4.10 - hpio ==0.8.0.6 - - hprotoc ==2.4.0 + - hpp ==0.4.0 + - hpqtypes ==1.5.1.1 - hquantlib ==0.0.3.3 - - hreader ==1.0.2 + - hreader ==1.1.0 - hruby ==0.3.4.3 - hs-bibutils ==5.5 - hs-GeoIP ==0.3 - hsass ==0.4.0 - hsb2hs ==0.3.1 - hscolour ==1.24.1 - - hsdns ==1.6.1 - - hse-cpp ==0.1 + - hsdns ==1.7 + - hse-cpp ==0.2 - hsebaysdk ==0.4.0.0 - hsemail ==1.7.7 - HSet ==0.0.0 - hset ==2.2.0 - hsexif ==0.6.0.10 - - hsignal ==0.2.7.4 + - hsignal ==0.2.7.5 + - hsinstall ==1.5 - hslogger ==1.2.10 - hslua ==0.4.1 - hsndfile ==0.8.0 @@ -907,63 +986,67 @@ default-package-overrides: - HsOpenSSL ==0.11.4 - HsOpenSSL-x509-system ==0.1.0.3 - hsp ==0.10.0 - - hspec ==2.2.4 + - hspec ==2.4.1 - hspec-attoparsec ==0.1.0.2 - - hspec-contrib ==0.3.0 - - hspec-core ==2.2.4 - - hspec-discover ==2.2.4 - - hspec-expectations ==0.7.2 + - hspec-core ==2.4.1 + - hspec-discover ==2.4.1 + - hspec-expectations ==0.8.2 - hspec-expectations-pretty-diff ==0.7.2.4 - hspec-golden-aeson ==0.2.0.3 - - hspec-jenkins ==0.1.1 - - hspec-megaparsec ==0.2.1 - - hspec-meta ==2.2.1 - - hspec-setup ==0.1.1.1 - - hspec-smallcheck ==0.4.1 - - hspec-wai ==0.6.6 - - hspec-wai-json ==0.6.1 + - hspec-megaparsec ==0.3.1 + - hspec-meta ==2.3.2 + - hspec-setup ==0.2.1.0 + - hspec-smallcheck ==0.4.2 + - hspec-wai ==0.8.0 + - hspec-wai-json ==0.8.0 - hspec-webdriver ==1.2.0 - - hstatistics ==0.2.5.4 + - hstatistics ==0.3 - hstatsd ==0.1 - HStringTemplate ==0.8.5 - hsx-jmacro ==7.3.8 - - hsx2hs ==0.13.5 + - hsx2hs ==0.14.0 - hsyslog ==4 - htaglib ==1.0.4 - HTF ==0.13.1.0 - html ==1.0.1.2 - html-conduit ==1.2.1.1 + - html-email-validate ==0.2.0.0 - htoml ==1.0.0.3 - HTTP ==4000.3.5 - - http-api-data ==0.2.4 - - http-client ==0.4.31.2 + - http-api-data ==0.3.5 + - http-client ==0.5.5 - http-client-openssl ==0.2.0.4 - - http-client-tls ==0.2.4.1 + - http-client-tls ==0.3.3.1 - http-common ==0.8.2.0 - - http-conduit ==2.1.11 + - http-conduit ==2.2.3 - http-date ==0.0.6.1 - http-link-header ==1.0.3 - http-media ==0.6.4 - http-reverse-proxy ==0.4.3.2 - http-streams ==0.8.4.0 - http-types ==0.9.1 - - http2 ==1.6.2 - - httpd-shed ==0.4.0.3 + - http2 ==1.6.3 - human-readable-duration ==0.2.0.3 - - HUnit ==1.3.1.2 - - HUnit-approx ==1.0 + - HUnit ==1.5.0.0 + - HUnit-approx ==1.1 - hunit-dejafu ==0.3.0.3 - - hvect ==0.3.1.0 - - hw-bits ==0.1.0.1 - - hw-conduit ==0.0.0.11 + - hvect ==0.4.0.0 + - hw-balancedparens ==0.1.0.0 + - hw-bits ==0.5.0.0 + - hw-conduit ==0.1.0.0 - hw-diagnostics ==0.0.0.5 + - hw-excess ==0.1.0.0 + - hw-int ==0.0.0.1 + - hw-json ==0.4.0.0 + - hw-mquery ==0.1.0.1 - hw-parser ==0.0.0.1 - - hw-prim ==0.1.0.3 - - hw-rankselect ==0.3.0.0 - - hw-succinct ==0.0.0.14 + - hw-prim ==0.4.0.2 + - hw-rankselect ==0.8.0.0 + - hw-rankselect-base ==0.2.0.0 + - hw-string-parse ==0.0.0.3 + - hw-succinct ==0.1.0.1 - hweblib ==0.6.3 - hworker ==0.1.0.1 - - hworker-ses ==0.1.1.0 - hxt ==9.3.1.16 - hxt-charproperties ==9.2.0.1 - hxt-css ==0.1.0.3 @@ -975,33 +1058,38 @@ default-package-overrides: - hyphenation ==0.6 - ical ==0.0.1 - iconv ==0.4.1.3 - - identicon ==0.1.0 - - idris ==0.12.3 - - ieee754 ==0.7.9 + - identicon ==0.2.0 + - ieee754 ==0.8.0 + - if ==0.1.0.0 - IfElse ==0.85 - ignore ==0.1.1.0 - ilist ==0.2.0.0 - imagesize-conduit ==1.1 - - imm ==1.0.1.0 + - imm ==1.1.0.0 - immortal ==0.2.2 - include-file ==0.1.0.3 - incremental-parser ==0.2.5 - indentation-core ==0.0 - indentation-parsec ==0.0 - - indents ==0.3.3 - - inflections ==0.2.0.1 + - indents ==0.4.0.0 + - inflections ==0.3.0.0 - ini ==0.3.5 - inline-c ==0.5.6.1 - inline-c-cpp ==0.1.0.0 + - inline-java ==0.6.1 - inline-r ==0.9.0.1 - - insert-ordered-containers ==0.1.0.1 + - insert-ordered-containers ==0.2.0.0 + - instance-control ==0.1.1.1 + - integer-logarithms ==1.0.1 - integration ==0.2.1 - intero ==0.1.20 - interpolate ==0.1.0 - interpolatedstring-perl6 ==1.0.0 - IntervalMap ==0.5.2.0 - intervals ==0.7.2 + - intro ==0.1.0.6 - invariant ==0.4 + - invertible ==0.2.0 - io-choice ==0.0.6 - io-machine ==0.2.0.0 - io-manager ==0.1.0.2 @@ -1030,21 +1118,28 @@ default-package-overrides: - jmacro ==0.6.14 - jmacro-rpc ==0.3.2 - jmacro-rpc-happstack ==0.3.2 - - jose ==0.4.0.3 + - jmacro-rpc-snap ==0.3 + - jni ==0.2.3 + - jose ==0.5.0.2 - jose-jwt ==0.7.4 - js-flot ==0.8.3 - js-jquery ==3.1.1 - json ==0.9.1 - - json-autotype ==1.0.15 + - json-builder ==0.3 - json-rpc-generic ==0.2.1.2 - json-schema ==0.7.4.1 + - json-stream ==0.4.1.3 - JuicyPixels ==3.2.8 - JuicyPixels-extra ==0.1.1 - JuicyPixels-scale-dct ==0.1.1.2 + - jvm ==0.1.2 + - jvm-streaming ==0.1 - jwt ==0.7.2 - kan-extensions ==5.0.1 - kansas-comet ==0.4 - - kawhi ==0.0.1 + - katip ==0.3.1.4 + - katip-elasticsearch ==0.3.0.2 + - kawhi ==0.2.1 - kdt ==0.2.4 - keter ==1.4.3.2 - keycode ==0.2.2 @@ -1053,6 +1148,8 @@ default-package-overrides: - knob ==0.1.1 - koofr-client ==1.0.0.3 - kraken ==0.0.3 + - l10n ==0.1.0.0 + - labels ==0.3.0 - lackey ==0.4.2 - language-c ==0.5.0 - language-c-quote ==0.11.7.1 @@ -1065,14 +1162,16 @@ default-package-overrides: - language-javascript ==0.6.0.9 - language-lua2 ==0.1.0.5 - language-nix ==2.1.0.1 - - language-puppet ==1.3.1.1 - - language-thrift ==0.9.0.2 + - language-puppet ==1.3.5.1 + - language-python ==0.5.4 + - language-thrift ==0.10.0.0 + - large-hashable ==0.1.0.3 - largeword ==1.2.5 - lattices ==1.5.0 - lazy-csv ==0.5.1 - lca ==0.3 - leapseconds-announced ==2017 - - lens ==4.14 + - lens ==4.15.1 - lens-action ==0.2.0.2 - lens-aeson ==1.0.0.5 - lens-datetime ==0.3 @@ -1081,6 +1180,7 @@ default-package-overrides: - lens-family-th ==0.5.0.0 - lens-regex ==0.1.0 - lens-simple ==0.1.0.9 + - lentil ==1.0.8.0 - leveldb-haskell ==0.6.4 - lexer-applicative ==2.1.0.1 - lhs2tex ==1.19 @@ -1088,33 +1188,47 @@ default-package-overrides: - libinfluxdb ==0.0.4 - libmpd ==0.9.0.6 - libnotify ==0.2 - - libxml-sax ==0.7.5 + - librato ==0.2.0.1 + - libsystemd-journal ==1.4.1 - LibZip ==1.0.1 + - licensor ==0.2.0 - lift-generics ==0.1.1 - lifted-async ==0.9.1.1 - lifted-base ==0.2.3.8 - - line ==1.0.1.0 + - line ==2.2.0 - linear ==1.20.5 - linear-accelerate ==0.2 + - linked-list-with-iterator ==0.1.1.0 - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.2.0 + - List ==0.6.0 - list-fusion-probe ==0.1.0.6 - list-prompt ==0.1.1.0 - list-t ==1 - ListLike ==4.5.1 - - load-env ==0.1.1 + - lmdb ==0.2.5 - loch-th ==0.2.1 - - log-domain ==0.10.3.1 + - log ==0.7 + - log-base ==0.7 + - log-domain ==0.11 + - log-elasticsearch ==0.7 + - log-postgres ==0.7 - logfloat ==0.13.3.3 + - logger-thread ==0.1.0.2 + - logging-effect ==1.1.2 - logging-facade ==0.1.1 - logict ==0.6.0.2 - loop ==0.3.0 - lrucache ==1.2.0.0 - lrucaching ==0.3.1 - - ltext ==0.1.2.1 - lucid ==2.9.7 - lucid-svg ==0.7.0.0 + - lzma-conduit ==1.1.3.1 - machines ==0.6.1 + - machines-binary ==0.3.0.3 + - machines-directory ==0.2.0.10 + - machines-io ==0.2.0.13 + - machines-process ==0.2.0.8 - magic ==1.1 - mainland-pretty ==0.4.1.4 - makefile ==0.1.0.5 @@ -1124,43 +1238,47 @@ default-package-overrides: - markdown-unlit ==0.4.0 - markup ==3.1.0 - math-functions ==0.2.1.0 + - mathexpr ==0.3.0.0 - matrices ==0.4.4 - matrix ==0.3.5.0 - maximal-cliques ==0.1.1 - mbox ==0.3.3 - mcmc-types ==1.0.3 - - megaparsec ==5.0.1 - - memory ==0.13 - - MemoTrie ==0.6.4 + - median-stream ==0.7.0.0 + - mega-sdist ==0.3.0 + - megaparsec ==5.2.0 + - memory ==0.14.1 + - MemoTrie ==0.6.7 - mersenne-random ==1.0.0.1 - - mersenne-random-pure64 ==0.2.0.5 + - mersenne-random-pure64 ==0.2.2.0 - messagepack ==0.5.4 - messagepack-rpc ==0.5.1 - - metrics ==0.3.0.2 + - metrics ==0.4.0.1 - MFlow ==0.4.6.0 + - mfsolve ==0.3.2.0 - microformats2-parser ==1.0.1.6 - microlens ==0.4.7.0 - - microlens-aeson ==2.1.1.3 + - microlens-aeson ==2.2.0 - microlens-contra ==0.1.0.1 - microlens-ghc ==0.4.7.0 - microlens-mtl ==0.1.10.0 - microlens-platform ==0.3.7.1 - microlens-th ==0.4.1.1 - - mighty-metropolis ==1.0.4 - - mime-mail ==0.4.12 + - mighty-metropolis ==1.2.0 + - mime-mail ==0.4.13 - mime-mail-ses ==0.3.2.3 - mime-types ==0.1.0.7 + - mintty ==0.1 - misfortune ==0.1.1.2 - missing-foreign ==0.1.1 - MissingH ==1.4.0.1 - mmap ==0.5.9 - mmorph ==1.0.9 - mockery ==0.3.4 - - modify-fasta ==0.8.2.1 - - moesocks ==1.0.0.41 + - modify-fasta ==0.8.2.3 - monad-control ==1.0.1.0 - monad-coroutine ==0.9.0.3 - - monad-extras ==0.5.11 + - monad-extras ==0.6.0 - monad-http ==0.1.0.0 - monad-journal ==0.7.2 - monad-logger ==0.3.20.1 @@ -1168,6 +1286,7 @@ default-package-overrides: - monad-logger-prefix ==0.1.6 - monad-logger-syslog ==0.1.3.0 - monad-loops ==0.4.3 + - monad-metrics ==0.1.0.2 - monad-par ==0.3.4.8 - monad-par-extras ==0.3.3 - monad-parallel ==0.7.2.2 @@ -1184,16 +1303,17 @@ default-package-overrides: - monadloc ==0.7.1 - monadplus ==1.4.2 - MonadPrompt ==1.0.0.5 - - MonadRandom ==0.4.2.3 + - MonadRandom ==0.5.1 - monads-tf ==0.1.0.3 - mongoDB ==2.1.1.1 - mono-traversable ==1.0.1.1 - mono-traversable-instances ==0.1.0.0 - monoid-extras ==0.4.2 - - monoid-subclasses ==0.4.2.1 + - monoid-subclasses ==0.4.3.1 - monoidal-containers ==0.3.0.1 - - morte ==1.6.2 + - morte ==1.6.5 - mountpoints ==1.0.2 + - mstate ==0.2.7 - mtl ==2.2.1 - mtl-compat ==0.2.1.3 - mtl-prelude ==2.0.3.1 @@ -1202,14 +1322,17 @@ default-package-overrides: - multipart ==0.1.2 - multiset ==0.3.3 - multiset-comb ==0.2.4.1 + - multistate ==0.7.1.1 - murmur-hash ==0.1.0.9 - - murmur3 ==1.0.3 - MusicBrainz ==0.2.4 - - mustache ==2.1.2 - mutable-containers ==0.3.3 - - mwc-probability ==1.2.2 + - mwc-probability ==1.3.0 - mwc-random ==0.13.5.0 - mwc-random-monad ==0.7.3.1 + - mysql ==0.1.4 + - mysql-haskell ==0.8.0.0 + - mysql-haskell-openssl ==0.8.0.0 + - mysql-simple ==0.4.0.0 - nagios-check ==0.3.2 - names-th ==0.2.0.2 - nano-erl ==0.1.0.1 @@ -1217,18 +1340,25 @@ default-package-overrides: - nationstates ==0.5.0.0 - nats ==1.1.1 - natural-sort ==0.1.2 - - natural-transformation ==0.3.1 + - natural-transformation ==0.4 - ndjson-conduit ==0.1.0.5 - neat-interpolation ==0.3.2.1 - netpbm ==1.0.2 - nettle ==0.2.0 + - netwire ==5.0.2 + - netwire-input ==0.0.6 + - netwire-input-glfw ==0.0.6 - network ==2.6.3.1 - network-anonymous-i2p ==0.10.0 - network-anonymous-tor ==0.11.0 - network-attoparsec ==0.12.2 + - network-carbon ==1.0.8 - network-conduit-tls ==1.2.2 - network-house ==0.1.0.2 - network-info ==0.2.0.8 + - network-msgpack-rpc ==0.0.3 + - network-multicast ==0.2.0 + - Network-NineP ==0.4.1 - network-simple ==0.4.0.5 - network-transport ==0.4.4.0 - network-transport-composed ==0.2.0.1 @@ -1236,9 +1366,12 @@ default-package-overrides: - network-transport-tcp ==0.5.1 - network-transport-tests ==0.2.3.0 - network-uri ==2.6.1.0 - - network-uri-flag ==0.1 - newtype ==0.2 + - newtype-generics ==0.5 + - next-ref ==0.1.0.2 + - nfc ==0.0.1 - nicify-lib ==1.0.1 + - NineP ==0.0.2.1 - nix-paths ==1.0.0.1 - non-empty-sequence ==0.2.0.2 - nonce ==1.0.2 @@ -1248,21 +1381,23 @@ default-package-overrides: - numeric-extras ==0.1 - NumInstances ==1.4 - numtype-dk ==0.5.0.1 + - oanda-rest-api ==0.3.0.0 - objective ==1.1.1 - ObjectName ==1.1.0.1 - - octane ==0.16.3 + - octane ==0.18.2 - Octree ==0.5.4.3 - oeis ==0.3.8 - ofx ==0.4.2.0 - old-locale ==1.0.0.7 - old-time ==1.1.0.3 - - omnifmt ==0.2.1.1 - once ==0.2 - OneTuple ==0.2.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.5.2.2 + - opaleye ==0.5.3.0 - opaleye-trans ==0.3.4 - open-browser ==0.2.1.0 + - open-witness ==0.4 + - OpenAL ==1.7.0.4 - OpenGL ==3.0.1.0 - OpenGLRaw ==3.2.4.0 - openpgp-asciiarmor ==0.1 @@ -1270,32 +1405,35 @@ default-package-overrides: - openssl-streams ==1.2.1.0 - operational ==0.2.3.5 - operational-class ==0.3.0.0 - - opml-conduit ==0.5.0.1 + - opml-conduit ==0.6.0.1 - optional-args ==1.0.1 - options ==1.2.1.1 - - optparse-applicative ==0.12.1.0 - - optparse-generic ==1.1.1 + - optparse-applicative ==0.13.1.0 + - optparse-generic ==1.1.4 - optparse-helper ==0.2.1.1 - optparse-simple ==0.0.3 - optparse-text ==0.1.1.0 - osdkeys ==0.0 - overloaded-records ==0.4.2.0 - - package-description-remote ==0.2.0.0 - packdeps ==0.4.3 - pager ==0.1.1.0 - - pagerduty ==0.0.7 + - pagerduty ==0.0.8 - pagination ==0.1.1 - palette ==0.1.0.4 - - pandoc ==1.17.1 + - pandoc ==1.19.2.1 - pandoc-citeproc ==0.10.4 - - pandoc-types ==1.16.1.1 + - pandoc-types ==1.17.0.5 - pango ==0.13.3.1 - parallel ==3.2.1.0 - parallel-io ==0.3.3 - parseargs ==0.2.0.8 - parsec ==3.1.11 + - parsec-numeric ==0.1.0.0 + - ParsecTools ==0.0.2.0 - parsers ==0.12.4 - partial-handler ==1.0.2 + - partial-isomorphisms ==0.2.2 + - patat ==0.5.0.0 - path ==0.5.12 - path-extra ==0.0.3 - path-io ==1.2.2 @@ -1303,8 +1441,6 @@ default-package-overrides: - pathwalk ==0.3.1.2 - patience ==0.1.1 - pattern-arrows ==0.0.2 - - pbkdf ==1.1.1.1 - - pcap ==0.4.5.2 - pcre-heavy ==1.0.0.2 - pcre-light ==0.4.0.4 - pcre-utils ==0.1.8.1 @@ -1317,6 +1453,7 @@ default-package-overrides: - persistable-record ==0.4.1.0 - persistable-types-HDBC-pg ==0.0.1.4 - persistent ==2.6 + - persistent-mysql ==2.6 - persistent-postgresql ==2.6 - persistent-redis ==2.5.2 - persistent-refs ==0.4 @@ -1324,39 +1461,41 @@ default-package-overrides: - persistent-template ==2.5.1.6 - pgp-wordlist ==0.1.0.2 - phantom-state ==0.2.1.2 + - picedit ==0.2.3.0 - picoparsec ==0.1.2.3 - - pinboard ==0.9.6 + - pid1 ==0.1.0.1 + - pinboard ==0.9.12.4 - pinch ==0.3.0.2 - - pinchot ==0.22.0.0 - - pipes ==4.1.9 - - pipes-aeson ==0.4.1.7 + - pinchot ==0.24.0.0 + - pipes ==4.3.2 - pipes-attoparsec ==0.5.1.4 - - pipes-bgzf ==0.2.0.1 - pipes-bytestring ==2.1.4 - - pipes-cacophony ==0.4.0 - - pipes-cliff ==0.12.0.0 + - pipes-cacophony ==0.4.1 + - pipes-category ==0.2.0.1 - pipes-concurrency ==2.0.7 - pipes-csv ==1.4.3 - pipes-extras ==1.0.8 - - pipes-fastx ==0.3.0.0 + - pipes-fluid ==0.5.0.3 - pipes-group ==1.0.6 - - pipes-http ==1.0.5 - - pipes-illumina ==0.1.0.0 + - pipes-misc ==0.2.3.0 - pipes-mongodb ==0.1.0.0 - - pipes-network ==0.6.4.1 - pipes-parse ==3.0.8 - pipes-random ==1.0.0.3 - - pipes-safe ==2.2.4 + - pipes-safe ==2.2.5 - pipes-text ==0.0.2.5 - pipes-wai ==3.2.0 - pixelated-avatar-generator ==0.1.3 - - pkcs10 ==0.1.1.0 + - pkcs10 ==0.2.0.0 - placeholders ==0.1 - plan-b ==0.2.0 + - plot ==0.2.3.6 + - plot-gtk ==0.2.0.4 + - plot-gtk-ui ==0.3.0.2 + - plot-gtk3 ==0.1.0.2 - point-octree ==0.5.5.3 - pointed ==5 - pointedlist ==0.6.1 - - pointful ==1.0.8 + - pointful ==1.0.9 - pointless-fun ==1.1.0.6 - polynomials-bernstein ==1.1.2 - polyparse ==1.12 @@ -1364,11 +1503,12 @@ default-package-overrides: - post-mess-age ==0.2.1.0 - postgresql-binary ==0.9.2 - postgresql-libpq ==0.9.3.0 - - postgresql-query ==3.0.1 - - postgresql-schema ==0.1.10 - postgresql-simple ==0.5.2.1 - - postgresql-simple-url ==0.1.0.1 + - postgresql-simple-migration ==0.1.8.0 + - postgresql-simple-url ==0.2.0.0 - postgresql-transactional ==1.1.1 + - postgresql-typed ==0.5.0 + - pqueue ==1.3.2 - pred-set ==0.0.1 - prednote ==0.36.0.4 - prefix-units ==0.2.0 @@ -1379,13 +1519,15 @@ default-package-overrides: - pretty-class ==1.0.1.1 - pretty-hex ==1.0 - pretty-show ==1.6.12 + - pretty-simple ==2.0.0.0 - pretty-types ==0.2.3.1 - prettyclass ==1.0.0.0 - primes ==0.2.1.0 - primitive ==0.6.1.0 - - process-extras ==0.4.1.4 + - printcess ==0.1.0.3 + - process-extras ==0.7.1 - product-profunctors ==0.7.1.0 - - profiteur ==0.3.0.3 + - profiteur ==0.4.2.0 - profunctor-extras ==4.0 - profunctors ==5.2 - project-template ==0.2.0 @@ -1402,30 +1544,29 @@ default-package-overrides: - psql-helpers ==0.1.0.0 - PSQueue ==1.1 - psqueues ==0.2.2.3 - - publicsuffix ==0.20160716 + - publicsuffix ==0.20170109 - pure-cdb ==0.1.2 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript ==0.9.3 - - purescript-bridge ==0.8.0.1 + - purescript-bridge ==0.10.0.0 + - pusher-http-haskell ==1.1.0.4 - pwstore-fast ==2.4.4 - pwstore-purehaskell ==2.1.4 - - quantum-random ==0.6.4 - QuasiText ==0.1.2.6 - questioner ==0.1.1.0 - quickbench ==1.0 - - QuickCheck ==2.8.2 + - QuickCheck ==2.9.2 - quickcheck-arbitrary-adt ==0.2.0.0 - - quickcheck-assertions ==0.2.0 - - quickcheck-combinators ==0.0.1 + - quickcheck-assertions ==0.3.0 - quickcheck-instances ==0.3.12 - quickcheck-io ==0.1.4 - - quickcheck-properties ==0.1 - quickcheck-simple ==0.1.0.1 + - quickcheck-special ==0.1.0.3 - quickcheck-text ==0.1.2.1 - quickcheck-unicode ==1.0.0.1 - rainbow ==0.28.0.4 - rainbox ==0.18.0.10 + - ramus ==0.1.2 - random ==1.1 - random-fu ==0.2.7.0 - random-shuffle ==0.0.4 @@ -1434,29 +1575,36 @@ default-package-overrides: - range ==0.1.2.0 - range-set-list ==0.1.2.0 - rank1dynamic ==0.3.3.0 - - Rasterific ==0.6.1.1 - - rasterific-svg ==0.3.1.2 + - Rasterific ==0.7.1 + - rasterific-svg ==0.3.2.1 - ratel ==0.3.2 - ratel-wai ==0.2.0 + - rattletrap ==2.1.5 - raw-strings-qq ==1.1 + - rawfilepath ==0.1.0.0 + - rawstring-qm ==0.2.3.0 + - rdf ==0.1.0.1 - read-editor ==0.1.0.2 - read-env-var ==0.1.0.1 - readable ==0.3.1 - ReadArgs ==1.2.3 - readline ==1.0.3.0 - rebase ==1.0.8 + - recursion-schemes ==5.0.1 - redis-io ==0.7.0 - redis-resp ==0.4.0 - reducers ==3.12.1 + - reedsolomon ==0.0.4.3 - ref-fd ==0.4.0.1 - refact ==0.3.0.2 + - references ==0.3.2.1 - reflection ==2.1.2 - reform ==0.2.7.1 - - reform-blaze ==0.2.4.1 - - reform-hamlet ==0.0.5.1 + - reform-blaze ==0.2.4.3 + - reform-hamlet ==0.0.5.3 - reform-happstack ==0.2.5.1 - reform-hsp ==0.2.7.1 - - RefSerialize ==0.3.1.4 + - RefSerialize ==0.4.0 - regex-applicative ==0.3.3 - regex-applicative-text ==0.1.0.1 - regex-base ==0.93.2 @@ -1477,15 +1625,19 @@ default-package-overrides: - repa-algorithms ==3.4.1.1 - repa-io ==3.4.1.1 - RepLib ==0.5.4 + - repline ==0.1.6.0 + - req ==0.2.0 + - req-conduit ==0.1.0 - rerebase ==1.0.3 - - reroute ==0.4.0.1 + - reroute ==0.4.1.0 - resolve-trivial-conflicts ==0.3.2.4 - resource-pool ==0.2.3.2 - resourcet ==1.1.9 - rest-client ==0.5.1.1 - rest-core ==0.39 - - rest-gen ==0.19.0.3 + - rest-gen ==0.20.0.0 - rest-happstack ==0.3.1.1 + - rest-snap ==0.2.0.1 - rest-stringmap ==0.2.0.6 - rest-types ==1.14.1.1 - rest-wai ==0.2.0.1 @@ -1495,32 +1647,37 @@ default-package-overrides: - retry ==0.7.4.2 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 + - riak ==1.1.1.0 + - riak-protobuf ==0.22.0.0 + - RNAlien ==1.3.1 - rng-utils ==0.2.1 - rose-trees ==0.0.4.3 - - rosezipper ==0.2 - - rotating-log ==0.4 + - rotating-log ==0.4.2 - RSA ==2.2.0 - - rss-conduit ==0.2.0.2 + - rss-conduit ==0.3.0.0 - runmemo ==1.0.0.1 - rvar ==0.2.0.3 - s3-signer ==0.3.0.0 - - safe ==0.3.11 + - safe ==0.3.13 - safe-exceptions ==0.1.4.0 + - safe-exceptions-checked ==0.1.0 - safecopy ==0.9.2 - SafeSemaphore ==0.10.1 - - sampling ==0.2.0 + - sampling ==0.3.2 - sandi ==0.4.0 - sandman ==0.2.0.1 - say ==0.1.0.0 - - sbv ==5.12 - - scalpel ==0.3.1 + - sbv ==5.14 + - scalpel ==0.5.0 + - scalpel-core ==0.5.0 - scanner ==0.2 - - scientific ==0.3.4.9 + - scientific ==0.3.4.10 - scotty ==0.11.0 - - scrape-changes ==0.1.0.4 - scrypt ==0.5.0 - - sdl2 ==2.1.3.1 - - secp256k1 ==0.4.6 + - sdl2 ==2.2.0 + - sdl2-gfx ==0.2 + - sdl2-image ==2.0.0 + - sdl2-mixer ==0.1 - securemem ==0.1.9 - SegmentTree ==0.3 - semigroupoid-extras ==5 @@ -1532,19 +1689,21 @@ default-package-overrides: - seqalign ==0.2.0.4 - seqloc ==0.6.1.1 - serf ==0.1.1.0 - - servant ==0.8.1 + - servant ==0.9.1.1 - servant-aeson-specs ==0.5.2.0 + - servant-auth-cookie ==0.4.3.2 - servant-blaze ==0.7.1 - servant-cassava ==0.8 - - servant-client ==0.8.1 - - servant-docs ==0.8.1 - - servant-foreign ==0.8.1 - - servant-js ==0.8.1 + - servant-client ==0.9.1.1 + - servant-docs ==0.9.1.1 + - servant-elm ==0.4.0.0 + - servant-foreign ==0.9.1.1 + - servant-js ==0.9.1 - servant-JuicyPixels ==0.3.0.2 - servant-lucid ==0.7.1 - servant-mock ==0.8.1.1 - - servant-purescript ==0.3.1.5 - - servant-server ==0.8.1 + - servant-purescript ==0.6.0.0 + - servant-server ==0.9.1.1 - servant-subscriber ==0.5.0.3 - servant-swagger ==1.1.2 - servant-swagger-ui ==0.2.2.2.2.8 @@ -1563,15 +1722,15 @@ default-package-overrides: - shake-language-c ==0.10.0 - shakespeare ==2.0.12.1 - shell-conduit ==4.5.2 - - shelly ==1.6.8.1 - shortcut-links ==0.4.2.0 - should-not-typecheck ==2.1.0 - - show-type ==0.1.1 + - show-prettyprint ==0.1.2 + - sibe ==0.2.0.4 - signal ==0.1.0.3 - silently ==1.2.5 - simple ==0.11.1 - simple-download ==0.0.2 - - simple-log ==0.4.0 + - simple-log ==0.5.1 - simple-reflect ==0.3.2 - simple-sendfile ==0.2.25 - simple-session ==0.10.1.1 @@ -1582,12 +1741,12 @@ default-package-overrides: - siphash ==1.0.3 - skein ==1.0.9.4 - skeletons ==0.4.0 + - skylighting ==0.1.1.5 - slave-thread ==1.0.2 - slug ==0.1.6 - smallcaps ==0.6.0.4 - smallcheck ==1.1.1 - smoothie ==0.4.2.6 - - smsaero ==0.6.2 - smtLib ==1.0.8 - smtp-mail ==0.1.4.6 - snap-core ==1.0.1.0 @@ -1596,34 +1755,36 @@ default-package-overrides: - soap ==0.2.3.3 - soap-openssl ==0.1.0.2 - soap-tls ==0.1.1.2 - - socket ==0.6.1.0 + - socket ==0.7.0.0 + - socket-activation ==0.1.0.2 - socks ==0.5.5 - - solga ==0.1.0.1 + - solga ==0.1.0.2 - solga-swagger ==0.1.0.2 - sorted-list ==0.2.0.0 - sourcemap ==0.1.6 + - sparkle ==0.4.0.2 + - sparse-linear-algebra ==0.2.2.0 - spdx ==0.2.1.0 - speculation ==1.5.0.3 - - speedy-slice ==0.1.5 + - speedy-slice ==0.3.0 - sphinx ==0.6.0.2 - - Spintax ==0.1.0.1 + - Spintax ==0.3.1 - splice ==0.6.1.1 - split ==0.2.3.1 - - Spock ==0.11.0.0 - - Spock-api ==0.11.0.0 - - Spock-api-server ==0.11.0.0 - - Spock-core ==0.11.0.0 + - Spock ==0.12.0.0 + - Spock-api ==0.12.0.0 + - Spock-api-server ==0.12.0.0 + - Spock-core ==0.12.0.0 - Spock-lucid ==0.3.0.0 - Spock-worker ==0.3.1.0 - spool ==0.1 - spoon ==0.3.1 - sql-words ==0.1.4.1 - sqlite-simple ==0.4.12.1 + - sqlite-simple-errors ==0.6.0.0 - srcloc ==0.5.1.0 - - stache ==0.1.8 - - stack-run-auto ==0.1.1.4 - - stackage-curator ==0.14.3 - - stackage-types ==1.2.0 + - stache ==0.2.0 + - stack-type ==0.1.0.0 - state-plus ==0.1.2 - stateref ==0.3 - statestack ==0.2.0.5 @@ -1631,24 +1792,28 @@ default-package-overrides: - stateWriter ==0.2.8 - static-canvas ==0.2.0.3 - statistics ==0.13.3.0 + - stb-image-redux ==0.2.1.0 + - stemmer ==0.5.2 - stm ==2.4.4.1 - stm-chans ==3.0.0.4 - stm-conduit ==3.0.0 - stm-containers ==0.2.15 - stm-delay ==0.1.1.1 + - stm-extras ==0.1.0.1 - stm-stats ==0.2.0.0 - - STMonadTrans ==0.3.4 + - stm-supply ==0.2.0.0 + - STMonadTrans ==0.4.3 - stopwatch ==0.1.0.4 - storable-complex ==0.2.2 - storable-endian ==0.2.6 - storable-record ==0.0.3.1 - - store ==0.2.1.2 - - store-core ==0.2.0.2 - Strafunski-StrategyLib ==5.0.0.10 - - stratosphere ==0.1.6 + - stratosphere ==0.4.0 - streaming ==0.1.4.5 - streaming-bytestring ==0.1.4.6 - streaming-commons ==0.1.17 + - streaming-utils ==0.1.4.7 + - streaming-wai ==0.1.1 - streamproc ==1.6.2 - streams ==3.3 - strict ==0.3.2 @@ -1661,15 +1826,15 @@ default-package-overrides: - stringable ==0.1.3 - stringbuilder ==0.5.0 - stringsearch ==0.3.6.6 - - stripe-core ==2.1.0 - strive ==3.0.2 - - stylish-haskell ==0.6.1.0 + - stylish-haskell ==0.7.1.0 - success ==0.2.6 - sundown ==0.6 + - superbuffer ==0.2.0.1 - svg-builder ==0.1.0.2 - - svg-tree ==0.5.1.2 - - SVGFonts ==1.5.0.1 - - swagger ==0.2.2 + - svg-tree ==0.6 + - SVGFonts ==1.6.0.1 + - swagger ==0.3.0 - swagger2 ==2.1.3 - syb ==0.6 - syb-with-class ==0.6.1.7 @@ -1683,17 +1848,22 @@ default-package-overrides: - tabular ==0.2.2.7 - tagged ==0.8.5 - tagged-binary ==0.2.0.0 + - tagged-identity ==0.1.1 - taggy ==0.2.0 - taggy-lens ==0.1.2 - tagshare ==0.0 - tagsoup ==0.14 - tagstream-conduit ==0.5.5.3 - tar ==0.5.0.3 + - tar-conduit ==0.1.0 - tardis ==0.4.1.0 - tasty ==0.11.1 - tasty-ant-xml ==1.0.4 + - tasty-auto ==0.1.0.1 - tasty-dejafu ==0.3.0.2 + - tasty-discover ==1.1.0 - tasty-expected-failure ==0.11.0.4 + - tasty-fail-fast ==0.0.2 - tasty-golden ==2.3.1.1 - tasty-hspec ==1.1.3.1 - tasty-html ==0.4.1.1 @@ -1704,16 +1874,21 @@ default-package-overrides: - tasty-rerun ==1.1.6 - tasty-silver ==3.1.9 - tasty-smallcheck ==0.8.1 + - tasty-tap ==0.0.4 - tasty-th ==0.1.4 + - Taxonomy ==1.0.2 - TCache ==0.12.0 - - tcp-streams ==0.4.0.0 + - tce-conf ==1.3 + - tcp-streams ==0.6.0.0 + - tcp-streams-openssl ==0.6.0.0 + - telegram-api ==0.6.0.0 - template ==0.2.0.10 - temporary ==1.2.0.4 - temporary-rc ==1.2.0.3 - - terminal-progress-bar ==0.0.1.4 + - terminal-progress-bar ==0.1.1 - terminal-size ==0.3.2.1 - terminfo ==0.4.0.2 - - test-fixture ==0.4.2.0 + - test-fixture ==0.5.0.0 - test-framework ==0.8.1.1 - test-framework-hunit ==0.3.0.2 - test-framework-quickcheck2 ==0.3.0.3 @@ -1721,20 +1896,23 @@ default-package-overrides: - test-framework-th ==0.2.4 - test-simple ==0.1.9 - testing-feat ==0.4.0.3 - - texmath ==0.8.6.7 + - texmath ==0.9.1 - text ==1.2.2.1 - text-all ==0.3.0.2 - text-binary ==0.2.1.1 - text-conversions ==0.3.0 - text-format ==0.3.1.1 + - text-generic-pretty ==1.2.1 - text-icu ==0.7.0.1 - text-ldap ==0.1.1.8 - text-manipulate ==0.2.0.1 - - text-metrics ==0.1.0 + - text-metrics ==0.2.0 - text-postgresql ==0.0.2.2 - text-region ==0.1.0.1 - - text-show ==3.4 - - text-show-instances ==3.4 + - text-show ==3.4.1.1 + - text-show-instances ==3.5 + - text-zipper ==0.10 + - textlocal ==0.1.0.5 - tf-random ==0.5 - th-data-compat ==0.0.2.2 - th-desugar ==1.6 @@ -1743,13 +1921,13 @@ default-package-overrides: - th-lift ==0.7.6 - th-lift-instances ==0.1.11 - th-orphans ==0.13.3 - - th-printf ==0.3.1 - th-reify-compat ==0.0.1.1 - th-reify-many ==0.1.6 - th-to-exp ==0.0.1.0 - - th-utilities ==0.2.0.1 - these ==0.7.3 + - thread-local-storage ==0.1.1 - threads ==0.5.1.4 + - threepenny-gui ==0.7.0.1 - through-text ==0.1.0.0 - thumbnail-plus ==1.0.5 - thyme ==0.3.5.5 @@ -1762,14 +1940,17 @@ default-package-overrides: - timelens ==0.2.0.2 - timemap ==0.0.4 - timerep ==2.0.0.2 + - timespan ==0.3.0.0 - timezone-olson ==0.1.7 - timezone-series ==0.1.6.1 - tinylog ==0.14.0 - tinytemplate ==0.1.2.0 + - titlecase ==0.1.0.3 - tls ==1.3.9 - tls-debug ==0.4.4 - token-bucket ==0.1.0.1 - tostring ==0.2.1.1 + - tracy ==0.1.4.0 - transformers-base ==0.4.4 - transformers-compat ==0.5.1.4 - transformers-lift ==0.1.0.1 @@ -1777,30 +1958,30 @@ default-package-overrides: - transient-universe ==0.3.5.1 - traverse-with-class ==0.2.0.4 - tree-fun ==0.8.1.0 - - tree-view ==0.4 - - tries ==0.0.4 - trifecta ==1.6.2.1 - true-name ==0.1.0.2 - ttrie ==0.1.2.1 - - tttool ==1.6.1.2 + - tttool ==1.7.0.1 - tuple ==0.3.0.2 - tuple-th ==0.2.5 - tuples-homogenous-h98 ==0.1.1.0 - - turtle ==1.2.8 + - turtle ==1.3.1 - turtle-options ==0.1.0.4 - - twitter-conduit ==0.2.1 - twitter-feed ==0.2.0.11 - - twitter-types ==0.7.2.2 - - twitter-types-lens ==0.7.2 - type-aligned ==0.9.6 + - type-assertions ==0.1.0.0 - type-eq ==0.5 - type-fun ==0.1.1 + - type-level-kv-list ==1.1.0 - type-level-numbers ==0.1.1.1 - type-list ==0.5.0.0 - - type-spec ==0.2.0.0 + - type-operators ==0.1.0.4 + - type-spec ==0.3.0.1 + - TypeCompose ==0.9.12 - typed-process ==0.1.0.0 - typelits-witnesses ==0.2.3.0 - typography-geometry ==1.0.0.1 + - tz ==0.1.2.1 - tzdata ==0.1.20161123.0 - ua-parser ==0.7.3 - uglymemo ==0.1.0.1 @@ -1809,15 +1990,13 @@ default-package-overrides: - unbounded-delays ==0.1.0.9 - uncertain ==0.3.1.0 - unexceptionalio ==0.3.0 - - unfoldable ==0.8.4 - - unfoldable-restricted ==0.0.2 - unicode-show ==0.1.0.2 - - unicode-transforms ==0.1.0.1 + - unicode-transforms ==0.2.1 - unification-fd ==0.10.0.1 - union ==0.1.1.1 - union-find ==0.2 - uniplate ==1.6.12 - - unit-constraint ==0.0.0 + - Unique ==0.4.6.1 - units ==2.4 - units-defs ==2.0.1.1 - units-parser ==0.1.0.0 @@ -1831,9 +2010,11 @@ default-package-overrides: - unix-compat ==0.4.3.1 - unix-time ==0.3.7 - Unixutils ==1.54.1 + - unlit ==0.4.0.0 - unordered-containers ==0.2.7.2 - uri-bytestring ==0.2.2.1 - uri-encode ==1.5.0.5 + - uri-templater ==0.2.1.0 - url ==2.1.3 - urlpath ==5.0.0.1 - userid ==0.1.2.8 @@ -1850,9 +2031,7 @@ default-package-overrides: - uuid-types ==1.0.3 - vado ==0.0.8 - validate-input ==0.4.0.0 - - validation ==0.5.4 - - validity ==0.3.1.1 - - varying ==0.5.0.3 + - varying ==0.7.0.3 - vault ==0.3.0.6 - vcswrapper ==0.1.5 - vector ==0.11.0.0 @@ -1860,29 +2039,33 @@ default-package-overrides: - vector-binary-instances ==0.2.3.4 - vector-buffer ==0.4.1 - vector-fftw ==0.1.3.7 - - vector-instances ==3.3.1 + - vector-instances ==3.4 + - vector-sized ==0.5.1.0 - vector-space ==0.10.4 + - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.6 - vectortiles ==1.2.0.2 - versions ==3.0.0 - vhd ==0.2.2 - - ViennaRNAParser ==1.2.9 + - ViennaRNAParser ==1.3.2 + - viewprof ==0.0.0.1 - vinyl ==0.5.3 - vinyl-utils ==0.3.0.0 - void ==0.7.1 - - vty ==5.11.3 + - vty ==5.15 - wai ==3.2.1.1 - wai-app-static ==3.1.6.1 - wai-conduit ==3.0.0.3 - wai-cors ==0.2.5 - wai-eventsource ==3.0.0 - wai-extra ==3.0.19.1 + - wai-handler-launch ==3.0.2.2 - wai-logger ==2.3.0 - wai-middleware-caching ==0.1.0.2 - wai-middleware-caching-lru ==0.1.0.0 - wai-middleware-caching-redis ==0.2.0.0 - wai-middleware-consul ==0.1.0.2 - - wai-middleware-content-type ==0.4.1 + - wai-middleware-content-type ==0.5.0.1 - wai-middleware-crowd ==0.1.4.2 - wai-middleware-metrics ==0.2.3 - wai-middleware-prometheus ==0.1.0.1 @@ -1890,7 +2073,9 @@ default-package-overrides: - wai-middleware-throttle ==0.2.1.0 - wai-middleware-verbs ==0.3.2 - wai-predicates ==0.9.0 - - wai-request-spec ==0.10.2.4 + - wai-route ==0.3.1.1 + - wai-routes ==0.9.10 + - wai-routing ==0.13.0 - wai-session ==0.3.2 - wai-session-postgresql ==0.2.1.0 - wai-transformers ==0.0.7 @@ -1898,6 +2083,9 @@ default-package-overrides: - waitra ==0.0.4.0 - warp ==3.2.11 - warp-tls ==3.2.3 + - wave ==0.1.4 + - wavefront ==0.7.0.2 + - wavefront-obj ==0.1.0.1 - web-plugins ==0.2.9 - web-routes ==0.27.11 - web-routes-boomerang ==0.28.4.2 @@ -1911,32 +2099,42 @@ default-package-overrides: - webkitgtk3-javascriptcore ==0.14.2.1 - webpage ==0.0.4 - webrtc-vad ==0.1.0.3 - - websockets ==0.9.8.2 + - websockets ==0.10.0.0 + - websockets-snap ==0.10.2.0 - weigh ==0.0.3 - - werewolf ==1.5.1.1 - - werewolf-slack ==1.0.2.0 - - wikicfp-scraper ==0.1.0.7 + - wikicfp-scraper ==0.1.0.8 + - wild-bind ==0.1.0.3 + - wild-bind-indicator ==0.1.0.1 + - wild-bind-task-x11 ==0.1.0.1 + - wild-bind-x11 ==0.1.0.6 - Win32 ==2.3.1.1 - Win32-extras ==0.2.0.1 - Win32-notify ==0.3.0.1 + - wire-streams ==0.1.1.0 - with-location ==0.1.0 - withdependencies ==0.2.4 - witherable ==0.1.3.3 + - witness ==0.4 - wizards ==1.0.2 - wl-pprint ==1.2 + - wl-pprint-annotated ==0.0.1.4 + - wl-pprint-console ==0.1.0.1 - wl-pprint-extras ==3.5.0.5 - wl-pprint-terminfo ==3.7.1.4 - wl-pprint-text ==1.1.1.0 - word-trie ==0.3.0 + - word24 ==2.0.1 - word8 ==0.1.2 - wordpass ==1.0.0.7 - Workflow ==0.8.3 - wrap ==0.0.0 - - wreq ==0.4.1.0 + - writer-cps-full ==0.1.0.0 + - writer-cps-lens ==0.1.0.0 + - writer-cps-morph ==0.1.0.1 - writer-cps-mtl ==0.1.1.2 - writer-cps-transformers ==0.1.1.2 - wuss ==1.1.3 - - X11 ==1.6.1.2 + - X11 ==1.8 - x509 ==1.6.5 - x509-store ==1.6.2 - x509-system ==1.6.4 @@ -1947,43 +2145,41 @@ default-package-overrides: - xenstore ==0.1.1 - xhtml ==3000.2.1 - xlsior ==0.1.0.1 - - xlsx ==0.2.4 - - xlsx-tabular ==0.1.0.1 + - xlsx ==0.4.2 + - xlsx-tabular ==0.2.2 - xml ==1.3.14 - - xml-conduit ==1.3.5 + - xml-conduit ==1.4.0.3 - xml-conduit-parse ==0.3.1.0 - xml-conduit-writer ==0.1.1.1 - xml-hamlet ==0.4.1 + - xml-html-qq ==0.1.0.1 - xml-lens ==0.1.6.3 + - xml-picklers ==0.3.6 - xml-to-json-fast ==2.0.0 - xml-types ==0.3.6 - xmlgen ==0.6.2.1 - xmlhtml ==0.2.3.5 - - xmonad ==0.12 + - xmonad ==0.13 - xss-sanitize ==0.3.5.7 - yackage ==0.8.1 - - yahoo-finance-api ==0.1.0.0 + - yahoo-finance-api ==0.2.0.1 - yaml ==0.8.21.2 - Yampa ==0.10.5 - YampaSynth ==0.2 - - yarr ==1.4.0.2 - yes-precure5-command ==5.5.3 - yesod ==1.4.4 - yesod-auth ==1.4.16 - yesod-auth-account ==1.4.3 - yesod-auth-basic ==0.1.0.2 - - yesod-auth-hashdb ==1.5.1.3 - - yesod-auth-oauth2 ==0.2.2 + - yesod-auth-hashdb ==1.6.0.1 - yesod-bin ==1.5.1 - yesod-core ==1.4.31 - yesod-eventsource ==1.4.0.1 - yesod-fay ==0.8.0 - - yesod-fb ==0.3.4 - yesod-form ==1.4.10 - yesod-form-richtext ==0.1.0.0 - yesod-gitrepo ==0.2.1.0 - yesod-gitrev ==0.1.0.0 - - yesod-job-queue ==0.3.0.1 - yesod-newsfeed ==1.6 - yesod-persistent ==1.4.1.1 - yesod-sitemap ==1.4.0.1 @@ -1992,21 +2188,30 @@ default-package-overrides: - yesod-table ==2.0.3 - yesod-test ==1.5.4.1 - yesod-websockets ==0.2.5 - - yi ==0.12.6 - - yi-fuzzy-open ==0.1.0.1 - - yi-language ==0.2.1 - - yi-rope ==0.7.0.2 + - yi-core ==0.13.5 + - yi-frontend-vty ==0.13.5 + - yi-fuzzy-open ==0.13.5 + - yi-ireader ==0.13.5 + - yi-keymap-cua ==0.13.5 + - yi-keymap-emacs ==0.13.5 + - yi-keymap-vim ==0.13.5 + - yi-language ==0.13.5 + - yi-misc-modes ==0.13.5 + - yi-mode-haskell ==0.13.5 + - yi-mode-javascript ==0.13.5 + - yi-rope ==0.8 + - yi-snippet ==0.13.5 - yjtools ==0.9.18 - zero ==0.1.4 - zeromq4-haskell ==0.6.5 - - zip ==0.1.5 + - zip ==0.1.7 - zip-archive ==0.3.0.5 - zippers ==0.2.2 - zlib ==0.6.1.2 - zlib-bindings ==0.1.1.5 - zlib-lens ==0.1.2.1 - - zoom-refs ==0.0.0.1 - zot ==0.0.3 + - ztail ==1.2 extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index cdf68fd0d0d..07e1d55a1ae 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -679,54 +679,6 @@ self: { }) {}; "Agda" = callPackage - ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, EdisonAPI - , EdisonCore, edit-distance, emacs, equivalence, filemanip - , filepath, geniplate-mirror, happy, hashable, hashtables - , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty - , process, QuickCheck, strict, template-haskell, text, time - , transformers, transformers-compat, unordered-containers, xhtml - , zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.5.1.1"; - sha256 = "563b8063fc94349b56ae1867e973f1751db0e9a8997af7ede93d3c3a8c66a6b0"; - revision = "1"; - editedCabalFile = "388327fd9b4f98671a05ba6aa873d8161133d71e6234fcdb208882eda9fd161b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary boxes bytestring containers data-hash deepseq - directory EdisonAPI EdisonCore edit-distance equivalence filepath - geniplate-mirror hashable hashtables haskeline haskell-src-exts - monadplus mtl parallel pretty process QuickCheck strict - template-haskell text time transformers transformers-compat - unordered-containers xhtml zlib - ]; - libraryToolDepends = [ alex cpphs happy ]; - executableHaskellDepends = [ - base binary containers directory filemanip filepath - haskell-src-exts mtl process - ]; - executableToolDepends = [ emacs ]; - postInstall = '' - files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $out/bin/agda $f - done - for f in "''${files[@]}" ; do - $out/bin/agda -c --no-main $f - done - $out/bin/agda-mode compile - ''; - homepage = "http://wiki.portal.chalmers.se/agda/"; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; - }) {inherit (pkgs) emacs;}; - - "Agda_2_5_2" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring , containers, cpphs, data-hash, deepseq, directory, EdisonCore , edit-distance, emacs, equivalence, filepath, geniplate-mirror @@ -767,7 +719,6 @@ self: { homepage = "http://wiki.portal.chalmers.se/agda/"; description = "A dependently typed functional programming language and proof assistant"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ abbradar ]; }) {inherit (pkgs) emacs;}; @@ -2559,6 +2510,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart_1_8_2" = callPackage + ({ mkDerivation, array, base, colour, data-default-class, lens, mtl + , old-locale, operational, time, vector + }: + mkDerivation { + pname = "Chart"; + version = "1.8.2"; + sha256 = "8442c16959e2a46355418b82c0c6fc3174d04b41ea6e2e320c56588a563be28d"; + libraryHaskellDepends = [ + array base colour data-default-class lens mtl old-locale + operational time vector + ]; + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "A library for generating 2D Charts and Plots"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time @@ -2576,6 +2545,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart-cairo_1_8_2" = callPackage + ({ mkDerivation, array, base, cairo, Chart, colour + , data-default-class, lens, mtl, old-locale, operational, time + }: + mkDerivation { + pname = "Chart-cairo"; + version = "1.8.2"; + sha256 = "7cd8ba9da4c43ff4d6ba468d65e91b7239a0543038996a9a626818dc1a408fc1"; + libraryHaskellDepends = [ + array base cairo Chart colour data-default-class lens mtl + old-locale operational time + ]; + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "Cairo backend for Charts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib @@ -2597,14 +2584,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Chart-diagrams_1_8_2" = callPackage + ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour + , containers, data-default-class, diagrams-core, diagrams-lib + , diagrams-postscript, diagrams-svg, lens, mtl, old-locale + , operational, svg-builder, SVGFonts, text, time + }: + mkDerivation { + pname = "Chart-diagrams"; + version = "1.8.2"; + sha256 = "ca181dec04bac1029101dd75951f48710ebc42f5333e06c57943e3245bba9f41"; + libraryHaskellDepends = [ + base blaze-markup bytestring Chart colour containers + data-default-class diagrams-core diagrams-lib diagrams-postscript + diagrams-svg lens mtl old-locale operational svg-builder SVGFonts + text time + ]; + homepage = "https://github.com/timbod7/haskell-chart/wiki"; + description = "Diagrams backend for Charts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Chart-gtk" = callPackage ({ mkDerivation, array, base, cairo, Chart, Chart-cairo, colour , data-default-class, gtk, mtl, old-locale, time }: mkDerivation { pname = "Chart-gtk"; - version = "1.8.1"; - sha256 = "964a8dd5b23d86f4a0d91fde5d1144fba8dd29d2810a05864ce0e795c2f7056a"; + version = "1.8.2"; + sha256 = "20c97819a35e0983af3e27e196c593e1bb1262f7dda86f4a874485e6042274c9"; libraryHaskellDepends = [ array base cairo Chart Chart-cairo colour data-default-class gtk mtl old-locale time @@ -2771,38 +2780,20 @@ self: { }) {}; "ClustalParser" = callPackage - ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec - , vector - }: - mkDerivation { - pname = "ClustalParser"; - version = "1.1.4"; - sha256 = "d32db29dd58b9fe305b76dbdde6d0b2b328a526b63872e02177600f6832cc48f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base parsec vector ]; - executableHaskellDepends = [ base cmdargs either-unwrap ]; - testHaskellDepends = [ base hspec parsec ]; - description = "Libary for parsing Clustal tools output"; - license = "GPL"; - }) {}; - - "ClustalParser_1_2_0" = callPackage ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text , vector }: mkDerivation { pname = "ClustalParser"; - version = "1.2.0"; - sha256 = "e444b4780a976d13178ba0d47d34ff1c7e1222077d2ec6c81f4370dce58a8ec8"; + version = "1.2.1"; + sha256 = "0034a9fdca3e4bcb70edb961536ee4acb162fec0ab1b2c67108598bfcd75879d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base parsec text vector ]; executableHaskellDepends = [ base cmdargs either-unwrap ]; - testHaskellDepends = [ base hspec parsec ]; + testHaskellDepends = [ base hspec parsec text ]; description = "Libary for parsing Clustal tools output"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.gpl3; }) {}; "Coadjute" = callPackage @@ -4420,6 +4411,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Earley_0_12_0_0" = callPackage + ({ mkDerivation, base, ListLike, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "Earley"; + version = "0.12.0.0"; + sha256 = "98657d247c04f7f37dc3b7e03a9bf6c0ea20e945ddac0aa0406ba7c464723337"; + libraryHaskellDepends = [ base ListLike ]; + testHaskellDepends = [ + base QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Parsing all context-free grammars using Earley's algorithm"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Ebnf2ps" = callPackage ({ mkDerivation, array, base, containers, directory, happy , old-time, unix @@ -8254,19 +8262,6 @@ self: { }) {}; "HUnit" = callPackage - ({ mkDerivation, base, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.3.1.2"; - sha256 = "badebf99ae5a4982cdf2f8932f080e349240dc2b75c40e75ce2518ea086c5381"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base deepseq filepath ]; - homepage = "https://github.com/hspec/HUnit#readme"; - description = "A unit testing framework for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HUnit_1_5_0_0" = callPackage ({ mkDerivation, base, call-stack, deepseq, filepath }: mkDerivation { pname = "HUnit"; @@ -8277,7 +8272,6 @@ self: { homepage = "https://github.com/hspec/HUnit#readme"; description = "A unit testing framework for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HUnit-Diff" = callPackage @@ -8316,19 +8310,6 @@ self: { }) {}; "HUnit-approx" = callPackage - ({ mkDerivation, base, HUnit }: - mkDerivation { - pname = "HUnit-approx"; - version = "1.0"; - sha256 = "618f492b3f55d7a2c332d2e3916b2cd79af1229421ad64e12a514babd896736b"; - libraryHaskellDepends = [ base HUnit ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/goldfirere/HUnit-approx"; - description = "Approximate equality for floating point numbers with HUnit"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "HUnit-approx_1_1" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { pname = "HUnit-approx"; @@ -8339,7 +8320,6 @@ self: { homepage = "https://github.com/goldfirere/HUnit-approx"; description = "Approximate equality for floating point numbers with HUnit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HXMPP" = callPackage @@ -8389,16 +8369,16 @@ self: { }) {}; "HaLeX" = callPackage - ({ mkDerivation, base, mtl }: + ({ mkDerivation, base, HUnit, mtl, QuickCheck }: mkDerivation { pname = "HaLeX"; - version = "1.2.2"; - sha256 = "8b21e5a3c5ff7f2d195f667ae4892ffcdc626fa32ff3e22c1fb0f5b5676b9c95"; + version = "1.2.6"; + sha256 = "5b4e22ecf647362f9d3f1908e9c211f34539c037881701f01b02414130fb7dd7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base mtl ]; + libraryHaskellDepends = [ base HUnit mtl QuickCheck ]; homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html"; - description = "HaLeX enables modelling, manipulation and animation of regular languages"; + description = "HaLeX enables modelling, manipulation and visualization of regular languages"; license = stdenv.lib.licenses.publicDomain; }) {}; @@ -8429,43 +8409,33 @@ self: { }) {}; "HaRe" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-helper, containers - , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod - , ghc-paths, ghc-prim, ghc-syb-utils, gitrev, hslogger, hspec - , HUnit, monad-control, monoid-extras, mtl, old-time - , optparse-applicative, optparse-simple, parsec, pretty, process - , QuickCheck, rosezipper, semigroups, silently - , Strafunski-StrategyLib, stringbuilder, syb, syz, time - , transformers, transformers-base + ({ 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.3.0"; - sha256 = "11e302f5379fe88aa8740a886f321e3e14c29b0b39417ab0621f3a070c1edcd2"; + version = "0.8.4.0"; + sha256 = "733272478f0aa195c86a344b548bdfdc453c41eaf5b9bc482e5a8fa8f81615fb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base + base cabal-helper containers directory filepath ghc ghc-exactprint + ghc-mod ghc-syb-utils hslogger monad-control mtl + Strafunski-StrategyLib syb syz ]; executableHaskellDepends = [ - array base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils gitrev - hslogger monad-control monoid-extras mtl old-time - optparse-applicative optparse-simple parsec pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base + base Cabal ghc-mod gitrev mtl optparse-applicative optparse-simple ]; testHaskellDepends = [ - base Cabal cabal-helper containers deepseq Diff directory filepath - ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils - hslogger hspec HUnit monad-control monoid-extras mtl old-time - process QuickCheck rosezipper semigroups silently - Strafunski-StrategyLib stringbuilder syb syz time transformers - transformers-base + 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"; @@ -10065,6 +10035,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Jdh" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "Jdh"; + version = "0.1.0.0"; + sha256 = "df460a97cde668b6d170ddcbfe547e146de56524108a4e811c6ca7bb26b4e864"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/brunoczim/Json-Data-for-Haskell"; + description = "A Json implementation for Haskell, with JavaScript Values and Encoding/Decoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "JsContracts" = callPackage ({ mkDerivation, base, containers, directory, filepath, mtl, parsec , pretty, syb, WebBits, WebBits-Html @@ -11194,8 +11176,8 @@ self: { ({ mkDerivation, base, bytestring, hidapi, mtl }: mkDerivation { pname = "MBot"; - version = "0.1.1.0"; - sha256 = "6752fb112e01c02273ef55254b0f9cb16bbff4954592372ba9c152d9cb41dc12"; + version = "0.1.2.0"; + sha256 = "5edf898d58cfd9fbe4774993db794967e0af4c4202c8e43c788c05ef90a2f223"; libraryHaskellDepends = [ base bytestring hidapi mtl ]; description = "Haskell interface for controlling the mBot educational robot"; license = stdenv.lib.licenses.gpl3; @@ -11445,20 +11427,6 @@ self: { }) {}; "MemoTrie" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "MemoTrie"; - version = "0.6.4"; - sha256 = "4238c8f7ea1ecd2497d0a948493acbdc47728b2528b6e7841ef064b783d68b1c"; - revision = "1"; - editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/conal/MemoTrie"; - description = "Trie-based memo functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "MemoTrie_0_6_7" = callPackage ({ mkDerivation, base, newtype-generics }: mkDerivation { pname = "MemoTrie"; @@ -11468,7 +11436,6 @@ self: { homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MetaHDBC" = callPackage @@ -11801,34 +11768,18 @@ self: { }) {}; "MonadRandom" = callPackage - ({ mkDerivation, base, mtl, random, transformers - , transformers-compat - }: - mkDerivation { - pname = "MonadRandom"; - version = "0.4.2.3"; - sha256 = "de40b12a70ec6425a9e54b33e2ac652e14d7c005a3b46d701d1e5696b98636c0"; - libraryHaskellDepends = [ - base mtl random transformers transformers-compat - ]; - description = "Random-number generation monad"; - license = "unknown"; - }) {}; - - "MonadRandom_0_5" = callPackage ({ mkDerivation, base, fail, mtl, primitive, random, transformers , transformers-compat }: mkDerivation { pname = "MonadRandom"; - version = "0.5"; - sha256 = "e239800faed1142b348d1125232ee1266209865ff6aa09516d4d516bec88c3dc"; + version = "0.5.1"; + sha256 = "9e3f0f92807285302036dc504066ae6d968c8b0b4c25d9360888f31fe1730d87"; libraryHaskellDepends = [ base fail mtl primitive random transformers transformers-compat ]; description = "Random-number generation monad"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadRandomLazy" = callPackage @@ -14083,25 +14034,6 @@ self: { }) {}; "QuickCheck" = callPackage - ({ mkDerivation, base, containers, random, template-haskell - , test-framework, tf-random, transformers - }: - mkDerivation { - pname = "QuickCheck"; - version = "2.8.2"; - sha256 = "98c64de1e2dbf801c54dcdcb8ddc33b3569e0da38b39d711ee6ac505769926aa"; - libraryHaskellDepends = [ - base containers random template-haskell tf-random transformers - ]; - testHaskellDepends = [ - base containers template-haskell test-framework - ]; - homepage = "https://github.com/nick8325/quickcheck"; - description = "Automatic testing of Haskell programs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "QuickCheck_2_9_2" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: @@ -14118,7 +14050,6 @@ self: { 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 @@ -14417,8 +14348,8 @@ self: { }: mkDerivation { pname = "RNAlien"; - version = "1.3.0"; - sha256 = "43d4b160cab7a7c39e4c21744637752beb527ebcb9f12ca674c18fb84135dfab"; + version = "1.3.1"; + sha256 = "2e928bb739cba57427fc3a24780b8b36c8eaf6a709e72dadfc637aab0a862fb3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -14607,22 +14538,6 @@ self: { }) {}; "Rasterific" = callPackage - ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity - , free, JuicyPixels, mtl, primitive, vector, vector-algorithms - }: - mkDerivation { - pname = "Rasterific"; - version = "0.6.1.1"; - sha256 = "1887b28b9921dfb2d4d64cb888e5febce17db828103a7e2aed0a978d9fa78665"; - libraryHaskellDepends = [ - base bytestring containers dlist FontyFruity free JuicyPixels mtl - primitive vector vector-algorithms - ]; - description = "A pure haskell drawing engine"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Rasterific_0_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity , free, JuicyPixels, mtl, primitive, transformers, vector , vector-algorithms @@ -14639,7 +14554,6 @@ self: { ]; description = "A pure haskell drawing engine"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ReadArgs" = callPackage @@ -14703,8 +14617,8 @@ self: { }: mkDerivation { pname = "RefSerialize"; - version = "0.3.1.4"; - sha256 = "dc38719d34a5e238dc7cda731f49a5367fc5a0bf7d4b1db44be5e2ac5a9781c2"; + version = "0.4.0"; + sha256 = "05b25eb1ab943d96119aa2acca678fc8f194c3411af521e3835f4de5c752bbb2"; libraryHaskellDepends = [ base binary bytestring containers hashtables stringsearch ]; @@ -15183,27 +15097,14 @@ self: { ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { pname = "STMonadTrans"; - version = "0.3.4"; - sha256 = "44935ff710369da1614e00a40dabea6ba3a4dd02959d7b0e5ed17a915c3f0210"; + version = "0.4.3"; + sha256 = "574fd56cf74036c20d00a09d815659dbbb0ae51c8103d00c93cd9558ad3322db"; libraryHaskellDepends = [ array base mtl ]; testHaskellDepends = [ array base Cabal mtl ]; description = "A monad transformer version of the ST monad"; license = stdenv.lib.licenses.bsd3; }) {}; - "STMonadTrans_0_4" = callPackage - ({ mkDerivation, array, base, Cabal, mtl }: - mkDerivation { - pname = "STMonadTrans"; - version = "0.4"; - sha256 = "518667c253184c8c5cf707564d117f67bb0fabf5f6ebe8b25400359d4a8a6200"; - libraryHaskellDepends = [ array base mtl ]; - testHaskellDepends = [ array base Cabal mtl ]; - description = "A monad transformer version of the ST monad"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "SVG2Q" = callPackage ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb , xml @@ -15224,24 +15125,6 @@ self: { }) {}; "SVGFonts" = callPackage - ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg - , containers, data-default-class, diagrams-core, diagrams-lib - , directory, parsec, split, text, tuple, vector, xml - }: - mkDerivation { - pname = "SVGFonts"; - version = "1.5.0.1"; - sha256 = "7b3431a70f94e89e78e1e28c5730060c5af522526ac7a1318b51de2c4d4c4ef4"; - libraryHaskellDepends = [ - attoparsec base blaze-markup blaze-svg containers - data-default-class diagrams-core diagrams-lib directory parsec - split text tuple vector xml - ]; - description = "Fonts from the SVG-Font format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "SVGFonts_1_6_0_1" = callPackage ({ mkDerivation, attoparsec, base, blaze-markup, blaze-svg , bytestring, cereal, cereal-vector, containers, data-default-class , diagrams-core, diagrams-lib, directory, parsec, split, text @@ -15258,7 +15141,6 @@ self: { ]; description = "Fonts from the SVG-Font format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SVGPath" = callPackage @@ -15974,18 +15856,6 @@ self: { }) {}; "Spintax" = callPackage - ({ mkDerivation, attoparsec, base, extra, mwc-random, text }: - mkDerivation { - pname = "Spintax"; - version = "0.1.0.1"; - sha256 = "bf749b240dcec32068ca1b94f34bfd824722f57c63c0c81473fd8ff88533dfe7"; - libraryHaskellDepends = [ attoparsec base extra mwc-random text ]; - homepage = "https://github.com/MichelBoucey/spintax"; - description = "Random text generation based on spintax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spintax_0_3_1" = callPackage ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }: mkDerivation { pname = "Spintax"; @@ -15997,38 +15867,9 @@ self: { homepage = "https://github.com/MichelBoucey/spintax"; description = "Random text generation based on spintax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, containers - , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect - , list-t, monad-control, mtl, reroute, resource-pool, resourcet - , Spock-core, stm, stm-containers, text, time, transformers - , transformers-base, unordered-containers, vault, wai, wai-extra - }: - mkDerivation { - pname = "Spock"; - version = "0.11.0.0"; - sha256 = "9dcc232e83860d28f44bd4f35a8b38e59330ada78a30c661aaddf244f4a5deb3"; - revision = "1"; - editedCabalFile = "22e12daad61dfaeefdbad563859bf8efe1ee38cf0be49cb18e954227d7e76eac"; - libraryHaskellDepends = [ - base base64-bytestring bytestring containers cryptonite focus - hashable http-types hvect list-t monad-control mtl reroute - resource-pool resourcet Spock-core stm stm-containers text time - transformers transformers-base unordered-containers vault wai - ]; - testHaskellDepends = [ - base bytestring hspec hspec-wai Spock-core stm text time - unordered-containers vault wai wai-extra - ]; - homepage = "https://www.spock.li"; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spock_0_12_0_0" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect , list-t, monad-control, mtl, reroute, resource-pool, resourcet @@ -16052,22 +15893,9 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-api" = callPackage - ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: - mkDerivation { - pname = "Spock-api"; - version = "0.11.0.0"; - sha256 = "993272b289d95f2e7e704b24d8297b63257b1434ec205faddf8a2ec7bc1aea29"; - libraryHaskellDepends = [ aeson base deepseq hvect reroute ]; - homepage = "https://www.spock.li"; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spock-api_0_12_0_0" = callPackage ({ mkDerivation, aeson, base, deepseq, hvect, reroute }: mkDerivation { pname = "Spock-api"; @@ -16077,7 +15905,6 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-api-ghcjs" = callPackage @@ -16098,18 +15925,6 @@ self: { }) {}; "Spock-api-server" = callPackage - ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: - mkDerivation { - pname = "Spock-api-server"; - version = "0.11.0.0"; - sha256 = "35d0fd72caed2bd4e2cc52d2a39b3af528845ec9bc58cf64dfe4b6ccd956ac3d"; - libraryHaskellDepends = [ base hvect mtl Spock-api Spock-core ]; - homepage = "https://www.spock.li"; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spock-api-server_0_12_0_0" = callPackage ({ mkDerivation, base, hvect, mtl, Spock-api, Spock-core }: mkDerivation { pname = "Spock-api-server"; @@ -16119,7 +15934,6 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-auth" = callPackage @@ -16136,32 +15950,6 @@ self: { }) {}; "Spock-core" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, cookie, directory, hashable, hspec - , hspec-wai, http-types, hvect, mtl, old-locale, path-pieces - , reroute, resourcet, stm, text, time, transformers - , unordered-containers, vault, wai, wai-extra, warp - }: - mkDerivation { - pname = "Spock-core"; - version = "0.11.0.0"; - sha256 = "d6339c4b8e5ac3a98e5545e3f4c64f1ff515c125ae9fb33d2176972e1244aa9a"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - cookie directory hashable http-types hvect mtl old-locale - path-pieces reroute resourcet stm text time transformers - unordered-containers vault wai wai-extra warp - ]; - testHaskellDepends = [ - base base64-bytestring bytestring hspec hspec-wai http-types - reroute text time transformers unordered-containers wai - ]; - homepage = "https://www.spock.li"; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "Spock-core_0_12_0_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , case-insensitive, containers, cookie, directory, hashable, hspec , hspec-wai, http-api-data, http-types, hvect, mtl, old-locale @@ -16185,7 +15973,6 @@ self: { homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-digestive" = callPackage @@ -16600,6 +16387,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "TCache_0_12_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory + , hashtables, mtl, old-time, RefSerialize, stm, text + }: + mkDerivation { + pname = "TCache"; + version = "0.12.1"; + sha256 = "f134b45fcdd127fa1a4214f01d44dc34e994fed137cec63f4c4ea632363ab7bd"; + libraryHaskellDepends = [ + base bytestring containers directory hashtables mtl old-time + RefSerialize stm text + ]; + description = "A Transactional cache with user-defined persistence"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "THEff" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -17591,18 +17395,6 @@ self: { }) {}; "ViennaRNAParser" = callPackage - ({ mkDerivation, base, hspec, parsec, process, transformers }: - mkDerivation { - pname = "ViennaRNAParser"; - version = "1.2.9"; - sha256 = "f4e8964ce0710a0461d49e790784a8b82579f4c6079c5732b7fe1ae09fefb219"; - libraryHaskellDepends = [ base parsec process transformers ]; - testHaskellDepends = [ base hspec parsec ]; - description = "Libary for parsing ViennaRNA package output"; - license = "GPL"; - }) {}; - - "ViennaRNAParser_1_3_2" = callPackage ({ mkDerivation, base, hspec, parsec, ParsecTools, process , transformers }: @@ -17616,7 +17408,6 @@ self: { testHaskellDepends = [ base hspec parsec ]; description = "Libary for parsing ViennaRNA package output"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Vulkan" = callPackage @@ -17942,14 +17733,14 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_5_0_0" = callPackage + "Win32_2_5_1_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 , msimg32, ntdll, shell32, shfolder, shlwapi, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.5.0.0"; - sha256 = "45d7fd5f251ba418d649100cfea9d924b7ef42a8c35df5bb373fd6dd687d2694"; + version = "2.5.1.0"; + sha256 = "84e1b1ee7e435ad4237d2f625114f205141988b964f42259b5e294066f31ca52"; libraryHaskellDepends = [ base bytestring filepath ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 ntdll shell32 shfolder shlwapi user32 @@ -18236,27 +18027,8 @@ self: { }: mkDerivation { pname = "X11"; - version = "1.6.1.2"; - sha256 = "5216d485f807bd53bf34fba170896a8930290a6ac28b8e611c28e751ad67f2cf"; - libraryHaskellDepends = [ base data-default ]; - librarySystemDepends = [ - libX11 libXext libXinerama libXrandr libXrender - ]; - homepage = "https://github.com/haskell-pkg-janitors/X11"; - description = "A binding to the X11 graphics library"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; - inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; - inherit (pkgs.xorg) libXrender;}; - - "X11_1_7" = callPackage - ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender - }: - mkDerivation { - pname = "X11"; - version = "1.7"; - sha256 = "9e7a67b9521fc0140b4804928f3821b6c3d3950fdc1d9c55478844dc4f57f5f4"; + version = "1.8"; + sha256 = "541b166aab1e05a92dc8f42a511d827e7aad373af12ae283b9df9982ccc09d8e"; libraryHaskellDepends = [ base data-default ]; librarySystemDepends = [ libX11 libXext libXinerama libXrandr libXrender @@ -18264,7 +18036,6 @@ self: { homepage = "https://github.com/xmonad/X11"; description = "A binding to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; @@ -19940,24 +19711,6 @@ self: { }) {}; "active" = callPackage - ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids - , semigroups, vector - }: - mkDerivation { - pname = "active"; - version = "0.2.0.10"; - sha256 = "0819b0ae7a690bba42f974ba3d1efb1b356919e0f9e278cb30653d022bce78b1"; - libraryHaskellDepends = [ - base lens linear semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base lens linear QuickCheck semigroupoids semigroups vector - ]; - description = "Abstractions for animation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "active_0_2_0_12" = callPackage ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids , semigroups, vector }: @@ -19973,7 +19726,6 @@ self: { ]; description = "Abstractions for animation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "activehs" = callPackage @@ -20301,34 +20053,6 @@ self: { }) {}; "aeson" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl - , QuickCheck, quickcheck-instances, scientific, syb, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "aeson"; - version = "0.11.3.0"; - sha256 = "f326fac57881c228d91f610a2c92f083a60e3830d9c7d35dfb0a16925c95ece9"; - libraryHaskellDepends = [ - attoparsec base bytestring containers deepseq dlist fail ghc-prim - hashable mtl scientific syb tagged template-haskell text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - attoparsec base base-orphans bytestring containers ghc-prim - hashable HUnit QuickCheck quickcheck-instances tagged - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; - homepage = "https://github.com/bos/aeson"; - description = "Fast JSON parsing and encoding"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aeson_1_0_2_1" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , base16-bytestring, bytestring, containers, deepseq, dlist , generic-deriving, ghc-prim, hashable, hashable-time, HUnit @@ -20357,7 +20081,6 @@ self: { homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson_1_1_0_0" = callPackage @@ -21262,6 +20985,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "airtable-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, hashable, lens, text + , unordered-containers, wreq + }: + mkDerivation { + pname = "airtable-api"; + version = "0.1.0.4"; + sha256 = "049949b130b19ee06c638494c95ca9b55fe3c071079a490ae10f01430c04b0dd"; + libraryHaskellDepends = [ + aeson base bytestring hashable lens text unordered-containers wreq + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/ooblahman/airtable-api"; + description = "Requesting and introspecting Tables within an Airtable project"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aivika" = callPackage ({ mkDerivation, array, base, containers, mtl, random, vector }: mkDerivation { @@ -21501,26 +21241,6 @@ self: { }) {}; "alex" = callPackage - ({ mkDerivation, array, base, containers, directory, happy, process - , QuickCheck - }: - mkDerivation { - pname = "alex"; - version = "3.1.7"; - sha256 = "89a1a13da6ccbeb006488d9574382e891cf7c0567752b330cc8616d748bf28d1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base containers directory QuickCheck - ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base process ]; - homepage = "http://www.haskell.org/alex/"; - description = "Alex is a tool for generating lexical analysers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "alex_3_2_1" = callPackage ({ mkDerivation, array, base, containers, directory, happy, process , QuickCheck }: @@ -21538,7 +21258,6 @@ self: { homepage = "http://www.haskell.org/alex/"; description = "Alex is a tool for generating lexical analysers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-meta" = callPackage @@ -22193,27 +21912,6 @@ self: { }) {}; "amazonka" = callPackage - ({ mkDerivation, amazonka-core, base, bytestring, conduit - , conduit-extra, directory, exceptions, http-conduit, ini, mmorph - , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text - , time, transformers, transformers-base, transformers-compat - }: - mkDerivation { - pname = "amazonka"; - version = "1.4.3"; - sha256 = "18aa7816d755df58a824fc252d34cb1f81c6cba2ca2a7194c3a3f0d630c26686"; - libraryHaskellDepends = [ - amazonka-core base bytestring conduit conduit-extra directory - exceptions http-conduit ini mmorph monad-control mtl resourcet - retry text time transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Comprehensive Amazon Web Services SDK"; - license = "unknown"; - }) {}; - - "amazonka_1_4_5" = callPackage ({ mkDerivation, amazonka-core, base, bytestring, conduit , conduit-extra, directory, exceptions, http-conduit, ini, mmorph , monad-control, mtl, resourcet, retry, tasty, tasty-hunit, text @@ -22232,29 +21930,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Comprehensive Amazon Web Services SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-apigateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-apigateway"; - version = "1.4.3"; - sha256 = "74fe95daa465255ad2a49f3f0b78242c5e1ec33d81d0e9dfffa833324894d948"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon API Gateway SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "amazonka-apigateway_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22274,24 +21952,6 @@ self: { }) {}; "amazonka-application-autoscaling" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-application-autoscaling"; - version = "1.4.3"; - sha256 = "5506a59b594355ab0e78f3e1c0f550bd5b2a858c4a0688732a4931e6ac096f6c"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Application Auto Scaling SDK"; - license = "unknown"; - }) {}; - - "amazonka-application-autoscaling_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22307,7 +21967,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-appstream" = callPackage @@ -22330,24 +21989,6 @@ self: { }) {}; "amazonka-autoscaling" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-autoscaling"; - version = "1.4.3"; - sha256 = "4a47502b75b54cae3ab3da1792f5862a1e726e551d25bc0ba54f7854a66fa3df"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Auto Scaling SDK"; - license = "unknown"; - }) {}; - - "amazonka-autoscaling_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22363,7 +22004,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Auto Scaling SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-budgets" = callPackage @@ -22386,24 +22026,6 @@ self: { }) {}; "amazonka-certificatemanager" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-certificatemanager"; - version = "1.4.3"; - sha256 = "d1228f95581d90f53a29dba53c1d7a1d0eb7439e278c4c5aca70af01f3e30d55"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Certificate Manager SDK"; - license = "unknown"; - }) {}; - - "amazonka-certificatemanager_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22419,28 +22041,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Certificate Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudformation" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudformation"; - version = "1.4.3"; - sha256 = "3b2069debd35ddfd08af2281902d7c063b267fd2a23b71057321cd2e55cd7690"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFormation SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudformation_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22456,28 +22059,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFormation SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudfront" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudfront"; - version = "1.4.3"; - sha256 = "5241ccb0d39cc055f97eb6496835783a97de0ce0b33c765a1325d01119abecbe"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudFront SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudfront_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22493,28 +22077,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudFront SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudhsm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudhsm"; - version = "1.4.3"; - sha256 = "6848989619b58c75fa1d72d122e96c621b881bf4c376b9325eeb54c8c3200c43"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudHSM SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudhsm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22530,28 +22095,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudHSM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch"; - version = "1.4.3"; - sha256 = "7126175d24355afa678c9dd59400fd1b1a40c18240d96de88bd831b0099c0c26"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22567,28 +22113,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudsearch-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudsearch-domains"; - version = "1.4.3"; - sha256 = "4416cb88845bd27c845ecac50029e7721f3d13d26d24ab6c9c571b5c2c543f7d"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudSearch Domain SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudsearch-domains_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22604,28 +22131,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudSearch Domain SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudtrail" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudtrail"; - version = "1.4.3"; - sha256 = "04ea4c78e0d73f71e1144eb5a357e1e6bce16109453ab30c31d8e7a9ae77fa6f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudTrail SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudtrail_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22641,28 +22149,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudTrail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch"; - version = "1.4.3"; - sha256 = "98df67a18bfdf4c00736f6be41576877f8191ac936ab2f5666b160cb80c22d5f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22678,28 +22167,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-events" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch-events"; - version = "1.4.3"; - sha256 = "fb839e3e4c402151e138b1d69356600f2d378d53631a3616b6228f620713df56"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch Events SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch-events_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22715,28 +22185,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Events SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cloudwatch-logs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cloudwatch-logs"; - version = "1.4.3"; - sha256 = "de201710b2d594519b1c9d8b20fab92e1a0f4e777e5c05ed1bd32c91ae260161"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CloudWatch Logs SDK"; - license = "unknown"; - }) {}; - - "amazonka-cloudwatch-logs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22752,7 +22203,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CloudWatch Logs SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codebuild" = callPackage @@ -22775,24 +22225,6 @@ self: { }) {}; "amazonka-codecommit" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codecommit"; - version = "1.4.3"; - sha256 = "fe8d033203bccb7c8c7242a063a814cdbb8a22fb4a95e5fa4f01b200d547966b"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeCommit SDK"; - license = "unknown"; - }) {}; - - "amazonka-codecommit_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22808,28 +22240,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeCommit SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codedeploy" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codedeploy"; - version = "1.4.3"; - sha256 = "d216d3af7472428fecab9763e65e2f2ea412dfaaf8debbbe5e37ab158c5392d9"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodeDeploy SDK"; - license = "unknown"; - }) {}; - - "amazonka-codedeploy_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22845,28 +22258,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodeDeploy SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-codepipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-codepipeline"; - version = "1.4.3"; - sha256 = "2422824f998a0808151310c88c780bfa411a0f56966f93f614694f4dd526fdb1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon CodePipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-codepipeline_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22882,28 +22276,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon CodePipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-identity" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-identity"; - version = "1.4.3"; - sha256 = "a45aa18f815e75da5e928ec8dfe7ed827394b0b1f4654bf059fe1f3897bfb232"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Identity SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-identity_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22919,28 +22294,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-idp" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-idp"; - version = "1.4.3"; - sha256 = "a7c23b78acf5ca6701540bd74bb5e20b007acbce0bf97905083e2e5dcab940e2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Identity Provider SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-idp_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22956,28 +22312,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Identity Provider SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-cognito-sync" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-cognito-sync"; - version = "1.4.3"; - sha256 = "51a484d6dd44e9d6f9506bd8d97f04ccfa48a04e79aadb193b8644e17a696be7"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Cognito Sync SDK"; - license = "unknown"; - }) {}; - - "amazonka-cognito-sync_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -22993,28 +22330,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Cognito Sync SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-config" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-config"; - version = "1.4.3"; - sha256 = "d9c105b20e1269c55a59180ef61f040315643f873c0075b8b95e84723508e266"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Config SDK"; - license = "unknown"; - }) {}; - - "amazonka-config_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23030,42 +22348,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Config SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, cryptonite, deepseq - , exceptions, hashable, http-conduit, http-types, lens, memory, mtl - , QuickCheck, quickcheck-unicode, resourcet, scientific, semigroups - , tagged, tasty, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, transformers, transformers-compat - , unordered-containers, xml-conduit, xml-types - }: - mkDerivation { - pname = "amazonka-core"; - version = "1.4.3"; - sha256 = "8270e26104bb0cbc7654d3522dce631c9804b433ec9ff5a2a0c7f844938eead0"; - revision = "1"; - editedCabalFile = "c2a93b788f323072f99ab6c120449c605f9249ba5e44d9e56221fa95b5254dba"; - libraryHaskellDepends = [ - aeson attoparsec base bifunctors bytestring case-insensitive - conduit conduit-extra cryptonite deepseq exceptions hashable - http-conduit http-types lens memory mtl resourcet scientific - semigroups tagged text time transformers transformers-compat - unordered-containers xml-conduit xml-types - ]; - testHaskellDepends = [ - aeson base bytestring case-insensitive http-types QuickCheck - quickcheck-unicode tasty tasty-hunit tasty-quickcheck - template-haskell text time - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Core data types and functionality for Amazonka libraries"; - license = "unknown"; - }) {}; - - "amazonka-core_1_4_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, cryptonite, deepseq , exceptions, hashable, http-conduit, http-types, lens, memory, mtl @@ -23093,28 +22378,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Core data types and functionality for Amazonka libraries"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-datapipeline" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-datapipeline"; - version = "1.4.3"; - sha256 = "04bb3873f247a6fc75b5f0a7822e28c1d212765b7918d490474b6bb0faf3d781"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Data Pipeline SDK"; - license = "unknown"; - }) {}; - - "amazonka-datapipeline_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23130,28 +22396,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Data Pipeline SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-devicefarm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-devicefarm"; - version = "1.4.3"; - sha256 = "36ac89a5166ac8bf89d628b43ea7bd88e6624e9fedd6e7de2a7be5501a3d35cd"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Device Farm SDK"; - license = "unknown"; - }) {}; - - "amazonka-devicefarm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23167,28 +22414,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Device Farm SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-directconnect" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-directconnect"; - version = "1.4.3"; - sha256 = "96f67da0a8afb2013c84fc5650e700736711105b7924ce8f288f7f61ba133c7d"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Direct Connect SDK"; - license = "unknown"; - }) {}; - - "amazonka-directconnect_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23204,28 +22432,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Direct Connect SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-discovery" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-discovery"; - version = "1.4.3"; - sha256 = "bfe7c0601d44ca07c28171cb1def3eec5297fa690e6d005edeed4659ec49365f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Application Discovery Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-discovery_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23241,28 +22450,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Application Discovery Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dms"; - version = "1.4.3"; - sha256 = "1714e72bc22176cab07ab9932cec4050e816c450afc3bf6a2810f3318066f8ff"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Database Migration Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-dms_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23278,28 +22468,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Database Migration Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ds" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ds"; - version = "1.4.3"; - sha256 = "d3433eb5c52093f2274055595174bda99e32eb3a4c4760811c22f9c0bbcfe700"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Directory Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ds_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23315,28 +22486,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Directory Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb"; - version = "1.4.3"; - sha256 = "309d695e84fcf5fb2234031b5c650ae2d72ee9bb91bee1cc2522b95228e4d652"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23352,28 +22504,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-dynamodb-streams" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-dynamodb-streams"; - version = "1.4.3"; - sha256 = "61cc56bdbd831438d1daa1149106df1b1f5f0d8f6d8b20cbafcb4ad2869206c5"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon DynamoDB Streams SDK"; - license = "unknown"; - }) {}; - - "amazonka-dynamodb-streams_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23389,28 +22522,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon DynamoDB Streams SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ec2" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ec2"; - version = "1.4.3"; - sha256 = "caeb98e701196d9350d44cd6b1f7b1f5790cc1c4bbbb30dd70824d025c7cc1b7"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Compute Cloud SDK"; - license = "unknown"; - }) {}; - - "amazonka-ec2_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23426,28 +22540,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecr" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ecr"; - version = "1.4.3"; - sha256 = "e9c1475c8eb4b89cafc7df8f2e8d6c4cff16b349db5407d014ef49726d7b1861"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon EC2 Container Registry SDK"; - license = "unknown"; - }) {}; - - "amazonka-ecr_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23463,28 +22558,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Registry SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ecs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ecs"; - version = "1.4.3"; - sha256 = "4c10a7da68605f7a9656714cb134cf47d920b2aa02f0c38e0c06f8ddf9152471"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon EC2 Container Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ecs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23500,28 +22576,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon EC2 Container Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-efs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-efs"; - version = "1.4.3"; - sha256 = "c65054594451e774e1e9ad1fbfbf8a724dac86cbd4efa01aa5119d3d9f7a8301"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic File System SDK"; - license = "unknown"; - }) {}; - - "amazonka-efs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23537,28 +22594,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic File System SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticache" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticache"; - version = "1.4.3"; - sha256 = "673912e1f5db5762dd00da1312cc09e2265da0ac6a35d92ee2bbb6e88230f879"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon ElastiCache SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticache_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23574,28 +22612,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon ElastiCache SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticbeanstalk" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticbeanstalk"; - version = "1.4.3"; - sha256 = "675730e477fcf3926605dc42bf08f3fba48f7272cc63cb5c845bb16c296fbd9b"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Beanstalk SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticbeanstalk_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23611,28 +22630,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Beanstalk SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elasticsearch" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elasticsearch"; - version = "1.4.3"; - sha256 = "9e7b1911946ce7a0df8c7ef13277f32a06a26e2a7a6334b3d1514cf089d014d5"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elasticsearch Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-elasticsearch_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23648,28 +22648,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elasticsearch Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elastictranscoder" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elastictranscoder"; - version = "1.4.3"; - sha256 = "9a5d534e54f5421a37103b4117d07bcf16eb241a0bd153457037f1f83ccb8b2f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Transcoder SDK"; - license = "unknown"; - }) {}; - - "amazonka-elastictranscoder_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23685,28 +22666,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Transcoder SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-elb"; - version = "1.4.3"; - sha256 = "81fae99dff50a8feb54150afdb5ef6a06b1be57b6d46957e37c503a730bd2d56"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic Load Balancing SDK"; - license = "unknown"; - }) {}; - - "amazonka-elb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23722,7 +22684,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Load Balancing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-elbv2" = callPackage @@ -23745,24 +22706,6 @@ self: { }) {}; "amazonka-emr" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-emr"; - version = "1.4.3"; - sha256 = "b31ab69a06ea6ba585a89c133a78ed0ea2cb89faa9e2a04b6d12228167fa8e75"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Elastic MapReduce SDK"; - license = "unknown"; - }) {}; - - "amazonka-emr_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23778,28 +22721,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic MapReduce SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-gamelift" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-gamelift"; - version = "1.4.3"; - sha256 = "c7fa8f5e3d83a6c1b2848676e270534dac9c8084d702abcd2edc79b603766429"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon GameLift SDK"; - license = "unknown"; - }) {}; - - "amazonka-gamelift_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23815,28 +22739,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon GameLift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-glacier" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-glacier"; - version = "1.4.3"; - sha256 = "dddfa10e13eceba289a534fa6f7accd2969c8c6cc06b967e5bf35604c6738bec"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Glacier SDK"; - license = "unknown"; - }) {}; - - "amazonka-glacier_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23852,7 +22757,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Glacier SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-health" = callPackage @@ -23875,24 +22779,6 @@ self: { }) {}; "amazonka-iam" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iam"; - version = "1.4.3"; - sha256 = "4208dcc7e9f4a5c351246d4c33f7215079dad2325e0e894186284d86c8243734"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Identity and Access Management SDK"; - license = "unknown"; - }) {}; - - "amazonka-iam_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23908,28 +22794,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Identity and Access Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-importexport" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-importexport"; - version = "1.4.3"; - sha256 = "ce555f40f865c0ef4680b6fd2344927f86f44bc04cb4f97d8bdd47c18de3ca64"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Import/Export SDK"; - license = "unknown"; - }) {}; - - "amazonka-importexport_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23945,28 +22812,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Import/Export SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-inspector" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-inspector"; - version = "1.4.3"; - sha256 = "0f54b9b7c5bf3317390e86e3351806116fc55dce8614f26c79af7bfed1bf28c8"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Inspector SDK"; - license = "unknown"; - }) {}; - - "amazonka-inspector_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -23982,28 +22830,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Inspector SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot"; - version = "1.4.3"; - sha256 = "4b9f17daddab2f04f60d84109e8c78077bd1feae610f0053fbe7edf0317c3e91"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24019,28 +22848,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-iot-dataplane" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-iot-dataplane"; - version = "1.4.3"; - sha256 = "2c3ef08bc6a294591f029a7189a35acf5cbd9bc332f1f3f8f94cca0a8e9a5b96"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon IoT Data Plane SDK"; - license = "unknown"; - }) {}; - - "amazonka-iot-dataplane_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24056,28 +22866,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon IoT Data Plane SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis"; - version = "1.4.3"; - sha256 = "6b9f597488893470ef9914857ec3e593aea3a41b2c69794d95065ce3e332e812"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24093,7 +22884,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kinesis-analytics" = callPackage @@ -24116,24 +22906,6 @@ self: { }) {}; "amazonka-kinesis-firehose" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kinesis-firehose"; - version = "1.4.3"; - sha256 = "2add7d8f8b27cbc339c473244007683d7ceab6caa00258c9030ed8983d16853a"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Kinesis Firehose SDK"; - license = "unknown"; - }) {}; - - "amazonka-kinesis-firehose_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24149,28 +22921,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Kinesis Firehose SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-kms" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-kms"; - version = "1.4.3"; - sha256 = "933a098970511c03b72698138329350ac722dd84dbd3fc76b49e2eb5504a73ed"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Key Management Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-kms_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24186,28 +22939,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Key Management Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lambda" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-lambda"; - version = "1.4.3"; - sha256 = "4ed68d68eaa379b41f0ccf4ef82981687bd029fea84b544a0137ce0408d01787"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Lambda SDK"; - license = "unknown"; - }) {}; - - "amazonka-lambda_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24223,7 +22957,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Lambda SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-lightsail" = callPackage @@ -24246,24 +22979,6 @@ self: { }) {}; "amazonka-marketplace-analytics" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-marketplace-analytics"; - version = "1.4.3"; - sha256 = "cca9bd6001747c33714601b7b9cc85623e179e99f67e05e04d38be340d80dec7"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Marketplace Commerce Analytics SDK"; - license = "unknown"; - }) {}; - - "amazonka-marketplace-analytics_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24279,28 +22994,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Commerce Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-marketplace-metering" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-marketplace-metering"; - version = "1.4.3"; - sha256 = "577270b944784ea27d8cc0e911757c5a5fe18657892d2862e5e20e3e64b37a21"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Marketplace Metering SDK"; - license = "unknown"; - }) {}; - - "amazonka-marketplace-metering_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24316,28 +23012,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Marketplace Metering SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-ml" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ml"; - version = "1.4.3"; - sha256 = "dd5731a2df42ecb1d07968436ed27c1a72b61a3e1b5a3b7c8c04d38ed9ada4dd"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Machine Learning SDK"; - license = "unknown"; - }) {}; - - "amazonka-ml_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24353,28 +23030,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Machine Learning SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-opsworks"; - version = "1.4.3"; - sha256 = "8a3844b702d7d68e7f26b8a886e3c4ca3984b6f2522c13f0e7c5174f2e8ef273"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon OpsWorks SDK"; - license = "unknown"; - }) {}; - - "amazonka-opsworks_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24390,7 +23048,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon OpsWorks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-opsworks-cm" = callPackage @@ -24451,25 +23108,6 @@ self: { }) {}; "amazonka-rds" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-rds"; - version = "1.4.3"; - sha256 = "4d58e361bdc88245b71e718edace7f2a360fecb7bf243a61d0eac1424abf2acf"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Relational Database Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "amazonka-rds_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24489,24 +23127,6 @@ self: { }) {}; "amazonka-redshift" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-redshift"; - version = "1.4.3"; - sha256 = "af9d7957c68c0e66cb1301b611bc196adaead8eb2b88210d369dc01ed377fe68"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Redshift SDK"; - license = "unknown"; - }) {}; - - "amazonka-redshift_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24522,7 +23142,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Redshift SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-rekognition" = callPackage @@ -24545,24 +23164,6 @@ self: { }) {}; "amazonka-route53" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53"; - version = "1.4.3"; - sha256 = "a7fb42486f54b7e1b858edc907a57be656b20a2da8a08c982e3d8bf0c592b0cf"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24578,28 +23179,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-route53-domains" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-route53-domains"; - version = "1.4.3"; - sha256 = "1a773fc3c18faa770874fc708ff0cb6b7150a09836c3a9c6332b9d222a4fe18b"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Route 53 Domains SDK"; - license = "unknown"; - }) {}; - - "amazonka-route53-domains_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24615,28 +23197,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Route 53 Domains SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , lens, tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-s3"; - version = "1.4.3"; - sha256 = "9ed6c9e7675e99a545a84ac2c979a7542ecd898dd6e4c2fbbbba2c4a40d8fc50"; - libraryHaskellDepends = [ amazonka-core base lens text ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Storage Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-s3_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , lens, tasty, tasty-hunit, text, time, unordered-containers }: @@ -24652,7 +23215,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-s3-streaming" = callPackage @@ -24680,24 +23242,6 @@ self: { }) {}; "amazonka-sdb" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sdb"; - version = "1.4.3"; - sha256 = "7fac8b39c2210e09d1ef15f7c964b64397c1b6165638c92f4069be8002ebf1d3"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon SimpleDB SDK"; - license = "unknown"; - }) {}; - - "amazonka-sdb_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24713,7 +23257,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon SimpleDB SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-servicecatalog" = callPackage @@ -24736,24 +23279,6 @@ self: { }) {}; "amazonka-ses" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ses"; - version = "1.4.3"; - sha256 = "2ccab07f3c08d9145c2bc936048e5f973532871f1a366e0111a2bf70973d96a2"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Email Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ses_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24769,7 +23294,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Email Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-shield" = callPackage @@ -24830,24 +23354,6 @@ self: { }) {}; "amazonka-sns" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sns"; - version = "1.4.3"; - sha256 = "681335a9d385af666d5c895b982fb757fa65862a0047d3a498d544f6d136544a"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Notification Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sns_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24863,29 +23369,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Notification Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sqs" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sqs"; - version = "1.4.3"; - sha256 = "2e94eaab5fc5c9a4471bfe834ccf975c1776b268cb291281740db62148825ece"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Queue Service SDK"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "amazonka-sqs_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24905,24 +23391,6 @@ self: { }) {}; "amazonka-ssm" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-ssm"; - version = "1.4.3"; - sha256 = "260a3e4178f48f4df2bb2574809ac7c81c7208fa9d77225c6101844bb21c38c1"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Systems Management Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-ssm_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24938,7 +23406,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Systems Manager (SSM) SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-stepfunctions" = callPackage @@ -24961,24 +23428,6 @@ self: { }) {}; "amazonka-storagegateway" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-storagegateway"; - version = "1.4.3"; - sha256 = "5522fa5aa0bfed529b5b85385d2000aedf5b1c8fb5400bf280d4b131275b7b47"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Storage Gateway SDK"; - license = "unknown"; - }) {}; - - "amazonka-storagegateway_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -24994,28 +23443,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Storage Gateway SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-sts" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-sts"; - version = "1.4.3"; - sha256 = "d36e38218fe83a696c13dfef9362028cb23f73b96fb468bb9b809ef69598606c"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Security Token Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-sts_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25031,28 +23461,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Security Token Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-support" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-support"; - version = "1.4.3"; - sha256 = "d9acfb0d35f3c987dd534c0a59959cef44825facfc4665ba20bf286e4023d70f"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Support SDK"; - license = "unknown"; - }) {}; - - "amazonka-support_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25068,28 +23479,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Support SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-swf" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-swf"; - version = "1.4.3"; - sha256 = "0443d02c23d93eca09f6b91ad7aa1e32ab02e6b92e0bb6595ab65ce5f13ab469"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon Simple Workflow Service SDK"; - license = "unknown"; - }) {}; - - "amazonka-swf_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25105,32 +23497,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-test" = callPackage - ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring - , case-insensitive, conduit, conduit-extra, groom, http-client - , http-types, process, resourcet, tasty, tasty-hunit - , template-haskell, temporary, text, time, unordered-containers - , yaml - }: - mkDerivation { - pname = "amazonka-test"; - version = "1.4.3"; - sha256 = "10310abf1036afb3f2ea688b300d738700f780a2459a10f306b1bedff9019d9b"; - libraryHaskellDepends = [ - aeson amazonka-core base bifunctors bytestring case-insensitive - conduit conduit-extra groom http-client http-types process - resourcet tasty tasty-hunit template-haskell temporary text time - unordered-containers yaml - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Common functionality for Amazonka library test-suites"; - license = "unknown"; - }) {}; - - "amazonka-test_1_4_5" = callPackage ({ mkDerivation, aeson, amazonka-core, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, groom, http-client , http-types, process, resourcet, tasty, tasty-hunit @@ -25150,28 +23519,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Common functionality for Amazonka library test-suites"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-waf" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-waf"; - version = "1.4.3"; - sha256 = "7e9c9d7ca82c8d1e95e7aabf696980040f8644d96c011438e06c51dd41655a85"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WAF SDK"; - license = "unknown"; - }) {}; - - "amazonka-waf_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25187,28 +23537,9 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WAF SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-workspaces" = callPackage - ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring - , tasty, tasty-hunit, text, time, unordered-containers - }: - mkDerivation { - pname = "amazonka-workspaces"; - version = "1.4.3"; - sha256 = "61828d17aec286062dd453e69b730e180a651f59387c7355872d1cae47805d78"; - libraryHaskellDepends = [ amazonka-core base ]; - testHaskellDepends = [ - amazonka-core amazonka-test base bytestring tasty tasty-hunit text - time unordered-containers - ]; - homepage = "https://github.com/brendanhay/amazonka"; - description = "Amazon WorkSpaces SDK"; - license = "unknown"; - }) {}; - - "amazonka-workspaces_1_4_5" = callPackage ({ mkDerivation, amazonka-core, amazonka-test, base, bytestring , tasty, tasty-hunit, text, time, unordered-containers }: @@ -25224,7 +23555,6 @@ self: { homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon WorkSpaces SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amazonka-xray" = callPackage @@ -25691,18 +24021,6 @@ self: { }) {}; "anonymous-sums" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "anonymous-sums"; - version = "0.4.0.0"; - sha256 = "116626dd139f7ba57b66d790915ff21cdf09f267da16f873f396ae76aad16749"; - libraryHaskellDepends = [ base ]; - homepage = "http://www.github.com/massysett/anonymous-sums"; - description = "Anonymous sum types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "anonymous-sums_0_6_0_0" = callPackage ({ mkDerivation, base, lens, template-haskell }: mkDerivation { pname = "anonymous-sums"; @@ -25712,7 +24030,6 @@ self: { homepage = "http://www.github.com/massysett/anonymous-sums"; description = "Anonymous sum types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "anonymous-sums-tests" = callPackage @@ -25773,19 +24090,6 @@ self: { }) {}; "ansigraph" = callPackage - ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: - mkDerivation { - pname = "ansigraph"; - version = "0.2.0.0"; - sha256 = "3ded8cb86e659854a051328982c4b3f3527c409c5bbeb37383d717685e76ca43"; - libraryHaskellDepends = [ ansi-terminal base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/BlackBrane/ansigraph"; - description = "Terminal-based graphing via ANSI and Unicode"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ansigraph_0_3_0_2" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; @@ -25796,7 +24100,6 @@ self: { homepage = "https://github.com/BlackBrane/ansigraph"; description = "Terminal-based graphing via ANSI and Unicode"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "antagonist" = callPackage @@ -26674,39 +24977,6 @@ self: { }) {}; "apply-refact" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.3.0.0"; - sha256 = "0d2a8845ed554c4a6742a3d0a130dac3f16d0d710b65b20dfeb8e773409ed70f"; - revision = "1"; - editedCabalFile = "372095fc0b1e53e884362d5650486b4c2fb624588271a7b4917903ea977899ea"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "apply-refact_0_3_0_1" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact , silently, syb, tasty, tasty-expected-failure, tasty-golden @@ -26735,7 +25005,6 @@ self: { ]; description = "Perform refactorings specified by the refact library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "apportionment" = callPackage @@ -28229,32 +26498,6 @@ self: { }) {}; "atom-conduit" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, data-default - , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers - , quickcheck-instances, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring - , xml-conduit, xml-conduit-parse, xml-types - }: - mkDerivation { - pname = "atom-conduit"; - version = "0.3.1.2"; - sha256 = "ab469b789cd81a5dab366c367a5b86a073e7cfc8fbb1a978d3107441795f7a22"; - libraryHaskellDepends = [ - base conduit conduit-parse exceptions foldl lens-simple - mono-traversable parsers text time timerep uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default exceptions hlint - lens-simple mono-traversable parsers quickcheck-instances resourcet - tasty tasty-hunit tasty-quickcheck text time uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = "unknown"; - }) {}; - - "atom-conduit_0_4_0_1" = callPackage ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators , data-default, hlint, lens-simple, mono-traversable, parsers , quickcheck-instances, resourcet, safe-exceptions, tasty @@ -28278,7 +26521,6 @@ self: { ]; description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atom-msp430" = callPackage @@ -28856,25 +27098,6 @@ self: { }) {}; "authenticate-oauth" = callPackage - ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring - , crypto-pubkey-types, data-default, http-client, http-types - , random, RSA, SHA, time, transformers - }: - mkDerivation { - pname = "authenticate-oauth"; - version = "1.5.1.2"; - sha256 = "294279ff1a4e746eedb5186d8230c34b2ffa770f020d30341424a59fedb76a33"; - libraryHaskellDepends = [ - base base64-bytestring blaze-builder bytestring crypto-pubkey-types - data-default http-client http-types random RSA SHA time - transformers - ]; - homepage = "http://github.com/yesodweb/authenticate"; - description = "Library to authenticate with OAuth for Haskell web applications"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "authenticate-oauth_1_6" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , crypto-pubkey-types, data-default, http-client, http-types , random, RSA, SHA, time, transformers, transformers-compat @@ -28891,7 +27114,6 @@ self: { homepage = "http://github.com/yesodweb/authenticate"; description = "Library to authenticate with OAuth for Haskell web applications"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "authinfo-hs" = callPackage @@ -28957,21 +27179,6 @@ self: { }) {}; "autoexporter" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath }: - mkDerivation { - pname = "autoexporter"; - version = "0.2.3"; - sha256 = "b3b9bfb44a5942ee83b45b4c9bcf3a61335362c507a98acddaf47889e394ab8a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base Cabal directory filepath ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/autoexporter#readme"; - description = "Automatically re-export modules"; - license = stdenv.lib.licenses.mit; - }) {}; - - "autoexporter_1_0_0" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { pname = "autoexporter"; @@ -28984,7 +27191,6 @@ self: { homepage = "https://github.com/tfausak/autoexporter#readme"; description = "Automatically re-export modules"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "autom" = callPackage @@ -29362,41 +27568,6 @@ self: { }) {awesomium = null;}; "aws" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-extra, containers - , cryptohash, data-default, directory, errors, filepath - , http-client, http-client-tls, http-conduit, http-types - , lifted-base, monad-control, mtl, network, old-locale, QuickCheck - , quickcheck-instances, resourcet, safe, scientific, tagged, tasty - , tasty-hunit, tasty-quickcheck, text, time, transformers - , transformers-base, unordered-containers, utf8-string, vector - , xml-conduit - }: - mkDerivation { - pname = "aws"; - version = "0.14.1"; - sha256 = "6a2079853ddc781b46fe3ddce31e88c0b6b2441f458141bca3cd1c7216cbe579"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring errors http-client http-client-tls http-types - lifted-base monad-control mtl QuickCheck quickcheck-instances - resourcet tagged tasty tasty-hunit tasty-quickcheck text time - transformers transformers-base - ]; - homepage = "http://github.com/aristidb/aws"; - description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "aws_0_16" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring , case-insensitive, cereal, conduit, conduit-combinators @@ -29429,7 +27600,6 @@ self: { homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-cloudfront-signer" = callPackage @@ -30171,36 +28341,6 @@ self: { }) {}; "bake" = callPackage - ({ mkDerivation, aeson, base, bytestring, cmdargs, containers - , deepseq, direct-sqlite, directory, disk-free-space, extra - , filepath, hashable, HTTP, http-types, old-locale, process, random - , safe, shake, smtp-mail, sqlite-simple, text, time, transformers - , unordered-containers, wai, warp - }: - mkDerivation { - pname = "bake"; - version = "0.4"; - sha256 = "ff0b6eb38e68f2542713074da3c64368e3a56c029dadb9c1e011262c223abbf7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring cmdargs containers deepseq direct-sqlite - directory disk-free-space extra filepath hashable HTTP http-types - old-locale random safe shake smtp-mail sqlite-simple text time - transformers unordered-containers wai warp - ]; - executableHaskellDepends = [ - aeson base bytestring cmdargs containers deepseq direct-sqlite - directory disk-free-space extra filepath hashable HTTP http-types - old-locale process random safe shake smtp-mail sqlite-simple text - time transformers unordered-containers wai warp - ]; - homepage = "https://github.com/ndmitchell/bake#readme"; - description = "Continuous integration system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bake_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, containers , deepseq, direct-sqlite, directory, disk-free-space, extra , filepath, hashable, HTTP, http-client, http-conduit, http-types @@ -30231,7 +28371,6 @@ self: { homepage = "https://github.com/ndmitchell/bake#readme"; description = "Continuous integration system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bamboo" = callPackage @@ -30592,19 +28731,6 @@ self: { }) {}; "base-noprelude" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-noprelude"; - version = "4.9.0.0"; - sha256 = "1c5509c33366d7d0810c12d3e00579709f1b940733fda0f5f38079eba8f2fe5d"; - libraryHaskellDepends = [ base ]; - doHaddock = false; - homepage = "https://github.com/hvr/base-noprelude"; - description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "base-noprelude_4_9_1_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "base-noprelude"; @@ -30615,7 +28741,6 @@ self: { homepage = "https://github.com/hvr/base-noprelude"; description = "\"base\" package sans \"Prelude\" module"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base-orphans" = callPackage @@ -32852,6 +30977,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bindings-monetdb-mapi" = callPackage + ({ mkDerivation, base, monetdb-mapi }: + mkDerivation { + pname = "bindings-monetdb-mapi"; + version = "0.1.0.0"; + sha256 = "63efa91e5c3224666cdda44762e830339ed311148392d14c651b54048ad5218a"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ monetdb-mapi ]; + description = "Low-level bindings for the MonetDB API (mapi)"; + license = stdenv.lib.licenses.bsd3; + }) {monetdb-mapi = null;}; + "bindings-mpdecimal" = callPackage ({ mkDerivation, base, bindings-DSL }: mkDerivation { @@ -33514,31 +31651,6 @@ self: { }) {}; "bitcoin-payment-channel" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, base58string - , base64-bytestring, bytestring, cereal, errors, haskoin-core - , hexstring, QuickCheck, scientific, text, time - }: - mkDerivation { - pname = "bitcoin-payment-channel"; - version = "0.3.0.1"; - sha256 = "97bc6dc75c72735f28c84ef90734f2e31bde8693f9c88e216f8a66d3f95ae8c8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring base64-bytestring bytestring cereal - errors haskoin-core hexstring scientific text time - ]; - executableHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring - bytestring cereal haskoin-core hexstring QuickCheck text time - ]; - homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; - description = "Library for working with Bitcoin payment channels"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "bitcoin-payment-channel_1_0_1_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, cereal, deepseq, errors, haskoin-core, hexstring , hspec, monad-time, mtl, QuickCheck, random, rbpcp-api, scientific @@ -33916,30 +32028,6 @@ self: { }) {}; "bitx-bitcoin" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, doctest - , exceptions, hspec, http-client, http-client-tls, http-types - , microlens, microlens-th, network, QuickCheck, safe, scientific - , split, text, time - }: - mkDerivation { - pname = "bitx-bitcoin"; - version = "0.10.0.0"; - sha256 = "a55e13de9eadffe78a0fc3edf4055a98c70a6f9738c98db4f055df8aa9fc509c"; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-client http-client-tls - http-types microlens microlens-th network QuickCheck scientific - split text time - ]; - testHaskellDepends = [ - aeson base bytestring directory doctest hspec http-client - http-types microlens safe text time - ]; - homepage = "https://github.com/tebello-thejane/bitx-haskell"; - description = "A Haskell library for working with the BitX bitcoin exchange"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bitx-bitcoin_0_11_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, directory , doctest, exceptions, hspec, http-client, http-client-tls , http-types, microlens, microlens-th, network, QuickCheck, safe @@ -33961,7 +32049,6 @@ self: { homepage = "https://github.com/tebello-thejane/bitx.hs"; description = "A Haskell library for working with the BitX bitcoin exchange"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bk-tree" = callPackage @@ -34282,6 +32369,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blaze-colonnade" = callPackage + ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, doctest + , text + }: + mkDerivation { + pname = "blaze-colonnade"; + version = "0.1"; + sha256 = "cee73ec0777ecc268958699ead67b527b2b99cfbad38532b4687628bf70138e8"; + libraryHaskellDepends = [ + base blaze-html blaze-markup colonnade text + ]; + testHaskellDepends = [ base colonnade doctest ]; + homepage = "https://github.com/andrewthad/colonnade#readme"; + description = "Helper functions for using blaze-html with colonnade"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "blaze-from-html" = callPackage ({ mkDerivation, base, containers, directory, filepath, tagsoup }: mkDerivation { @@ -34688,35 +32792,6 @@ self: { }) {}; "bloodhound" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers - , data-default-class, derive, directory, doctest, doctest-prop - , errors, exceptions, filepath, hashable, hspec, http-client - , http-types, mtl, mtl-compat, network-uri, QuickCheck - , quickcheck-properties, scientific, semigroups, text, time - , transformers, unordered-containers, vector - }: - mkDerivation { - pname = "bloodhound"; - version = "0.11.0.0"; - sha256 = "df3c708675ad1e113aa31f6d1492bcf55dbef6c7e86e6202b118670a6fcbb939"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring containers data-default-class - exceptions hashable http-client http-types mtl mtl-compat - network-uri scientific semigroups text time transformers - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers derive directory doctest - doctest-prop errors filepath hspec http-client http-types mtl - QuickCheck quickcheck-properties semigroups text time - unordered-containers vector - ]; - homepage = "https://github.com/bitemyapp/bloodhound"; - description = "ElasticSearch client library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bloodhound_0_12_1_0" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , data-default-class, directory, doctest, errors, exceptions , filepath, generics-sop, hashable, hspec, http-client, http-types @@ -34743,7 +32818,6 @@ self: { homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bloodhound-amazonka-auth" = callPackage @@ -34809,29 +32883,6 @@ self: { }) {}; "blosum" = callPackage - ({ mkDerivation, base, containers, fasta, lens - , optparse-applicative, pipes, pipes-text, split, text, text-show - }: - mkDerivation { - pname = "blosum"; - version = "0.1.1.2"; - sha256 = "acfbca000b0f7da3e20c5ae0b124ff029d4777a056f74546828fe6a9eee29d55"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers fasta lens text text-show - ]; - executableHaskellDepends = [ - base containers fasta optparse-applicative pipes pipes-text split - text - ]; - homepage = "http://github.com/GregorySchwartz/blosum#readme"; - description = "BLOSUM generator"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "blosum_0_1_1_4" = callPackage ({ mkDerivation, base, containers, fasta, lens , optparse-applicative, pipes, pipes-text, split, text, text-show }: @@ -35077,8 +33128,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.7.0.0"; - sha256 = "b55acc5eb137f8dc9a85a7eedc8dc2f26c22d91b8593b856b155c6cd2597a7d3"; + version = "0.8.0.0"; + sha256 = "9ba0c8b618d342575d480488783117ea99dc19b0b5485192e3757cdbe267ccf7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35391,12 +33442,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "boring-game" = callPackage + ({ mkDerivation, base, gloss }: + mkDerivation { + pname = "boring-game"; + version = "0.1.0.1"; + sha256 = "51cc6d7b7cdda9ca35021c7005d75773119bdb3331f5fb40c750c9e231392b81"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base gloss ]; + executableHaskellDepends = [ base gloss ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/checkraiser/boring-game#readme"; + description = "An educational game"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "boring-window-switcher" = callPackage ({ mkDerivation, base, gtk, transformers, X11 }: mkDerivation { pname = "boring-window-switcher"; - version = "0.1.0.3"; - sha256 = "ac8273d978973b9424ce195ab48b6f599d06bb1af1af6abf94305b35ffed2748"; + version = "0.1.0.4"; + sha256 = "4f9f7dbe3ad1e3f5ad40a79e59e03e3598c9be7a91afe9d3ffb7148fd3063196"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gtk transformers X11 ]; @@ -35505,27 +33572,6 @@ self: { }) {}; "bower-json" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, base, bytestring - , deepseq, mtl, scientific, tasty, tasty-hunit, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "bower-json"; - version = "0.8.1"; - sha256 = "3fb3cdecc55a0997a9d4d9c3443bcf39b7feed09feb8629fc89b48b1ca7b713f"; - libraryHaskellDepends = [ - aeson aeson-better-errors base bytestring deepseq mtl scientific - text transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring tasty tasty-hunit text unordered-containers - ]; - homepage = "https://github.com/hdgarrood/bower-json"; - description = "Read bower.json from Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bower-json_1_0_0_1" = callPackage ({ mkDerivation, aeson, aeson-better-errors, base, bytestring , deepseq, ghc-prim, mtl, scientific, tasty, tasty-hunit, text , transformers, unordered-containers, vector @@ -35544,7 +33590,6 @@ self: { homepage = "https://github.com/hdgarrood/bower-json"; description = "Read bower.json from Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bowntz" = callPackage @@ -35958,18 +34003,6 @@ self: { }) {}; "btrfs" = callPackage - ({ mkDerivation, base, bytestring, time, unix }: - mkDerivation { - pname = "btrfs"; - version = "0.1.2.0"; - sha256 = "a1e7bdb44c587686299e3e9e3910fb7a271bcd7462ee6fac0ffccd8c7a60fe0c"; - libraryHaskellDepends = [ base bytestring time unix ]; - homepage = "https://github.com/redneb/hs-btrfs"; - description = "Bindings to the btrfs API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "btrfs_0_1_2_3" = callPackage ({ mkDerivation, base, bytestring, time, unix }: mkDerivation { pname = "btrfs"; @@ -35979,7 +34012,6 @@ self: { homepage = "https://github.com/redneb/hs-btrfs"; description = "Bindings to the btrfs API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buchhaltung" = callPackage @@ -37013,6 +35045,19 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "c2hs-extra" = callPackage + ({ mkDerivation, base, c2hs }: + mkDerivation { + pname = "c2hs-extra"; + version = "0.1.0.0"; + sha256 = "f22faa55babb95ac1acb29c775ebf9cf0fd1673985c802bd5b6037d6db558b3d"; + libraryHaskellDepends = [ base ]; + libraryToolDepends = [ c2hs ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "Convenient marshallers for complicate C types"; + license = stdenv.lib.licenses.mit; + }) {}; + "c2hsc" = callPackage ({ mkDerivation, base, cmdargs, containers, directory, filepath , HStringTemplate, language-c, mtl, pretty, split, transformers @@ -37201,22 +35246,6 @@ self: { }) {}; "cabal-dependency-licenses" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath }: - mkDerivation { - pname = "cabal-dependency-licenses"; - version = "0.1.2.0"; - sha256 = "436a3d8745d6645cac1b51f54974f38811fbc37a3784ac0bdba3c3ddb22f2494"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal containers directory filepath - ]; - homepage = "http://github.com/jaspervdj/cabal-dependency-licenses"; - description = "Compose a list of a project's transitive dependencies with their licenses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-dependency-licenses_0_2_0_0" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { pname = "cabal-dependency-licenses"; @@ -37230,7 +35259,6 @@ self: { homepage = "http://github.com/jaspervdj/cabal-dependency-licenses"; description = "Compose a list of a project's transitive dependencies with their licenses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dev" = callPackage @@ -37637,24 +35665,6 @@ self: { }) {}; "cabal-rpm" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, old-locale - , process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.10.1"; - sha256 = "46aae9f3b5734ceb9c35d9a5dbe7603bd26235169f16a10035078de33140cde9"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal directory filepath old-locale process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "cabal-rpm_0_11" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, old-locale , process, time, unix }: @@ -37670,7 +35680,6 @@ self: { homepage = "https://github.com/juhp/cabal-rpm"; description = "RPM packaging tool for Haskell Cabal-based packages"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-scripts" = callPackage @@ -38144,29 +36153,6 @@ self: { }) {}; "cacophony" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , cryptonite, deepseq, directory, exceptions, free, hlint, lens - , memory, monad-coroutine, mtl, safe-exceptions, text, transformers - }: - mkDerivation { - pname = "cacophony"; - version = "0.8.0"; - sha256 = "063069adea7ae07f3ec458b76194edca2acb96871acc0fd437cc6b0c68739c01"; - libraryHaskellDepends = [ - base bytestring cryptonite deepseq exceptions free lens memory - monad-coroutine mtl safe-exceptions transformers - ]; - testHaskellDepends = [ - aeson async base base16-bytestring bytestring directory free hlint - lens mtl text - ]; - homepage = "https://github.com/centromere/cacophony"; - description = "A library implementing the Noise protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cacophony_0_9_1" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring , cryptonite, directory, exceptions, free, hlint, lens, memory , monad-coroutine, mtl, safe-exceptions, text, transformers @@ -38527,37 +36513,6 @@ self: { }) {}; "camfort" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers - , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim - , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text - , transformers, uniplate, vector - }: - mkDerivation { - pname = "camfort"; - version = "0.900"; - sha256 = "fc92d5a5d5ecf42470d4f7aea2848eb785e44ba925949df86599e7b96f4a4427"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring containers directory fgl filepath fortran-src - GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers - uniplate vector - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - array base bytestring containers directory fgl filepath fortran-src - GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text - transformers uniplate vector - ]; - testHaskellDepends = [ - array base bytestring containers directory filepath fortran-src - hmatrix hspec mtl QuickCheck uniplate - ]; - description = "CamFort - Cambridge Fortran infrastructure"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "camfort_0_901" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text @@ -38586,7 +36541,6 @@ self: { ]; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "camh" = callPackage @@ -38993,8 +36947,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "3.1.0.2"; - sha256 = "c137dece9554219a980a74f0aaa3d44c13f83b6312c8802f4766702250514a95"; + version = "3.1.0.3"; + sha256 = "c9a2e3b246b344f48a771c419db3cdddda7f71c1995d184340d91817bebf6439"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear spatial-math vector vector-binary-instances @@ -39177,8 +37131,8 @@ self: { }: mkDerivation { pname = "cases"; - version = "0.1.3.1"; - sha256 = "472bd45f1e9361b250e1b48aeaa92494fce5283f4154856cb13d1a8376897987"; + version = "0.1.3.2"; + sha256 = "9ecf632f7751aac2ed7ec93407f9499237316f2eb50f331bb4969abf3359a8a9"; libraryHaskellDepends = [ attoparsec base-prelude loch-th text ]; testHaskellDepends = [ base HTF HUnit loch-th placeholders QuickCheck text @@ -39462,24 +37416,6 @@ self: { }) {}; "cassava-conduit" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, cassava - , conduit, conduit-extra, containers, mtl, QuickCheck, text - }: - mkDerivation { - pname = "cassava-conduit"; - version = "0.3.2"; - sha256 = "e6ac1e3da4e43540ea0d31ecfa31a30c4ec401878aff10f1a1f6126e4462ffd2"; - libraryHaskellDepends = [ - array base bifunctors bytestring cassava conduit conduit-extra - containers mtl text - ]; - testHaskellDepends = [ base QuickCheck ]; - homepage = "https://github.com/domdere/cassava-conduit"; - description = "Conduit interface for cassava package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cassava-conduit_0_3_5_1" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, cassava , conduit, conduit-extra, containers, mtl, QuickCheck, text }: @@ -39497,7 +37433,6 @@ self: { homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassava-megaparsec" = callPackage @@ -39735,27 +37670,6 @@ self: { }) {}; "cayley-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring - , exceptions, hspec, http-client, http-conduit, lens, lens-aeson - , mtl, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "cayley-client"; - version = "0.2.1.1"; - sha256 = "04547226bf0e504d41527de6e2d81ba66d6c59d4460e2ce37f34a6d9aca747cf"; - libraryHaskellDepends = [ - aeson attoparsec base binary bytestring exceptions http-client - http-conduit lens lens-aeson mtl text transformers - unordered-containers vector - ]; - testHaskellDepends = [ aeson base hspec unordered-containers ]; - homepage = "https://github.com/MichelBoucey/cayley-client"; - description = "A Haskell client for the Cayley graph database"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "cayley-client_0_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, bytestring , exceptions, hspec, http-client, http-conduit, lens, lens-aeson , mtl, text, transformers, unordered-containers, vector @@ -41720,32 +39634,6 @@ self: { }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, deepseq, directory, errors, fgl - , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process - , template-haskell, text, time, transformers, unbound-generics - , unordered-containers, uu-parsinglib, wl-pprint-text - }: - mkDerivation { - pname = "clash-lib"; - version = "0.6.21"; - sha256 = "2b0135d15e5e3b66a59ccdb40a3bf38bb8895bf67c49eb9b54a80082752b98ad"; - revision = "1"; - editedCabalFile = "4dc5af7e94897c9afc254661bb7e19a09acd0467be034c8d82bbe5b2582bd262"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers deepseq directory errors fgl filepath ghc hashable - integer-gmp lens mtl pretty process template-haskell text time - transformers unbound-generics unordered-containers uu-parsinglib - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-lib_0_7" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, data-binary-ieee754, deepseq , directory, errors, fgl, filepath, ghc, hashable, integer-gmp @@ -41783,30 +39671,6 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, data-default, deepseq, doctest - , ghc-prim, ghc-typelits-extra, ghc-typelits-natnormalise - , integer-gmp, lens, QuickCheck, reflection, singletons - , template-haskell - }: - mkDerivation { - pname = "clash-prelude"; - version = "0.10.14"; - sha256 = "bf99eabf5a0ac6a86523c95a122242d3f5631d1b1870ba83d8e7319f245ef7f2"; - revision = "1"; - editedCabalFile = "badae6cf81fc1997c660b45485f9779eeeda298e676b2df6c07b060919b63f19"; - libraryHaskellDepends = [ - array base data-default deepseq ghc-prim ghc-typelits-extra - ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection - singletons template-haskell - ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-prelude_0_11" = callPackage ({ mkDerivation, array, base, constraints, data-binary-ieee754 , data-default, deepseq, doctest, ghc-prim, ghc-typelits-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp @@ -41842,24 +39706,6 @@ self: { }) {}; "clash-systemverilog" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-systemverilog"; - version = "0.6.10"; - sha256 = "20c33d2966648ecf383793308b0292437cccd06c4bd5535c1f280689180a2d6b"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-systemverilog_0_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable , lens, mtl, text, unordered-containers, wl-pprint-text }: @@ -41878,24 +39724,6 @@ self: { }) {}; "clash-verilog" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-verilog"; - version = "0.6.10"; - sha256 = "943c2c8752a3b44badce60595ffc5bbea2c87316681cd69460d75053e00fb26c"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Verilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-verilog_0_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable , lens, mtl, text, unordered-containers, wl-pprint-text }: @@ -41914,26 +39742,6 @@ self: { }) {}; "clash-vhdl" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-vhdl"; - version = "0.6.16"; - sha256 = "42f4be26a545144c0e950c2a0b3d59516e93e73ed2c6d32d3c449e233d32b0c8"; - revision = "1"; - editedCabalFile = "b2816898222a54367e8426adb2f3359fd32b1ec8e00d546f32ff3f2839c01b3c"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clash-vhdl_0_7" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, hashable , lens, mtl, text, unordered-containers, wl-pprint-text }: @@ -41979,38 +39787,6 @@ self: { }) {}; "classy-prelude" = callPackage - ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim - , hashable, hspec, lifted-async, lifted-base, monad-unlift - , mono-traversable, mono-traversable-instances, mtl - , mutable-containers, primitive, QuickCheck, safe-exceptions, say - , semigroups, stm, stm-chans, text, time, time-locale-compat - , transformers, transformers-base, unordered-containers, vector - , vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "1.0.2"; - sha256 = "4e5facf997758af2f15387349f373997abeee3edf3a3953e412490d4a9f5a467"; - libraryHaskellDepends = [ - async base basic-prelude bifunctors bytestring chunked-data - containers deepseq dlist exceptions ghc-prim hashable lifted-async - lifted-base monad-unlift mono-traversable - mono-traversable-instances mtl mutable-containers primitive - safe-exceptions say semigroups stm stm-chans text time - time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude_1_2_0" = callPackage ({ mkDerivation, async, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, deepseq, dlist, exceptions, ghc-prim , hashable, hspec, lifted-async, lifted-base, monad-unlift @@ -42043,28 +39819,6 @@ self: { }) {}; "classy-prelude-conduit" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; - version = "1.0.2"; - sha256 = "ab8f17db80cf1058013e00a16078275681faa93f91894263cf6a608c03843f19"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "classy-prelude together with conduit functions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude-conduit_1_2_0" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -42087,26 +39841,6 @@ self: { }) {}; "classy-prelude-yesod" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "1.0.2"; - sha256 = "3183921a292159e8deb0ed63130defa239510beb1692f505438edebd2ca19406"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "classy-prelude-yesod_1_2_0" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -42138,19 +39872,6 @@ self: { }) {}; "clay" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: - mkDerivation { - pname = "clay"; - version = "0.11"; - sha256 = "c3172361b21508ec0634cf43a3cd018323bd0e24ce936f554b0f16ca4329b3c1"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ base hspec hspec-expectations mtl text ]; - homepage = "http://fvisser.nl/clay"; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "clay_0_12_1" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }: mkDerivation { pname = "clay"; @@ -42161,7 +39882,6 @@ self: { homepage = "http://fvisser.nl/clay"; description = "CSS preprocessor as embedded Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks" = callPackage @@ -42178,42 +39898,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.19.2"; - sha256 = "1453a56daccb669931ef6c1a1e6311abc6fef28341c9c75de0fcc34e03e4fb84"; - libraryHaskellDepends = [ - acid-state aeson aeson-qq attoparsec base blaze-html bytestring - cereal containers directory filepath happstack-authenticate - happstack-hsp happstack-jmacro happstack-server - happstack-server-tls hsp hsx-jmacro hsx2hs ixset jmacro lens mtl - network network-uri old-locale process random reform - reform-happstack reform-hsp safecopy stm text time - time-locale-compat unordered-containers userid utf8-string - uuid-orphans uuid-types vector web-plugins web-routes - web-routes-happstack web-routes-hsp web-routes-th xss-sanitize - ]; - librarySystemDepends = [ openssl ]; - homepage = "http://www.clckwrks.com/"; - description = "A secure, reliable content management system (CMS) and blogging platform"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; - - "clckwrks_0_24_0_2" = callPackage - ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, cereal, containers, directory, filepath - , happstack-authenticate, happstack-hsp, happstack-jmacro - , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs - , ixset, jmacro, lens, mtl, network, network-uri, old-locale - , openssl, process, random, reform, reform-happstack, reform-hsp - , safecopy, stm, text, time, time-locale-compat - , unordered-containers, userid, utf8-string, uuid-orphans - , uuid-types, vector, web-plugins, web-routes, web-routes-happstack - , web-routes-hsp, web-routes-th, xss-sanitize - }: - mkDerivation { - pname = "clckwrks"; - version = "0.24.0.2"; - sha256 = "2b1ec612cfb2071de5bdfc166be7d392cc7a00df5e95c53b9b7a3a407e5563d5"; + version = "0.24.0.3"; + sha256 = "aeeaf7c0275295ae45d21721fe9a454ab9fa67991495849eff076344b84a1eb0"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -42333,8 +40019,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-media"; - version = "0.6.16.2"; - sha256 = "bcd36e122d0ab4b791f738d6accb8a98488b73842cef3c4721f6fb89dc62d986"; + version = "0.6.16.3"; + sha256 = "26f77337fa1e9c429462f49616432b2bace533cced64961f32761abe7d9054cf"; libraryHaskellDepends = [ acid-state attoparsec base blaze-html cereal clckwrks containers directory filepath gd happstack-server hsp ixset magic mtl reform @@ -42349,32 +40035,6 @@ self: { }) {}; "clckwrks-plugin-page" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks - , containers, directory, filepath, happstack-hsp, happstack-server - , hsp, hsx2hs, ixset, mtl, old-locale, random, reform - , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins - , web-routes, web-routes-happstack, web-routes-th - }: - mkDerivation { - pname = "clckwrks-plugin-page"; - version = "0.4.3.5"; - sha256 = "fb52a13751c322fde387786e93fdd41e4bb5a6019136fd8daa9d622d15e5d498"; - libraryHaskellDepends = [ - acid-state aeson attoparsec base clckwrks containers directory - filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl - old-locale random reform reform-happstack reform-hsp safecopy - tagsoup template-haskell text time time-locale-compat uuid - uuid-orphans web-plugins web-routes web-routes-happstack - web-routes-th - ]; - homepage = "http://www.clckwrks.com/"; - description = "support for CMS/Blogging in clckwrks"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clckwrks-plugin-page_0_4_3_9" = callPackage ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks , containers, directory, filepath, happstack-hsp, happstack-server , hsp, hsx2hs, ixset, mtl, old-locale, random, reform @@ -42728,8 +40388,8 @@ self: { }: mkDerivation { pname = "clit"; - version = "0.2.2.4"; - sha256 = "0642761a2e3a3426e0ca676503b0c00f7434f3b1d807e799005382e18680109d"; + version = "0.2.2.5"; + sha256 = "e45c77e70996765c2d9f4e803add4e88c3a3701766ee1777eb067e49dff5c21f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42976,28 +40636,6 @@ self: { }) {}; "clustering" = callPackage - ({ mkDerivation, base, binary, containers, hierarchical-clustering - , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty - , tasty-hunit, tasty-quickcheck, vector - }: - mkDerivation { - pname = "clustering"; - version = "0.2.1"; - sha256 = "5078c28e185fd26770726cb2632ff043d99b6918d7a5d135c30bd53fc27ab9cb"; - libraryHaskellDepends = [ - base binary containers matrices mwc-random parallel primitive - vector - ]; - testHaskellDepends = [ - base binary hierarchical-clustering matrices mwc-random Rlang-QQ - split tasty tasty-hunit tasty-quickcheck vector - ]; - description = "High performance clustering algorithms"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "clustering_0_3_1" = callPackage ({ mkDerivation, base, binary, containers, hierarchical-clustering , matrices, mwc-random, parallel, primitive, Rlang-QQ, split, tasty , tasty-hunit, tasty-quickcheck, unordered-containers, vector @@ -43824,8 +41462,8 @@ self: { }: mkDerivation { pname = "colonnade"; - version = "0.5"; - sha256 = "ed16c4510b89ec592fe3f96eef3a3725173aa6184fb89efef604b19aef1d6fb3"; + version = "1.0.0"; + sha256 = "47280e7dc733a66d0e507492e2b5499115027911d6ab859e29c602308f7bdf08"; libraryHaskellDepends = [ base bytestring contravariant text vector ]; @@ -44110,8 +41748,8 @@ self: { ({ mkDerivation, attoparsec, base, QuickCheck, text }: mkDerivation { pname = "comma"; - version = "1.0.1"; - sha256 = "c038511aeb2c5651b853cfd64c0251103a3ae4ba4b722b752e070a8e6029df72"; + version = "1.1.0"; + sha256 = "fec0b23d79c39f3d19660dd2c7652c868de64590f8a9efe0115ab4b08b33befb"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ base QuickCheck text ]; homepage = "https://github.com/lovasko/comma"; @@ -45232,20 +42870,20 @@ self: { "conduit" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, QuickCheck, resourcet, safe + , mmorph, monad-control, mtl, QuickCheck, resourcet, safe, split , transformers, transformers-base }: mkDerivation { pname = "conduit"; - version = "1.2.8"; - sha256 = "80d5df4c70adf2b7e87138c55fba25e05be30eaef0c9a7926d97ae0c0cdb17fb"; + version = "1.2.9"; + sha256 = "8adf9d8916dcb7abf86c4c82cc1c92e99dea8d0a9a5835302a824142d214cf06"; libraryHaskellDepends = [ base exceptions lifted-base mmorph monad-control mtl resourcet transformers transformers-base ]; testHaskellDepends = [ base containers exceptions hspec mtl QuickCheck resourcet safe - transformers + split transformers ]; homepage = "http://github.com/snoyberg/conduit"; description = "Streaming data processing library"; @@ -45328,34 +42966,6 @@ self: { }) {}; "conduit-combinators" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; - version = "1.0.8.3"; - sha256 = "3b81e379c4dcb1cb6212bcbad1d0714e46f400ebf9ae2abe23621db500406dbe"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "conduit-combinators_1_1_0" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers , directory, filepath, hspec, monad-control, mono-traversable, mtl @@ -45381,7 +42991,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Commonly used conduit functions, for both chunked and unchunked data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conduit-connection" = callPackage @@ -45985,8 +43594,8 @@ self: { }: mkDerivation { pname = "console-program"; - version = "0.4.2.0"; - sha256 = "a5476673bb36c25d7103aacffb9748dacf03f4cbafe94e3f16bc8950eececb7a"; + version = "0.4.2.1"; + sha256 = "fe8af591d5adcc26c3c8d7cb8830c8e162e8b7cfd3fd53fd36d17a90c1685bc1"; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht @@ -46072,23 +43681,6 @@ self: { }) {}; "constraints" = callPackage - ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl - , transformers, transformers-compat - }: - mkDerivation { - pname = "constraints"; - version = "0.8"; - sha256 = "4cd08765345a151f21a0a4c5ef0a85661f4e53ffe807a623d5502d9ed3ae1588"; - libraryHaskellDepends = [ - base binary deepseq ghc-prim hashable mtl transformers - transformers-compat - ]; - homepage = "http://github.com/ekmett/constraints/"; - description = "Constraint manipulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "constraints_0_9" = callPackage ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl , transformers, transformers-compat }: @@ -46103,7 +43695,6 @@ self: { homepage = "http://github.com/ekmett/constraints/"; description = "Constraint manipulation"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "constructible" = callPackage @@ -46134,30 +43725,6 @@ self: { }) {}; "consul-haskell" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , connection, either, http-client, http-client-tls, http-types - , HUnit, lifted-async, lifted-base, monad-control, network, stm - , tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "consul-haskell"; - version = "0.3"; - sha256 = "073efdcba614f92e3add447e21e5df032a1f46ec987aa3e12de2353e38121634"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring connection either - http-client http-client-tls http-types lifted-async lifted-base - monad-control network stm text transformers - ]; - testHaskellDepends = [ - base http-client HUnit network tasty tasty-hunit text transformers - ]; - homepage = "https://github.com/alphaHeavy/consul-haskell"; - description = "A consul client for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "consul-haskell_0_4_2" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , connection, either, exceptions, http-client, http-client-tls , http-types, HUnit, lifted-async, lifted-base, monad-control @@ -46262,15 +43829,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "containers_0_5_9_1" = callPackage + "containers_0_5_10_1" = callPackage ({ mkDerivation, array, base, ChasingBottoms, deepseq, ghc-prim , HUnit, QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2, transformers }: mkDerivation { pname = "containers"; - version = "0.5.9.1"; - sha256 = "132d2ab0d56a631fc883bc843c5661380135e19992f724897d24cf6ead450a23"; + version = "0.5.10.1"; + sha256 = "fa74241147e58084fe2520a376349df114b8280ddcd9062ae351fed20946d347"; libraryHaskellDepends = [ array base deepseq ghc-prim ]; testHaskellDepends = [ array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck @@ -47485,8 +45052,8 @@ self: { }: mkDerivation { pname = "cpphs"; - version = "1.20.2"; - sha256 = "dcb1d712a0f867c8a4fdd6e4ce7cbd33ce7912c76ac2db3a6157933fad8629db"; + version = "1.20.3"; + sha256 = "c63f0edb351f0977c2af6ad17c7164c44dc7c7499c0effe91d839fc7973dad91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47853,22 +45420,6 @@ self: { }) {crack = null;}; "crackNum" = callPackage - ({ mkDerivation, base, data-binary-ieee754, ieee754 }: - mkDerivation { - pname = "crackNum"; - version = "1.5"; - sha256 = "ef41fe4afa6866a578b17f84ee231ed70493696fdca9fe54341e124215c1e205"; - revision = "1"; - editedCabalFile = "a8b9973ada5a3b5afbebd90991cf8913dc3f4c0f795ce8ebe61a0d4ff2802e13"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ]; - executableHaskellDepends = [ base data-binary-ieee754 ieee754 ]; - description = "Crack various integer, floating-point data formats"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "crackNum_1_9" = callPackage ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }: mkDerivation { pname = "crackNum"; @@ -47884,7 +45435,6 @@ self: { ]; description = "Crack various integer, floating-point data formats"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "craft" = callPackage @@ -48081,6 +45631,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "credential-store" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, dbus + , memory, safe-exceptions, tasty, tasty-hunit + }: + mkDerivation { + pname = "credential-store"; + version = "0.1.0.0"; + sha256 = "568ba9a4d8a40a1ae074e08da76a0ad48c6507047e6cf89999cc3c0ebafd0f29"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers cryptonite dbus memory safe-exceptions + ]; + executableHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + homepage = "https://github.com/rblaze/credential-store#readme"; + description = "Library to access secure credential storage providers"; + license = stdenv.lib.licenses.asl20; + }) {}; + "credentials" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-dynamodb , amazonka-kms, base, bytestring, conduit, cryptonite, exceptions @@ -48229,38 +45799,6 @@ self: { }) {}; "criterion" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring - , cassava, containers, deepseq, directory, filepath, Glob, hastache - , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck - , statistics, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, vector, vector-algorithms - }: - mkDerivation { - pname = "criterion"; - version = "1.1.1.0"; - sha256 = "e71855a7a9cd946044b2137f31603e0578f6e517a2ed667a2b479990cc0949dd"; - revision = "3"; - editedCabalFile = "0e89cf15205fea2b90e95198774fba60839aab36fc67a695baa482d55013978e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base binary bytestring cassava containers - deepseq directory filepath Glob hastache mtl mwc-random - optparse-applicative parsec statistics text time transformers - transformers-compat vector vector-algorithms - ]; - executableHaskellDepends = [ base optparse-applicative ]; - testHaskellDepends = [ - base bytestring HUnit QuickCheck statistics test-framework - test-framework-hunit test-framework-quickcheck2 vector - ]; - homepage = "http://www.serpentine.com/criterion"; - description = "Robust, reliable performance measurement and analysis"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "criterion_1_1_4_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring , cassava, code-page, containers, deepseq, directory, filepath , Glob, hastache, HUnit, js-flot, js-jquery, mtl, mwc-random @@ -48287,7 +45825,6 @@ self: { homepage = "http://www.serpentine.com/criterion"; description = "Robust, reliable performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "criterion-plus" = callPackage @@ -48338,6 +45875,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "criu-rpc" = callPackage + ({ mkDerivation, base, criu-rpc-types, lens-family, network + , process, proto-lens, text, unix + }: + mkDerivation { + pname = "criu-rpc"; + version = "0.0.2"; + sha256 = "9c9e267eea934021575c15acadb3642292a78a9ebad136563cec43d65d0160ce"; + libraryHaskellDepends = [ + base criu-rpc-types lens-family network process proto-lens text + unix + ]; + description = "CRIU RPC client"; + license = stdenv.lib.licenses.mit; + }) {}; + "criu-rpc-types" = callPackage ({ mkDerivation, base, proto-lens, proto-lens-protoc, protobuf }: mkDerivation { @@ -48384,29 +45937,6 @@ self: { }) {}; "cron" = callPackage - ({ mkDerivation, attoparsec, base, generics-sop, mtl, mtl-compat - , old-locale, quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers-compat - }: - mkDerivation { - pname = "cron"; - version = "0.4.2"; - sha256 = "31f186b9237c802260a7c1468e9b81006c086df1d6ad3d0d6ef51d9d2e8d07d3"; - revision = "1"; - editedCabalFile = "5f6737e07b84d324ea03dc18096622a49b649c5eb372ef64e504695d442b0bde"; - libraryHaskellDepends = [ - attoparsec base mtl mtl-compat old-locale semigroups text time - ]; - testHaskellDepends = [ - attoparsec base generics-sop quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck text time transformers-compat - ]; - homepage = "http://github.com/michaelxavier/cron"; - description = "Cron datatypes and Attoparsec parser"; - license = stdenv.lib.licenses.mit; - }) {}; - - "cron_0_5_0" = callPackage ({ mkDerivation, attoparsec, base, data-default-class, generics-sop , mtl, mtl-compat, old-locale, quickcheck-instances, semigroups , tasty, tasty-hunit, tasty-quickcheck, text, time @@ -48427,7 +45957,6 @@ self: { homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cron-compat" = callPackage @@ -49029,23 +46558,6 @@ self: { }) {}; "cryptonite-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , cryptonite, resourcet, transformers - }: - mkDerivation { - pname = "cryptonite-conduit"; - version = "0.1"; - sha256 = "a79cd5bc2f86093bbc45290889ca5a9c502804a3c19188874bc2ff3f2a97aac0"; - libraryHaskellDepends = [ - base bytestring conduit conduit-extra cryptonite resourcet - transformers - ]; - homepage = "https://github.com/haskell-crypto/cryptonite-conduit"; - description = "cryptonite conduit"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cryptonite-conduit_0_2_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, cryptonite, memory, resourcet, tasty, tasty-hunit , transformers @@ -49065,7 +46577,6 @@ self: { homepage = "https://github.com/haskell-crypto/cryptonite-conduit"; description = "cryptonite conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cryptonite-openssl" = callPackage @@ -52156,6 +49667,24 @@ self: { }) {}; "datasets" = callPackage + ({ mkDerivation, aeson, base, bytestring, cassava, directory + , file-embed, filepath, hashable, HTTP, stringsearch, text, time + , vector + }: + mkDerivation { + pname = "datasets"; + version = "0.2.1"; + sha256 = "af3d9e9093358b9b1a320645a0411c750e9b7ed723f3d29088b5addaeeeb1277"; + libraryHaskellDepends = [ + aeson base bytestring cassava directory file-embed filepath + hashable HTTP stringsearch text time vector + ]; + homepage = "https://github.com/glutamate/datasets"; + description = "Classical data sets for statistics and machine learning"; + license = stdenv.lib.licenses.mit; + }) {}; + + "datasets_0_2_3" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava, directory , file-embed, filepath, hashable, microlens, stringsearch, text , time, vector, wreq @@ -52171,6 +49700,7 @@ self: { homepage = "https://github.com/glutamate/datasets"; description = "Classical data sets for statistics and machine learning"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataurl" = callPackage @@ -52203,6 +49733,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "date-conversions" = callPackage + ({ mkDerivation, base, dates, hspec, QuickCheck, time }: + mkDerivation { + pname = "date-conversions"; + version = "0.1.0.0"; + sha256 = "16b3c0ab70c86b25af6202f5a4a9df442d3cdc095b18fd61082659524eac880c"; + libraryHaskellDepends = [ base dates time ]; + testHaskellDepends = [ base dates hspec QuickCheck time ]; + homepage = "https://github.com/thoughtbot/date-conversions#readme"; + description = "Date conversions"; + license = stdenv.lib.licenses.mit; + }) {}; + "dates" = callPackage ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }: mkDerivation { @@ -53087,25 +50630,6 @@ self: { }) {}; "declarative" = callPackage - ({ mkDerivation, base, hasty-hamiltonian, lens, mcmc-types - , mighty-metropolis, mwc-probability, pipes, primitive - , speedy-slice, transformers - }: - mkDerivation { - pname = "declarative"; - version = "0.2.3"; - sha256 = "f6b0a65295f59d9c696257d667fa9995d9ebefc38b6d98a354fdc428d65d65aa"; - libraryHaskellDepends = [ - base hasty-hamiltonian lens mcmc-types mighty-metropolis - mwc-probability pipes primitive speedy-slice transformers - ]; - testHaskellDepends = [ base mwc-probability ]; - homepage = "http://github.com/jtobin/declarative"; - description = "DIY Markov Chains"; - license = stdenv.lib.licenses.mit; - }) {}; - - "declarative_0_5_1" = callPackage ({ mkDerivation, base, hasty-hamiltonian, kan-extensions, lens , mcmc-types, mighty-metropolis, mwc-probability, pipes, primitive , speedy-slice, transformers @@ -53123,7 +50647,6 @@ self: { homepage = "http://github.com/jtobin/declarative"; description = "DIY Markov Chains"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "decode-utf8" = callPackage @@ -53755,18 +51278,6 @@ self: { }) {}; "dependent-sum" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "dependent-sum"; - version = "0.3.2.2"; - sha256 = "34fbe4675fa3a6ea7ca34913954657a3defee785bd39d55cffcf375f4a3cf864"; - libraryHaskellDepends = [ base ]; - homepage = "https://github.com/mokus0/dependent-sum"; - description = "Dependent sum type"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "dependent-sum_0_4" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "dependent-sum"; @@ -53776,7 +51287,6 @@ self: { homepage = "https://github.com/mokus0/dependent-sum"; description = "Dependent sum type"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dependent-sum-template" = callPackage @@ -54369,23 +51879,6 @@ self: { }) {}; "diagrams" = callPackage - ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib - , diagrams-svg - }: - mkDerivation { - pname = "diagrams"; - version = "1.3.0.1"; - sha256 = "ee8abf5c262955a6a535ddc297bdf829ccd17bc179f61faf953371118ec4e4a7"; - libraryHaskellDepends = [ - diagrams-contrib diagrams-core diagrams-lib diagrams-svg - ]; - doHaddock = false; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative vector graphics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams_1_4" = callPackage ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib , diagrams-svg }: @@ -54400,7 +51893,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative vector graphics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-boolean" = callPackage @@ -54448,27 +51940,6 @@ self: { }) {}; "diagrams-cairo" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, colour, containers - , data-default-class, diagrams-core, diagrams-lib, filepath - , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango - , split, statestack, transformers, unix, vector - }: - mkDerivation { - pname = "diagrams-cairo"; - version = "1.3.1.1"; - sha256 = "00c635a58a480033a2fc1240b703a4afab721f990e1412f57b8fa6becd6878b8"; - libraryHaskellDepends = [ - array base bytestring cairo colour containers data-default-class - diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl - optparse-applicative pango split statestack transformers unix - vector - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Cairo backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-cairo_1_4" = callPackage ({ mkDerivation, array, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, filepath , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango @@ -54487,30 +51958,9 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-canvas" = callPackage - ({ mkDerivation, base, blank-canvas, cmdargs, containers - , data-default-class, diagrams-core, diagrams-lib, lens, mtl - , NumInstances, optparse-applicative, statestack, text - }: - mkDerivation { - pname = "diagrams-canvas"; - version = "1.3.0.6"; - sha256 = "20e905738a7a78061690fc55209041b2c3cdd6f6b6a534b6fdb75728a595a0ff"; - libraryHaskellDepends = [ - base blank-canvas cmdargs containers data-default-class - diagrams-core diagrams-lib lens mtl NumInstances - optparse-applicative statestack text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "diagrams-canvas_1_4" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl , NumInstances, optparse-applicative, statestack, text @@ -54531,33 +51981,6 @@ self: { }) {}; "diagrams-contrib" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , data-default, data-default-class, diagrams-core, diagrams-lib - , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom - , mtl, parsec, QuickCheck, random, semigroups, split - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text - }: - mkDerivation { - pname = "diagrams-contrib"; - version = "1.3.0.12"; - sha256 = "a576a63fc9f216558415303ace621e42778d5db08286b838dd850e9640279620"; - libraryHaskellDepends = [ - base circle-packing colour containers data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout lens linear MonadRandom mtl parsec random semigroups - split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-contrib_1_4_0_1" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , cubicbezier, data-default, data-default-class, diagrams-core , diagrams-lib, diagrams-solve, force-layout, hashable, HUnit, lens @@ -54584,28 +52007,9 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-core" = callPackage - ({ mkDerivation, adjunctions, base, containers, distributive - , dual-tree, lens, linear, monoid-extras, mtl, semigroups - , unordered-containers - }: - mkDerivation { - pname = "diagrams-core"; - version = "1.3.0.8"; - sha256 = "356f5fd77916422616e77fcdcde44aa76c0ff74c9ec9d56c20a54abd96459c73"; - libraryHaskellDepends = [ - adjunctions base containers distributive dual-tree lens linear - monoid-extras mtl semigroups unordered-containers - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Core libraries for diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-core_1_4" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive , dual-tree, lens, linear, monoid-extras, mtl, profunctors , semigroups, unordered-containers @@ -54621,7 +52025,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-graphviz" = callPackage @@ -54641,20 +52044,6 @@ self: { }) {}; "diagrams-gtk" = callPackage - ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }: - mkDerivation { - pname = "diagrams-gtk"; - version = "1.3.0.2"; - sha256 = "ef4751e30f9b51ddb78f5310c5fd890ab9f26dd7cf409e3dbf39a96e73884c29"; - libraryHaskellDepends = [ - base cairo diagrams-cairo diagrams-lib gtk - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Backend for rendering diagrams directly to GTK windows"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-gtk_1_4" = callPackage ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }: mkDerivation { pname = "diagrams-gtk"; @@ -54666,7 +52055,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Backend for rendering diagrams directly to GTK windows"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-haddock" = callPackage @@ -54720,25 +52108,6 @@ self: { }) {}; "diagrams-html5" = callPackage - ({ mkDerivation, base, cmdargs, containers, data-default-class - , diagrams-core, diagrams-lib, lens, mtl, NumInstances - , optparse-applicative, split, statestack, static-canvas, text - }: - mkDerivation { - pname = "diagrams-html5"; - version = "1.3.0.7"; - sha256 = "8bddc55b95b6e0616552d09e59ae74ae315d296ef816552c5d7649035d49f7a4"; - libraryHaskellDepends = [ - base cmdargs containers data-default-class diagrams-core - diagrams-lib lens mtl NumInstances optparse-applicative split - statestack static-canvas text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-html5_1_4" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances , optparse-applicative, split, statestack, static-canvas, text @@ -54755,36 +52124,9 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-lib" = callPackage - ({ mkDerivation, active, adjunctions, array, base, 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 - , semigroups, tagged, tasty, tasty-hunit, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.3.1.4"; - sha256 = "0ed2c2b81a872abc747dffcce74a7b19714f81a78dc44426d9d2baa999009617"; - libraryHaskellDepends = [ - active adjunctions array base 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 semigroups tagged text transformers unordered-containers - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-lib_1_4_0_1" = callPackage ({ mkDerivation, active, adjunctions, array, base, cereal, colour , containers, data-default-class, deepseq, diagrams-core , diagrams-solve, directory, distributive, dual-tree, exceptions @@ -54815,7 +52157,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 @@ -54885,25 +52226,6 @@ self: { }) {}; "diagrams-postscript" = callPackage - ({ mkDerivation, base, containers, data-default-class - , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens - , monoid-extras, mtl, semigroups, split, statestack - }: - mkDerivation { - pname = "diagrams-postscript"; - version = "1.3.0.7"; - sha256 = "f045ad88def2ce2d8ebb641a7c48eacfe6d1eccf2baf42f50935ad2a21def751"; - libraryHaskellDepends = [ - base containers data-default-class diagrams-core diagrams-lib dlist - filepath hashable lens monoid-extras mtl semigroups split - statestack - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Postscript backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-postscript_1_4" = callPackage ({ mkDerivation, base, containers, data-default-class , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens , monoid-extras, mtl, semigroups, split, statestack @@ -54920,7 +52242,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -54940,28 +52261,6 @@ self: { }) {}; "diagrams-rasterific" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable - , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split - , unix - }: - mkDerivation { - pname = "diagrams-rasterific"; - version = "1.3.1.8"; - sha256 = "b76001105055563e2a51f6dbff2e1c12547644014f748e7564f1ded42b75cb99"; - revision = "1"; - editedCabalFile = "9a5004b0563415202937cd437518f75c9910ff25c605630eed77456ce2238041"; - libraryHaskellDepends = [ - base bytestring containers data-default-class diagrams-core - diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl - optparse-applicative Rasterific split unix - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Rasterific backend for diagrams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-rasterific_1_4" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity , hashable, JuicyPixels, lens, mtl, optparse-applicative @@ -54979,7 +52278,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-reflex" = callPackage @@ -55031,28 +52329,6 @@ self: { }) {}; "diagrams-svg" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, colour - , containers, diagrams-core, diagrams-lib, directory, filepath - , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time - , optparse-applicative, process, semigroups, split, svg-builder - , text, time - }: - mkDerivation { - pname = "diagrams-svg"; - version = "1.4.0.3"; - sha256 = "1ed1579ea601d2061373e636f558765179981b3d70e62cf18adf0617c4bf59e5"; - libraryHaskellDepends = [ - base base64-bytestring bytestring colour containers diagrams-core - diagrams-lib directory filepath hashable JuicyPixels lens - monoid-extras mtl old-time optparse-applicative process semigroups - split svg-builder text time - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "SVG backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-svg_1_4_1" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, filepath, hashable , JuicyPixels, lens, monoid-extras, mtl, optparse-applicative @@ -55070,7 +52346,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -55291,23 +52566,6 @@ self: { }) {}; "diff3" = callPackage - ({ mkDerivation, base, Diff, QuickCheck, test-framework - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "diff3"; - version = "0.2.0.3"; - sha256 = "e84c84f03bd100c2ae950b218397fb6af1f838ca1fce8b876817610d65b0ae7d"; - libraryHaskellDepends = [ base Diff ]; - testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 - ]; - homepage = "http://github.com/ocharles/diff3.git"; - description = "Perform a 3-way difference of documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diff3_0_3_0" = callPackage ({ mkDerivation, base, Diff, QuickCheck, test-framework , test-framework-quickcheck2 }: @@ -55322,7 +52580,6 @@ self: { homepage = "http://github.com/ocharles/diff3.git"; description = "Perform a 3-way difference of documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diffarray" = callPackage @@ -55502,8 +52759,8 @@ self: { }: mkDerivation { pname = "digestive-functors-aeson"; - version = "1.1.20"; - sha256 = "017594d7489f33a2d162eb83f4f64bc110b3bd0cfb54982e3220ac3abc440bcc"; + version = "1.1.21"; + sha256 = "1f294cf79bd20f872545b84cf88acc3745304d342ff0253c52e948e53d304e78"; libraryHaskellDepends = [ aeson base containers digestive-functors lens lens-aeson safe text vector @@ -56768,8 +54025,8 @@ self: { ({ mkDerivation, array, base, containers, MonadRandom, random }: mkDerivation { pname = "distribution"; - version = "1.0.1.0"; - sha256 = "c5777b37b0b200966f73c69d3586dd694fe13ab7e587c5d8fd23efad9cdc1f0e"; + version = "1.1.0.0"; + sha256 = "dbe2682b5fdf93c3e0d98f950926774a8c7bd9b443a41016e8f86e86e254810e"; libraryHaskellDepends = [ array base containers MonadRandom random ]; @@ -56840,29 +54097,6 @@ self: { }) {}; "diversity" = callPackage - ({ mkDerivation, base, containers, data-ordlist, fasta - , math-functions, MonadRandom, optparse-applicative, parsec, pipes - , random-shuffle, scientific, split - }: - mkDerivation { - pname = "diversity"; - version = "0.8.0.1"; - sha256 = "06ee80a100424346e725777467173198a574d1df354cfd0051b0ee2983c1feba"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers data-ordlist fasta math-functions MonadRandom - parsec random-shuffle scientific split - ]; - executableHaskellDepends = [ - base containers fasta optparse-applicative pipes - ]; - homepage = "https://github.com/GregorySchwartz/diversity"; - description = "Quantify the diversity of a population"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "diversity_0_8_0_2" = callPackage ({ mkDerivation, base, containers, data-ordlist, fasta , math-functions, MonadRandom, optparse-applicative, parsec, pipes , random-shuffle, scientific, semigroups, split @@ -56883,7 +54117,6 @@ self: { homepage = "https://github.com/GregorySchwartz/diversity"; description = "Quantify the diversity of a population"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dixi" = callPackage @@ -58193,28 +55426,6 @@ self: { }) {}; "drifter-postgresql" = callPackage - ({ mkDerivation, base, drifter, either, mtl, postgresql-simple - , tasty, tasty-hunit, text, time - }: - mkDerivation { - pname = "drifter-postgresql"; - version = "0.0.2"; - sha256 = "07fbd1e08b517d2fde939657237c7a05f2b1d1abe276681ab7254b1ab8415190"; - revision = "1"; - editedCabalFile = "577c35da613b6dface440995d0428e846dc4014764a635b61aa3f4bd83fa2f6b"; - libraryHaskellDepends = [ - base drifter either mtl postgresql-simple time - ]; - testHaskellDepends = [ - base drifter either postgresql-simple tasty tasty-hunit text - ]; - homepage = "http://github.com/michaelxavier/drifter-postgresql"; - description = "PostgreSQL support for the drifter schema migration tool"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "drifter-postgresql_0_1_0" = callPackage ({ mkDerivation, base, containers, drifter, either, mtl , postgresql-simple, tasty, tasty-hunit, text, time }: @@ -59081,6 +56292,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "earclipper" = callPackage + ({ mkDerivation, base, filepath, hspec }: + mkDerivation { + pname = "earclipper"; + version = "0.0.0.1"; + sha256 = "9f0adbe9e9520657a1af71f45b7b0476447ab8466664ddfcb83e0e31394e6615"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base filepath hspec ]; + homepage = "https://github.com/zaidan/earclipper#readme"; + description = "Ear Clipping Triangulation"; + license = stdenv.lib.licenses.mit; + }) {}; + "easy-api" = callPackage ({ mkDerivation, aeson, base, bytestring, either, http-conduit, mtl , resourcet, text @@ -59950,8 +57177,8 @@ self: { }: mkDerivation { pname = "ekg-bosun"; - version = "1.0.6"; - sha256 = "1083f3fac91439ccd32d1d0fcdf0fd6a1885ef78c688f02082e6369dcbb5364f"; + version = "1.0.7"; + sha256 = "2266b9bd5f43108d9f386efd0c8fa1976e59ec2baa12ecefb815387a3a4be927"; libraryHaskellDepends = [ aeson base ekg-core http-client lens network network-uri old-locale text time unordered-containers vector wreq @@ -59967,8 +57194,8 @@ self: { }: mkDerivation { pname = "ekg-carbon"; - version = "1.0.5"; - sha256 = "a2617140efc624787954f73700a05a79aa466742ae054c50c415ddbb418ad661"; + version = "1.0.6"; + sha256 = "730398bdc04966332584439346e242554b5f0e03c38ff00243eee54c451225b5"; libraryHaskellDepends = [ base ekg-core network network-carbon text time unordered-containers vector @@ -60233,23 +57460,6 @@ self: { }) {}; "elm-bridge" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, QuickCheck - , template-haskell, text - }: - mkDerivation { - pname = "elm-bridge"; - version = "0.3.0.2"; - sha256 = "d83389362bfdc0c526bc574b413136b578cc01b61a694eaf45325531e850192f"; - 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_0" = callPackage ({ mkDerivation, aeson, base, containers, hspec, QuickCheck , template-haskell, text }: @@ -60264,7 +57474,6 @@ self: { homepage = "https://github.com/agrafix/elm-bridge"; description = "Derive Elm types from Haskell types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "elm-build-lib" = callPackage @@ -60367,8 +57576,8 @@ self: { }: mkDerivation { pname = "elm-export-persistent"; - version = "0.1.1"; - sha256 = "a1866db56266261df0d8e99acc0534c32db75c1314b0578c089f02e34cad7ca2"; + version = "0.1.2"; + sha256 = "bc45ef54b7538b0c8223a1b966cbd10a69dac3879897d2a75b148dcdc7d8de9d"; libraryHaskellDepends = [ aeson base elm-export persistent scientific text unordered-containers @@ -60742,27 +57951,6 @@ self: { }) {}; "emailaddress" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest - , email-validate, Glob, http-api-data, opaleye, path-pieces - , persistent, postgresql-simple, product-profunctors, profunctors - , text - }: - mkDerivation { - pname = "emailaddress"; - version = "0.1.6.0"; - sha256 = "5b81ba46a7228bad005cf0370a4762fac06729277355dc02085c4d81697c689d"; - libraryHaskellDepends = [ - aeson base bifunctors bytestring email-validate http-api-data - opaleye path-pieces persistent postgresql-simple - product-profunctors profunctors text - ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/emailaddress#readme"; - description = "Wrapper around email-validate library adding instances for common type classes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "emailaddress_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, doctest , email-validate, Glob, http-api-data, opaleye, path-pieces , persistent, postgresql-simple, product-profunctors, profunctors @@ -60781,7 +57969,6 @@ self: { homepage = "https://github.com/cdepillabout/emailaddress#readme"; description = "Wrapper around email-validate library adding instances for common type classes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "emailparse" = callPackage @@ -60991,8 +58178,8 @@ self: { }: mkDerivation { pname = "engine-io"; - version = "1.2.14"; - sha256 = "f321e826d56d7f14b4e027ddb57be59b2efa34a714e566e23a6bcee192ab6f33"; + version = "1.2.15"; + sha256 = "fb9430bec86f82463b7314c9d699441bd96a1681d6b1fac0bfd2cb4be7b9f9df"; libraryHaskellDepends = [ aeson async attoparsec base base64-bytestring bytestring either free monad-loops mwc-random stm stm-delay text transformers @@ -61025,18 +58212,17 @@ self: { }) {}; "engine-io-snap" = callPackage - ({ mkDerivation, attoparsec-enumerator, base, bytestring - , containers, engine-io, MonadCatchIO-transformers, snap-core - , unordered-containers, websockets, websockets-snap + ({ mkDerivation, base, bytestring, containers, engine-io + , io-streams, lifted-base, snap-core, unordered-containers + , websockets, websockets-snap }: mkDerivation { pname = "engine-io-snap"; - version = "1.0.3"; - sha256 = "6f411258df83db0466096a70f3b3eb78aee8de6e24ba68be9d7fe746564a4044"; + version = "1.0.4"; + sha256 = "687323f00aecb1196c5790aaac1361c055ffa3a1d4658a6ad963469e034779f0"; libraryHaskellDepends = [ - attoparsec-enumerator base bytestring containers engine-io - MonadCatchIO-transformers snap-core unordered-containers websockets - websockets-snap + base bytestring containers engine-io io-streams lifted-base + snap-core unordered-containers websockets websockets-snap ]; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; @@ -61315,19 +58501,6 @@ self: { }) {}; "envelope" = callPackage - ({ mkDerivation, aeson, base, doctest, Glob, mtl, text }: - mkDerivation { - pname = "envelope"; - version = "0.1.0.0"; - sha256 = "9116ceda5b6e103219361bcd5cdaa699a1365a43df06e5752c61dfb6419b316e"; - libraryHaskellDepends = [ aeson base mtl text ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/envelope#readme"; - description = "Defines generic 'Envelope' type to wrap reponses from a JSON API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "envelope_0_2_1_0" = callPackage ({ mkDerivation, aeson, base, doctest, Glob, http-api-data, mtl , text }: @@ -61340,7 +58513,6 @@ self: { homepage = "https://github.com/cdepillabout/envelope#readme"; description = "Defines generic 'Envelope' type to wrap reponses from a JSON API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "envparse" = callPackage @@ -61362,8 +58534,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "1.3.0.0"; - sha256 = "ed2906c08163045e8b2ba22d591d79954e2b070b7643632e4e860ad09a7968bd"; + version = "1.3.0.1"; + sha256 = "ac630e03e9f4c8c99c39e622b9638c3bdc3b71300ef92597d60acac7ace8e85c"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -61582,8 +58754,8 @@ self: { }: mkDerivation { pname = "equivalence"; - version = "0.3.1"; - sha256 = "7a0539546e4fc1a00fb190109be45b0cb4af7047d8c2abaf65b8e401e828207e"; + version = "0.3.2"; + sha256 = "7da21ed5f980caa18c995190dd527c69822050390e4237c92f1acbed7d5b0529"; libraryHaskellDepends = [ base containers mtl STMonadTrans transformers transformers-compat ]; @@ -61592,7 +58764,7 @@ self: { test-framework test-framework-quickcheck2 transformers transformers-compat ]; - homepage = "https://bitbucket.org/paba/equivalence/"; + homepage = "https://github.com/pa-ba/equivalence"; description = "Maintaining an equivalence relation implemented as union-find using STT"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -62508,32 +59680,6 @@ self: { }) {}; "eventstore" = callPackage - ({ mkDerivation, aeson, array, async, base, bytestring, cereal - , connection, containers, dns, dotnet-timespan, http-client - , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; - version = "0.13.1.2"; - sha256 = "b519ae59c56c345cc2abe2bc6a779627d35c5553e9c0cfd51cb4aea4db9538fc"; - libraryHaskellDepends = [ - aeson array async base bytestring cereal connection containers dns - dotnet-timespan http-client protobuf random semigroups stm text - time unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base connection dotnet-timespan stm tasty tasty-hunit text - time - ]; - homepage = "http://github.com/YoEight/eventstore"; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "eventstore_0_14_0_1" = callPackage ({ mkDerivation, aeson, array, base, cereal, classy-prelude , connection, containers, dns, dotnet-timespan, http-client, mtl , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time @@ -62849,21 +59995,22 @@ self: { "exherbo-cabal" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal - , containers, data-default, doctest, haddock-library, http-client - , http-types, optparse-applicative, pcre-light, pretty + , containers, data-default, deepseq, directory, doctest, filepath + , haddock-library, http-client, http-types, optparse-applicative + , pcre-light, pretty }: mkDerivation { pname = "exherbo-cabal"; - version = "0.2.0.0"; - sha256 = "f052683dc1c0ecd91dfae4c3c3200e6601615590b51549e756e8ccb5260a7d5f"; + version = "0.2.1.1"; + sha256 = "30b744eced087cbffc9b631e0e4cdd150bf78c13db2363411ddf3330a6c6da3d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base Cabal containers data-default haddock-library pretty ]; executableHaskellDepends = [ - ansi-wl-pprint base bytestring Cabal data-default http-client - http-types optparse-applicative pcre-light + ansi-wl-pprint base bytestring Cabal data-default deepseq directory + filepath http-client http-types optparse-applicative pcre-light ]; testHaskellDepends = [ base doctest ]; description = "Exheres generator for cabal packages"; @@ -63018,27 +60165,6 @@ self: { }) {}; "exp-pairs" = callPackage - ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix - , QuickCheck, random, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, wl-pprint - }: - mkDerivation { - pname = "exp-pairs"; - version = "0.1.5.1"; - sha256 = "cb83312447031547092d9eef5ee092494d624d8e0c6a314ea66b8ec006f3aa2f"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim wl-pprint - ]; - testHaskellDepends = [ - base matrix QuickCheck random smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/Bodigrim/exp-pairs"; - description = "Linear programming over exponent pairs"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "exp-pairs_0_1_5_2" = callPackage ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix , QuickCheck, random, smallcheck, tasty, tasty-hunit , tasty-quickcheck, tasty-smallcheck, wl-pprint @@ -63057,7 +60183,6 @@ self: { homepage = "https://github.com/Bodigrim/exp-pairs"; description = "Linear programming over exponent pairs"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "expand" = callPackage @@ -63419,25 +60544,6 @@ self: { }) {}; "extra" = callPackage - ({ mkDerivation, base, directory, filepath, process, QuickCheck - , time, unix - }: - mkDerivation { - pname = "extra"; - version = "1.4.10"; - sha256 = "b40b3f74c02e40697f4ba5242a764c2846921e8aafdd92e79a30a7afd9e56759"; - libraryHaskellDepends = [ - base directory filepath process time unix - ]; - testHaskellDepends = [ - base directory filepath QuickCheck time unix - ]; - homepage = "https://github.com/ndmitchell/extra#readme"; - description = "Extra functions I use"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extra_1_5_1" = callPackage ({ mkDerivation, base, clock, directory, filepath, process , QuickCheck, time, unix }: @@ -63454,7 +60560,6 @@ self: { 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 @@ -63924,8 +61029,8 @@ self: { }: mkDerivation { pname = "fasta"; - version = "0.10.4.0"; - sha256 = "d37616f6107834ce47cc57163e9dddda055ef13b0400d74d6e77cbdd249f69da"; + version = "0.10.4.1"; + sha256 = "0a282adecb22764cd99c056cc0a871e29adac3568ba92b37eabf8f064ad6d482"; libraryHaskellDepends = [ attoparsec base bytestring containers foldl lens parsec pipes pipes-attoparsec pipes-bytestring pipes-group pipes-text split text @@ -64049,37 +61154,6 @@ self: { }) {}; "fay" = callPackage - ({ mkDerivation, aeson, base, base-compat, bytestring, containers - , data-default, data-lens-light, directory, filepath, ghc-paths - , haskell-src-exts, language-ecmascript, mtl, mtl-compat - , optparse-applicative, process, safe, sourcemap, split, spoon, syb - , text, time, transformers, transformers-compat - , traverse-with-class, type-eq, uniplate, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "fay"; - version = "0.23.1.12"; - sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727"; - revision = "6"; - editedCabalFile = "4dd008fc4b03b8fc6e67eff2fb1c42b4f5552529bdd4f63f4290ef25a5327e0b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-compat bytestring containers data-default - data-lens-light directory filepath ghc-paths haskell-src-exts - language-ecmascript mtl mtl-compat process safe sourcemap split - spoon syb text time transformers transformers-compat - traverse-with-class type-eq uniplate unordered-containers - utf8-string vector - ]; - executableHaskellDepends = [ base mtl optparse-applicative split ]; - homepage = "https://github.com/faylang/fay/wiki"; - description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fay_0_23_1_16" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , data-default, data-lens-light, directory, filepath, ghc-paths , haskell-src-exts, language-ecmascript, mtl, mtl-compat @@ -64108,7 +61182,6 @@ self: { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fay-base" = callPackage @@ -65809,18 +62882,6 @@ self: { }) {}; "fixed-vector" = callPackage - ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: - mkDerivation { - pname = "fixed-vector"; - version = "0.8.1.0"; - sha256 = "3c3c29c7248c08061949843727e83ad234584ca77f8076ecd9537a185ebe3a93"; - libraryHaskellDepends = [ base deepseq primitive ]; - testHaskellDepends = [ base doctest filemanip primitive ]; - description = "Generic vectors with statically known size"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fixed-vector_0_9_0_0" = callPackage ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: mkDerivation { pname = "fixed-vector"; @@ -65830,7 +62891,6 @@ self: { testHaskellDepends = [ base doctest filemanip primitive ]; description = "Generic vectors with statically known size"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fixed-vector-binary" = callPackage @@ -66162,24 +63222,6 @@ self: { }) {}; "flat-mcmc" = callPackage - ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras - , mwc-probability, pipes, primitive, transformers, vector - }: - mkDerivation { - pname = "flat-mcmc"; - version = "1.0.1"; - sha256 = "a2852f0b020b086fa9e28e63b502a7bbdcbc4151080ce01baa366d53362de774"; - libraryHaskellDepends = [ - base mcmc-types monad-par monad-par-extras mwc-probability pipes - primitive transformers vector - ]; - testHaskellDepends = [ base vector ]; - homepage = "http://jtobin.github.com/flat-mcmc"; - description = "Painless general-purpose sampling"; - license = stdenv.lib.licenses.mit; - }) {}; - - "flat-mcmc_1_5_0" = callPackage ({ mkDerivation, base, formatting, mcmc-types, monad-par , monad-par-extras, mwc-probability, pipes, primitive, text , transformers, vector @@ -66196,7 +63238,6 @@ self: { homepage = "https://github.com/jtobin/flat-mcmc"; description = "Painless general-purpose sampling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-tex" = callPackage @@ -66603,8 +63644,8 @@ self: { }: mkDerivation { pname = "fltkhs"; - version = "0.5.0.6"; - sha256 = "aef86dd12b001265c4e3ab15edea6cdae8f795baafc8a32764740179c2159fdd"; + version = "0.5.0.7"; + sha256 = "428add7568eea3e7b813b7ae89d824d7a97e8810662aa5371357b17f630dccde"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -67007,6 +64048,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "folgerhs" = callPackage + ({ mkDerivation, base, xml }: + mkDerivation { + pname = "folgerhs"; + version = "0.1.0.0"; + sha256 = "fbaf6da3ce10a7bf33ab696b807e475613257080679a36933cb3097b82df7abf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base xml ]; + executableHaskellDepends = [ base xml ]; + homepage = "https://github.com/SU-LOSP/tools#readme"; + description = "Toolset for Folger Shakespeare Library's XML annotated plays"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "follower" = callPackage ({ mkDerivation, ansi-wl-pprint, base, cmdargs, directory, filepath , hs-twitter, old-locale, strict, time @@ -68644,15 +65700,16 @@ self: { }) {}; "ftp-client" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, connection, network - , transformers + ({ mkDerivation, attoparsec, base, bytestring, connection + , exceptions, network, transformers }: mkDerivation { pname = "ftp-client"; - version = "0.3.0.0"; - sha256 = "f21e6669f32eb088b51a1770cd8eaf66f6af97cb27ae5254ab9ed971325da3da"; + version = "0.4.0.0"; + sha256 = "6742576a894fbebe30a4f4b55d78baf03ae0e0d068d9704d7d41c33077bd93c7"; libraryHaskellDepends = [ - attoparsec base bytestring connection network transformers + attoparsec base bytestring connection exceptions network + transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/mr/ftp-client"; @@ -68661,15 +65718,15 @@ self: { }) {}; "ftp-client-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, connection, ftp-client - , ftp-clientconduit, resourcet + ({ mkDerivation, base, bytestring, conduit, connection, exceptions + , ftp-client, ftp-clientconduit, resourcet }: mkDerivation { pname = "ftp-client-conduit"; - version = "0.3.0.0"; - sha256 = "dc5fd4556567f3d902b4d2a8511dc4732de2a26b0206f7af1e5c9e602ec00c52"; + version = "0.4.0.0"; + sha256 = "cdfea17aa55aaceba29f627b24bc6f0d6c350578e0675e3ec8161bafbe76004f"; libraryHaskellDepends = [ - base bytestring conduit connection ftp-client resourcet + base bytestring conduit connection exceptions ftp-client resourcet ]; testHaskellDepends = [ base ftp-clientconduit ]; homepage = "https://github.com/mr/ftp-client"; @@ -70360,21 +67417,6 @@ self: { }) {}; "genvalidity" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, validity }: - mkDerivation { - pname = "genvalidity"; - version = "0.2.0.4"; - sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57"; - revision = "2"; - editedCabalFile = "6865bde6373f043b1411042b9837392bcc3662c1ed78fa1b53f905af3fbb3461"; - libraryHaskellDepends = [ base QuickCheck validity ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Testing utilities for the validity library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity_0_3_0_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; @@ -70387,7 +67429,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Testing utilities for the validity library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-containers" = callPackage @@ -70411,25 +67452,6 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck - , validity - }: - mkDerivation { - pname = "genvalidity-hspec"; - version = "0.2.0.5"; - sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b"; - revision = "1"; - editedCabalFile = "34c42da21c1b3a5120be73a5b01f005d3c9278c8b45bce87b8d10b25d185db46"; - libraryHaskellDepends = [ - base genvalidity hspec QuickCheck validity - ]; - testHaskellDepends = [ base doctest ]; - homepage = "https://github.com/NorfairKing/validity#readme"; - description = "Standard spec's for GenValidity instances"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-hspec_0_3_0_0" = callPackage ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck , validity }: @@ -70446,7 +67468,6 @@ self: { homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-hspec-aeson" = callPackage @@ -71037,21 +68058,21 @@ self: { }) {}; "ghc-exactprint" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filemanip - , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently - , syb + ({ mkDerivation, base, bytestring, containers, Diff, directory + , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl + , silently, syb }: mkDerivation { pname = "ghc-exactprint"; - version = "0.5.2.1"; - sha256 = "756d6d0a706321a3ccd0b3c11c6cee65b5ecce95a988dda540e4f6743a602f08"; + version = "0.5.3.0"; + sha256 = "90e088b04a5b72d7c502049a201180bd593912d831d48b605582882dc9bc332d"; libraryHaskellDepends = [ base bytestring containers directory filepath free ghc ghc-boot ghc-paths mtl syb ]; testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-boot ghc-paths - HUnit mtl silently syb + base bytestring containers Diff directory filemanip filepath ghc + ghc-boot ghc-paths HUnit mtl silently syb ]; description = "ExactPrint for GHC"; license = stdenv.lib.licenses.bsd3; @@ -71168,45 +68189,6 @@ self: { }) {}; "ghc-mod" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper - , containers, 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, pretty, process, safe - , split, syb, template-haskell, temporary, text, time, transformers - , transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.6.0.0"; - sha256 = "69b880410c028e9b7bf60c67120eeb567927fc6fba4df5400b057eba9efaa20e"; - revision = "4"; - editedCabalFile = "c432e3b9ee808551fe785d6c61b9daa8370add1a6a9b7ec1a25869e2122cd3e4"; - isLibrary = true; - isExecutable = true; - setupHaskellDepends = [ - base Cabal containers 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 pretty process safe 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 pretty process split time - ]; - testHaskellDepends = [ base doctest hspec ]; - homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell Programming"; - license = stdenv.lib.licenses.agpl3; - }) {}; - - "ghc-mod_5_7_0_0" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, cabal-helper , containers, deepseq, directory, djinn-ghc, doctest, extra , fclabels, filepath, ghc, ghc-boot, ghc-paths, ghc-syb-utils @@ -71244,7 +68226,6 @@ self: { homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-mtl" = callPackage @@ -71884,17 +68865,6 @@ self: { }) {}; "ghcjs-perch" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "ghcjs-perch"; - version = "0.3.3"; - sha256 = "89691df04bf1c056df7f66969a25a15c8ab7edeaaa36afdd01d15b7f21049416"; - libraryHaskellDepends = [ base transformers ]; - description = "GHCJS version of Perch library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ghcjs-perch_0_3_3_1" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "ghcjs-perch"; @@ -71903,7 +68873,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "GHCJS version of Perch library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcjs-promise" = callPackage @@ -72034,25 +69003,6 @@ self: { }) {}; "gi-atk" = callPackage - ({ mkDerivation, atk, base, bytestring, containers, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-atk"; - version = "2.0.3"; - sha256 = "3470813961cc6223c02b29cceaede04966b4e5ed497748bd0a61c023d7142620"; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ atk ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Atk bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) atk;}; - - "gi-atk_2_0_11" = callPackage ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib , gi-gobject, haskell-gi, haskell-gi-base, text, transformers }: @@ -72070,35 +69020,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Atk bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) atk;}; "gi-cairo" = callPackage - ({ mkDerivation, base, bytestring, cairo, containers - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-cairo"; - version = "1.0.3"; - sha256 = "0b54aff46b1998285a79a7356c5a74699112d6b09f1952bb30622ee6b53afe8b"; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Cairo bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; - - "gi-cairo_1_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers @@ -72122,32 +69046,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Cairo bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection;}; "gi-gdk" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-cairo - , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 - , haskell-gi, haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-gdk"; - version = "3.0.3"; - sha256 = "12bd380233f41a43479891a3f731391b7ecd1d74712f263f835089cb8090be4b"; - libraryHaskellDepends = [ - base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib - gi-gobject gi-pango haskell-gi haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Gdk bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk3 = pkgs.gnome3.gtk;}; - - "gi-gdk_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 , haskell-gi, haskell-gi-base, text, transformers @@ -72171,31 +69072,6 @@ self: { }) {gtk3 = pkgs.gnome3.gtk;}; "gi-gdkpixbuf" = callPackage - ({ mkDerivation, base, bytestring, containers, gdk_pixbuf, gi-gio - , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi - , haskell-gi-base, text, transformers - }: - mkDerivation { - pname = "gi-gdkpixbuf"; - version = "2.0.3"; - sha256 = "5c1dcc322ad42839c74e5be2fb715f29bfa1f06d285ea4e90d2f3a19a6f545c9"; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ gdk_pixbuf gobjectIntrospection ]; - doHaddock = false; - preConfigure = '' - export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0:${gdk_pixbuf.dev}/share/gir-1.0 - export GI_TYPELIB_PATH=${gdk_pixbuf.out}/lib/girepository-1.0 - ''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "GdkPixbuf bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) gdk_pixbuf; - inherit (pkgs) gobjectIntrospection;}; - - "gi-gdkpixbuf_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf , gi-gio, gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers @@ -72218,32 +69094,10 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GdkPixbuf bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gobjectIntrospection;}; "gi-gio" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject - , glib, gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-gio"; - version = "2.0.3"; - sha256 = "1b2cc15f3cb60b72a7256ec8b5d0a07644b850055ae45fab5b0be9633d96f09c"; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Gio bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "gi-gio_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, glib, gobjectIntrospection, haskell-gi , haskell-gi-base, text, transformers @@ -72263,7 +69117,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Gio bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "gi-girepository" = callPackage @@ -72289,27 +69142,6 @@ self: { }) {inherit (pkgs) gobjectIntrospection;}; "gi-glib" = callPackage - ({ mkDerivation, base, bytestring, containers, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-glib"; - version = "2.0.3"; - sha256 = "2a961091547deaf8509ef3213353ec7b6ea458a584a81eef7d2685f8312b1170"; - libraryHaskellDepends = [ - base bytestring containers haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "GLib bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "gi-glib_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers @@ -72329,31 +69161,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GLib bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "gi-gobject" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-glib, glib - , gobjectIntrospection, haskell-gi, haskell-gi-base, text - , transformers - }: - mkDerivation { - pname = "gi-gobject"; - version = "2.0.3"; - sha256 = "9cd5c2c8a2c1599334f705ea15fc3e7e63f012c60a46669ad108a2965d73973b"; - libraryHaskellDepends = [ - base bytestring containers gi-glib haskell-gi haskell-gi-base text - transformers - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "GObject bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "gi-gobject_2_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , gobjectIntrospection, haskell-gi, haskell-gi-base, text , transformers @@ -72373,7 +69183,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GObject bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "gi-gst" = callPackage @@ -72471,29 +69280,6 @@ self: { gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gtk" = callPackage - ({ mkDerivation, base, bytestring, 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.3"; - sha256 = "490acc92f75b231e9770b5bba2e041c2e3cd163c5e6483a153f072b0b6987c31"; - 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; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gtk3.dev}/share/gir-1.0''; - 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_11" = 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 @@ -72583,13 +69369,14 @@ self: { }) {inherit (pkgs.gnome2) gtksourceview;}; "gi-javascriptcore" = callPackage - ({ mkDerivation, base, bytestring, containers, haskell-gi + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi , haskell-gi-base, javascriptcoregtk, text, transformers, webkitgtk }: mkDerivation { pname = "gi-javascriptcore"; - version = "3.0.3"; - sha256 = "b2d01c9b72c4da8b2ebe28cc515a6ecbf0f1eed23519b5cabe3f7381872df974"; + version = "3.0.11"; + sha256 = "88f288c8e70dace97422b7385f77a4d7f856e4a2f5940abc4d41947ec76bb250"; + setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base text transformers @@ -72648,33 +69435,6 @@ self: { }) {inherit (pkgs) libnotify;}; "gi-pango" = callPackage - ({ mkDerivation, base, bytestring, cairo, containers, gi-glib - , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base - , pango, text, transformers - }: - mkDerivation { - pname = "gi-pango"; - version = "1.0.3"; - sha256 = "d1a5f97c17038967573576e2eba05207e1d6d8c89a704d87767681e858fb0257"; - libraryHaskellDepends = [ - base bytestring containers gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ cairo gobjectIntrospection pango ]; - doHaddock = false; - preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${gobjectIntrospection.dev}/share/gir-1.0''; - preCompileBuildDriver = '' - PKG_CONFIG_PATH+=":${cairo}/lib/pkgconfig" - setupCompileFlags+=" $(pkg-config --libs cairo-gobject)" - ''; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Pango bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome2) pango;}; - - "gi-pango_1_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, containers , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi , haskell-gi-base, pango, text, transformers @@ -72757,26 +69517,6 @@ self: { }) {inherit (pkgs) poppler;}; "gi-soup" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib - , gi-gobject, haskell-gi, haskell-gi-base, libsoup, text - , transformers - }: - mkDerivation { - pname = "gi-soup"; - version = "2.4.3"; - sha256 = "ee786ad3b35b6468f53f3962611e5316a020bdf98d9b4050a598f7b45a575a4b"; - libraryHaskellDepends = [ - base bytestring containers gi-gio gi-glib gi-gobject haskell-gi - haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ libsoup ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Libsoup bindings"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome2) libsoup;}; - - "gi-soup_2_4_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio , gi-glib, gi-gobject, haskell-gi, haskell-gi-base, libsoup, text , transformers @@ -72795,7 +69535,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome2) libsoup;}; "gi-vte" = callPackage @@ -72821,29 +69560,6 @@ self: { }) {inherit (pkgs.gnome2) vte;}; "gi-webkit" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo - , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-gtk - , gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base, text - , transformers, webkit - }: - mkDerivation { - pname = "gi-webkit"; - version = "3.0.3"; - sha256 = "8652475bdd3bd713a2eb6ceb55c4ab81bf0939824d707dfe888e007c782fd216"; - libraryHaskellDepends = [ - base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf - gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup - haskell-gi haskell-gi-base text transformers - ]; - libraryPkgconfigDepends = [ webkit ]; - doHaddock = false; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "WebKit bindings"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - - "gi-webkit_3_0_11" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject , gi-gtk, gi-javascriptcore, gi-soup, haskell-gi, haskell-gi-base @@ -73045,33 +69761,6 @@ self: { }) {}; "giphy-api" = callPackage - ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers - , directory, hspec, http-api-data, http-client, http-client-tls - , lens, microlens, microlens-th, mtl, network-uri, servant - , servant-client, text, transformers - }: - mkDerivation { - pname = "giphy-api"; - version = "0.4.0.0"; - sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876"; - revision = "2"; - editedCabalFile = "bf615e33d6be695e26434f8cb6747bb91be136093e0181eb85efe415c689d9f5"; - libraryHaskellDepends = [ - aeson base containers http-api-data http-client http-client-tls - microlens microlens-th mtl network-uri servant servant-client text - transformers - ]; - testHaskellDepends = [ - aeson base basic-prelude bytestring containers directory hspec lens - network-uri text - ]; - homepage = "http://github.com/passy/giphy-api#readme"; - description = "Giphy HTTP API wrapper and CLI search tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "giphy-api_0_5_2_0" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , directory, hspec, http-api-data, http-client, http-client-tls , lens, microlens, microlens-th, mtl, network-uri, servant @@ -73515,8 +70204,8 @@ self: { }: mkDerivation { pname = "gitHUD"; - version = "1.3.5"; - sha256 = "7956019a42632f8658ba9a6508943fd212e9796657252eedec53f48850a07009"; + version = "1.3.6"; + sha256 = "a522924926b65d19601726fb5fde020c0523f0b30c95d6bb1e0ba0d751da8a49"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mtl parsec process text unix ]; @@ -74066,6 +70755,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gjk" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "gjk"; + version = "0.0.0.1"; + sha256 = "8a1dc10dffd485632bb519db13abbfd6a6f9c3cbdc12f33a8c8c6a0359dc104f"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/zaidan/gjk#readme"; + description = "Gilbert-Johnson-Keerthi (GJK) collision detection algorithm"; + license = stdenv.lib.licenses.mit; + }) {}; + "gl" = callPackage ({ mkDerivation, base, containers, directory, filepath, fixed, half , hxt, mesa, split, transformers @@ -74095,27 +70797,6 @@ self: { }) {}; "glabrous" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , cereal, cereal-text, directory, either, hspec, text - , unordered-containers - }: - mkDerivation { - pname = "glabrous"; - version = "0.1.3.0"; - sha256 = "a9afb52cb80e5a9a1ef6bd77897229e7aa29d8fb2b863019d346357792600576"; - libraryHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring cereal cereal-text - either text unordered-containers - ]; - testHaskellDepends = [ - base directory either hspec text unordered-containers - ]; - homepage = "https://github.com/MichelBoucey/glabrous"; - description = "A template DSL library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "glabrous_0_3_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , cereal, cereal-text, directory, either, hspec, text , unordered-containers @@ -74134,7 +70815,6 @@ self: { homepage = "https://github.com/MichelBoucey/glabrous"; description = "A template DSL library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glade" = callPackage @@ -74250,6 +70930,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "glazier-pipes" = callPackage + ({ mkDerivation, base, glazier, lens, mmorph, mtl, pipes + , pipes-concurrency, pipes-misc, stm, stm-extras, transformers + }: + mkDerivation { + pname = "glazier-pipes"; + version = "0.1.4.0"; + sha256 = "351c8002e893ad8cbb6a8eeb2b54c79b3b13665f110180a52d297f85d0a086cc"; + libraryHaskellDepends = [ + base glazier lens mmorph mtl pipes pipes-concurrency pipes-misc stm + stm-extras transformers + ]; + homepage = "https://github.com/louispan/glazier-pipes#readme"; + description = "Converts Glazier widgets into a Pipe"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gli" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , friendly-time, http-client, http-client-tls, http-conduit @@ -74372,8 +71069,8 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.4.0.2"; - sha256 = "89ee909a9120d6fa34f718079fca0e07f18ce20be93573caafa506ee72ec7818"; + version = "0.4.0.3"; + sha256 = "9be9e20690fa8e54e6068eaa89c676a704438efa40c2ccfd8e7d8f9a7b5d418f"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; @@ -75172,30 +71869,6 @@ self: { }) {}; "gogol" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit - , conduit-extra, cryptonite, data-default-class, directory - , exceptions, filepath, gogol-core, http-client, http-conduit - , http-media, http-types, lens, memory, mime-types, monad-control - , mtl, resourcet, text, time, transformers, transformers-base - , unordered-containers, x509, x509-store - }: - mkDerivation { - pname = "gogol"; - version = "0.1.0"; - sha256 = "3bf4a133da2f9e5343025a272d04290a2d229d3429d748b2a49b9b29b85e398e"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive conduit conduit-extra - cryptonite data-default-class directory exceptions filepath - gogol-core http-client http-conduit http-media http-types lens - memory mime-types monad-control mtl resourcet text time - transformers transformers-base unordered-containers x509 x509-store - ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Comprehensive Google Services SDK"; - license = "unknown"; - }) {}; - - "gogol_0_1_1" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit , conduit-extra, cryptonite, directory, exceptions, filepath , gogol-core, http-client, http-conduit, http-media, http-types @@ -75217,22 +71890,34 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Comprehensive Google Services SDK"; license = "unknown"; + }) {}; + + "gogol_0_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive, conduit + , conduit-extra, cryptonite, directory, exceptions, filepath + , gogol-core, http-client, http-conduit, http-media, http-types + , lens, memory, mime-types, monad-control, mtl, resourcet, text + , time, transformers, transformers-base, unordered-containers, x509 + , x509-store + }: + mkDerivation { + pname = "gogol"; + version = "0.2.0"; + sha256 = "5ccc62171ca67889d5e55263627c775b3242bdfa6489b509ae03ceb3d6886c8f"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive conduit conduit-extra + cryptonite directory exceptions filepath gogol-core http-client + http-conduit http-media http-types lens memory mime-types + monad-control mtl resourcet text time transformers + transformers-base unordered-containers x509 x509-store + ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Comprehensive Google Services SDK"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adexchange-buyer" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-adexchange-buyer"; - version = "0.1.0"; - sha256 = "63a778a15a3bdb595e2c0ff46bbe35616891dfda687a8af520dbba219ff09d83"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Ad Exchange Buyer SDK"; - license = "unknown"; - }) {}; - - "gogol-adexchange-buyer_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-buyer"; @@ -75242,22 +71927,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Buyer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adexchange-seller" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-adexchange-seller"; - version = "0.1.0"; - sha256 = "28c81ea7cc984534c445d3fa2278e1306370464e00194e844dc76b8e33a798cc"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Ad Exchange Seller SDK"; - license = "unknown"; - }) {}; - - "gogol-adexchange-seller_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adexchange-seller"; @@ -75267,27 +71939,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Ad Exchange Seller SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-admin-datatransfer" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-datatransfer"; - version = "0.1.0"; - sha256 = "195ab5e18d789959e559d9f7af4db757b5779cdb4b8e61f96bcb14b3fa4ad97b"; + version = "0.1.1"; + sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; license = "unknown"; }) {}; - "gogol-admin-datatransfer_0_1_1" = callPackage + "gogol-admin-datatransfer_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-datatransfer"; - version = "0.1.1"; - sha256 = "4c90607116ed177c84c4980c0f14f50873fff2dcae611e3b620457608f1537a9"; + version = "0.2.0"; + sha256 = "50960b0cd3048d7a3b9860d97f2fd02affea4dd735bc28b4603b3656dba7ef2a"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Data Transfer SDK"; @@ -75296,18 +71967,6 @@ self: { }) {}; "gogol-admin-directory" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-admin-directory"; - version = "0.1.0"; - sha256 = "ce8882d955c7646cb9f2ece2a2827f4db0e44cc0d1af6a968e25ce9cf7cf4622"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Admin Directory SDK"; - license = "unknown"; - }) {}; - - "gogol-admin-directory_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-directory"; @@ -75317,22 +71976,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Directory SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-admin-emailmigration" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-admin-emailmigration"; - version = "0.1.0"; - sha256 = "15b3cea41e4ba648e952adeea91467981e61d8a01b48b5231e78773d89c0da77"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Email Migration API v2 SDK"; - license = "unknown"; - }) {}; - - "gogol-admin-emailmigration_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-emailmigration"; @@ -75342,22 +71988,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Email Migration API v2 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-admin-reports" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-admin-reports"; - version = "0.1.0"; - sha256 = "ce4986e756a1f6d9b5bdf30c1775d32634455ed30c59dd914cc9615be68b785d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Admin Reports SDK"; - license = "unknown"; - }) {}; - - "gogol-admin-reports_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-admin-reports"; @@ -75367,22 +72000,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Admin Reports SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adsense" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-adsense"; - version = "0.1.0"; - sha256 = "2ff7819e65e4378a6e8f875b0dbfe2bc0e839794c738fd3e004957e7a6ac7bde"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google AdSense Management SDK"; - license = "unknown"; - }) {}; - - "gogol-adsense_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense"; @@ -75392,27 +72012,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-adsense-host" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense-host"; - version = "0.1.0"; - sha256 = "64ff681bd7da5da1fff056678137c82811b3b91dfd6077722f30e5d531b32440"; + version = "0.1.1"; + sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; license = "unknown"; }) {}; - "gogol-adsense-host_0_1_1" = callPackage + "gogol-adsense-host_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-adsense-host"; - version = "0.1.1"; - sha256 = "305e3f7df6b3bcca19810ebbf954178f066fb227c7dbf68c16a49ad691578112"; + version = "0.2.0"; + sha256 = "f52fc7f8b5e07bfd193a428476e7c255e9910505d151ef96848519c44e0c73b3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google AdSense Host SDK"; @@ -75424,20 +72043,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-affiliates"; - version = "0.1.0"; - sha256 = "d0800cf733018b75665bbbb382e23f07a033474de438a4064771a541e39e200e"; + version = "0.1.1"; + sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; license = "unknown"; }) {}; - "gogol-affiliates_0_1_1" = callPackage + "gogol-affiliates_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-affiliates"; - version = "0.1.1"; - sha256 = "b90d360660ecd0ac990fa387575a9c32232a885a7b3ecc8fd3c3cf677e469a1c"; + version = "0.2.0"; + sha256 = "83b7d65c19295f276e31fd798eff9a01268dea90419315304be7a6abced94387"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Affiliate Network SDK"; @@ -75446,18 +72065,6 @@ self: { }) {}; "gogol-analytics" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-analytics"; - version = "0.1.0"; - sha256 = "e88b9c6b13566cb2d2e1eee62c24b5ec14c0cb96577bbfd690a17f9810b24548"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Analytics SDK"; - license = "unknown"; - }) {}; - - "gogol-analytics_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-analytics"; @@ -75467,22 +72074,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-android-enterprise" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-android-enterprise"; - version = "0.1.0"; - sha256 = "b71ee2b74419f575c5c5142dd35a23e3762172f664f489f1fa27143e9b8deb9a"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play EMM SDK"; - license = "unknown"; - }) {}; - - "gogol-android-enterprise_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-enterprise"; @@ -75492,22 +72086,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play EMM SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-android-publisher" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-android-publisher"; - version = "0.1.0"; - sha256 = "0dbcf500379366d09e434a4f17790d53bf91a6214e2ff31d52216cd6be17437e"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Developer SDK"; - license = "unknown"; - }) {}; - - "gogol-android-publisher_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-android-publisher"; @@ -75517,22 +72098,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Developer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-appengine" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-appengine"; - version = "0.1.0"; - sha256 = "3aabc08737482e8f0ef9aa0bec136e827540a8de6f66fbf67a1d8e8167a7d523"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google App Engine Admin SDK"; - license = "unknown"; - }) {}; - - "gogol-appengine_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appengine"; @@ -75542,22 +72110,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google App Engine Admin SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-activity" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-activity"; - version = "0.1.0"; - sha256 = "f0cbd5847f751d7ed5e448d9d610986d390161ae37899d368107b0fb7c7a5704"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Apps Activity SDK"; - license = "unknown"; - }) {}; - - "gogol-apps-activity_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-activity"; @@ -75567,27 +72122,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Activity SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-calendar" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-calendar"; - version = "0.1.0"; - sha256 = "4f7d33f1d43d4f9e63d6b1d2077b07280f68a260652fc2d9ed9e5653efa24886"; + version = "0.1.1"; + sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; license = "unknown"; }) {}; - "gogol-apps-calendar_0_1_1" = callPackage + "gogol-apps-calendar_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-calendar"; - version = "0.1.1"; - sha256 = "cbebf7557345799436351e27485f8b4add43e2c449eb0fccb727d921ca16bc67"; + version = "0.2.0"; + sha256 = "1b1772c5c1084ffd1aef4f3c71afba297823362ef7c674cdf53cf86bfe4ffcae"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Calendar SDK"; @@ -75596,18 +72150,6 @@ self: { }) {}; "gogol-apps-licensing" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-licensing"; - version = "0.1.0"; - sha256 = "a037cc3f62f65826e948113f24013349b71b561c97f0d06cd01f8448d136e481"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Enterprise License Manager SDK"; - license = "unknown"; - }) {}; - - "gogol-apps-licensing_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-licensing"; @@ -75617,22 +72159,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise License Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-reseller" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-reseller"; - version = "0.1.0"; - sha256 = "8abc6ee6aad16c27d7d7b37c53e9fcc5343d1d6cf50f4fe732fd436c429a71b5"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Enterprise Apps Reseller SDK"; - license = "unknown"; - }) {}; - - "gogol-apps-reseller_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-reseller"; @@ -75642,22 +72171,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Enterprise Apps Reseller SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-apps-tasks" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-apps-tasks"; - version = "0.1.0"; - sha256 = "222060457d7c5b790cea90a74317f4a760ec7381f2561db9da0715e639e53b92"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Tasks SDK"; - license = "unknown"; - }) {}; - - "gogol-apps-tasks_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-apps-tasks"; @@ -75667,22 +72183,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Tasks SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-appstate" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-appstate"; - version = "0.1.0"; - sha256 = "63961d638f4716ea2f7a619aa21a5ca528159a514aa72d52c0a3ae54b9bd519a"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google App State SDK"; - license = "unknown"; - }) {}; - - "gogol-appstate_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-appstate"; @@ -75692,22 +72195,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google App State SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-autoscaler" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-autoscaler"; - version = "0.1.0"; - sha256 = "dd7e75cff814b08190add708a014790ab58b1ef8f9456a314e6ce732045f658f"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Autoscaler SDK"; - license = "unknown"; - }) {}; - - "gogol-autoscaler_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-autoscaler"; @@ -75717,22 +72207,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Autoscaler SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-bigquery" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-bigquery"; - version = "0.1.0"; - sha256 = "b38065d1d83722b6d39124dc87856343ab11af936e9abb9db4efe55fbf5cf1c3"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google BigQuery SDK"; - license = "unknown"; - }) {}; - - "gogol-bigquery_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-bigquery"; @@ -75742,27 +72219,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google BigQuery SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-billing" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-billing"; - version = "0.1.0"; - sha256 = "b8da90f45e13fc4fc3d6b717d15805ad9a2431364c9f66be77f22635e76629dd"; + version = "0.1.1"; + sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; license = "unknown"; }) {}; - "gogol-billing_0_1_1" = callPackage + "gogol-billing_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-billing"; - version = "0.1.1"; - sha256 = "09903877b7e6c3a87e345a26fca0fb7e1da8751f5b19aeb940479dd3f289a9e8"; + version = "0.2.0"; + sha256 = "52d867cda0d2acbd9fe4381379ab80a9821709b02ef358423d60dc83ba1bf3e9"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Billing SDK"; @@ -75771,18 +72247,6 @@ self: { }) {}; "gogol-blogger" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-blogger"; - version = "0.1.0"; - sha256 = "ef7105faf8560416fb417b462fb81a21ace2b54983a6c43095f7859a2705277a"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Blogger SDK"; - license = "unknown"; - }) {}; - - "gogol-blogger_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-blogger"; @@ -75792,22 +72256,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Blogger SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-books" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-books"; - version = "0.1.0"; - sha256 = "f3bcdfcf2b5daf79effc5b6b137468af37e8640d63f65ba24929b414b4b1dc22"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Books SDK"; - license = "unknown"; - }) {}; - - "gogol-books_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-books"; @@ -75817,27 +72268,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Books SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-civicinfo" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-civicinfo"; - version = "0.1.0"; - sha256 = "0553bf55ec3e453e63e6050528614d6dfe5030413b19c27cdeebf273bae58be7"; + version = "0.1.1"; + sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; license = "unknown"; }) {}; - "gogol-civicinfo_0_1_1" = callPackage + "gogol-civicinfo_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-civicinfo"; - version = "0.1.1"; - sha256 = "53c354c9219c87c2864f9da2883657773c4e13aa635d51164bf89fc5e6d5d442"; + version = "0.2.0"; + sha256 = "6c33f17eaf8eda636b54c6f6e863d73a3ebbd8edf9ed5b0c22cd548ff9f653c3"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Civic Information SDK"; @@ -75849,20 +72299,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-classroom"; - version = "0.1.0"; - sha256 = "5b5715d5403614b588053a6341a24546eec8f9f9269c4e7fb08f3ec36da71134"; + version = "0.1.1"; + sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; license = "unknown"; }) {}; - "gogol-classroom_0_1_1" = callPackage + "gogol-classroom_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-classroom"; - version = "0.1.1"; - sha256 = "7e61a1725d1864df86e00eaadc9c94d885015c5d1310a1374b7cc8e4b2c9769a"; + version = "0.2.0"; + sha256 = "b7b101543bcb5e1316dc41d48bcb49f6b516cd38727e5bc052e44198c1f7b230"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Classroom SDK"; @@ -75871,18 +72321,6 @@ self: { }) {}; "gogol-cloudmonitoring" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-cloudmonitoring"; - version = "0.1.0"; - sha256 = "c822932fd8ec45eb690ba197e4dfd08734d2288fe0ac55562649509d2d66f32b"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Monitoring SDK"; - license = "unknown"; - }) {}; - - "gogol-cloudmonitoring_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudmonitoring"; @@ -75892,22 +72330,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Monitoring SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-cloudtrace" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-cloudtrace"; - version = "0.1.0"; - sha256 = "98c84fc8086cc7defd131a5c99cf1cd307a15343e8ef3d8c038b3e752ceee2b2"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Trace SDK"; - license = "unknown"; - }) {}; - - "gogol-cloudtrace_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-cloudtrace"; @@ -75917,22 +72342,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Trace SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-compute" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-compute"; - version = "0.1.0"; - sha256 = "176bf2c9ae0701bba60f8a9f19d886125a983cd46c05241c4d98778f26926f3b"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine SDK"; - license = "unknown"; - }) {}; - - "gogol-compute_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-compute"; @@ -75942,27 +72354,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-container" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-container"; - version = "0.1.0"; - sha256 = "e2030647c09d58c90a1770c7841d6a0dd2f9f36b19ed12ee2514c34ba9eb79ec"; + version = "0.1.1"; + sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; license = "unknown"; }) {}; - "gogol-container_0_1_1" = callPackage + "gogol-container_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-container"; - version = "0.1.1"; - sha256 = "9b0eaa239338f3a1c23ef6e7fd1587284060419e91cd13dccf7be088d81923b1"; + version = "0.2.0"; + sha256 = "3db448086fc5cd9c2ba967096ebadb44497b00305285cb51a21fd92002f3bcbb"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Container Engine SDK"; @@ -75974,8 +72385,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-containerbuilder"; - version = "0.1.1"; - sha256 = "7362d60cf98c8856351669c0c27fb6945098f598f6de55dd17aed817a7547df8"; + version = "0.2.0"; + sha256 = "5566c8f5ffd62882234b98470e2affe5e0df720aca2b2e097519b7576ffbd1f7"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Container Builder SDK"; @@ -75984,31 +72395,6 @@ self: { }) {}; "gogol-core" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring - , case-insensitive, conduit, dlist, exceptions, hashable - , http-api-data, http-client, http-media, http-types, lens, memory - , resourcet, scientific, servant, tasty, text, time - , unordered-containers - }: - mkDerivation { - pname = "gogol-core"; - version = "0.1.0"; - sha256 = "2284f49106b41cc0ea81c848a5b5c31f0a7bcb2fc5c604519451238cbc3c01b0"; - revision = "1"; - editedCabalFile = "11dbfa4b8778e6b446b60ad1add04d9049169936f6f762d45a3e727e92d5a0b6"; - libraryHaskellDepends = [ - aeson attoparsec base bifunctors bytestring case-insensitive - conduit dlist exceptions hashable http-api-data http-client - http-media http-types lens memory resourcet scientific servant text - time unordered-containers - ]; - testHaskellDepends = [ base tasty ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Core data types and functionality for Gogol libraries"; - license = "unknown"; - }) {}; - - "gogol-core_0_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, dlist, exceptions, hashable , http-api-data, http-client, http-media, http-types, lens, memory @@ -76031,22 +72417,33 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Core data types and functionality for Gogol libraries"; license = "unknown"; + }) {}; + + "gogol-core_0_2_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring + , case-insensitive, conduit, dlist, exceptions, hashable + , http-api-data, http-client, http-media, http-types, lens + , resourcet, scientific, servant, tasty, text, time + , unordered-containers + }: + mkDerivation { + pname = "gogol-core"; + version = "0.2.0"; + sha256 = "a629f7bce87624d0ac1314c8aa080ec1d5488f809864031eab716a51167244ab"; + libraryHaskellDepends = [ + aeson attoparsec base bifunctors bytestring case-insensitive + conduit dlist exceptions hashable http-api-data http-client + http-media http-types lens resourcet scientific servant text time + unordered-containers + ]; + testHaskellDepends = [ base tasty ]; + homepage = "https://github.com/brendanhay/gogol"; + description = "Core data types and functionality for Gogol libraries"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-customsearch" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-customsearch"; - version = "0.1.0"; - sha256 = "3b264eed97aea0cb6ce97edc32ec66f962af7f4892f0ea6313413fba1512eee0"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google CustomSearch SDK"; - license = "unknown"; - }) {}; - - "gogol-customsearch_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-customsearch"; @@ -76056,22 +72453,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google CustomSearch SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dataflow" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dataflow"; - version = "0.1.0"; - sha256 = "ac82d506a5efd3934f08fde8cd77b4ca387ecbe77409ff4ba2dc657bb7834515"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Dataflow SDK"; - license = "unknown"; - }) {}; - - "gogol-dataflow_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataflow"; @@ -76081,22 +72465,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Dataflow SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dataproc" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dataproc"; - version = "0.1.0"; - sha256 = "d4a60220037b16e884499d0944aa6c858889aa322b48783249f7b6006d648b4f"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Dataproc SDK"; - license = "unknown"; - }) {}; - - "gogol-dataproc_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dataproc"; @@ -76106,22 +72477,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Dataproc SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-datastore" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-datastore"; - version = "0.1.0"; - sha256 = "346888db283ed3ff3ffad7310891cd33d230dfe98234ceb006d9b7aea28b5ea4"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Datastore SDK"; - license = "unknown"; - }) {}; - - "gogol-datastore_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-datastore"; @@ -76131,27 +72489,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Datastore SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-debugger" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-debugger"; - version = "0.1.0"; - sha256 = "2f70ed92ff0edd99e7a2e24a00e546a79c1e082f79f97ffbd48b6a24c0f061da"; + version = "0.1.1"; + sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Debugger SDK"; + description = "Google Stackdriver Debugger SDK"; license = "unknown"; }) {}; - "gogol-debugger_0_1_1" = callPackage + "gogol-debugger_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-debugger"; - version = "0.1.1"; - sha256 = "51edec5d57f76a4be8769983831ae655332e55f3fec90bd4bdc22a0644bfbca2"; + version = "0.2.0"; + sha256 = "142b93f72a911e2f039d7b85e5a2b55c85fd631a3251f7089b78ee1496a882e2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Debugger SDK"; @@ -76160,18 +72517,6 @@ self: { }) {}; "gogol-deploymentmanager" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-deploymentmanager"; - version = "0.1.0"; - sha256 = "a3f03570dc6c3d0d678dd4a98d993a0daf8dfa8151fb75b572d372e7b2f881fb"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Deployment Manager SDK"; - license = "unknown"; - }) {}; - - "gogol-deploymentmanager_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-deploymentmanager"; @@ -76181,22 +72526,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Deployment Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dfareporting" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dfareporting"; - version = "0.1.0"; - sha256 = "3c42ecab212babf6ff6355f8f0083216897dcf344d26e22d9743c14794466625"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google DCM/DFA Reporting And Trafficking SDK"; - license = "unknown"; - }) {}; - - "gogol-dfareporting_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dfareporting"; @@ -76206,22 +72538,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google DCM/DFA Reporting And Trafficking SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-discovery" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-discovery"; - version = "0.1.0"; - sha256 = "f8f107dedc76a4aeeb6e18874a79e0d6fcb9e0212953b2ff89d1770466f629ac"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google APIs Discovery Service SDK"; - license = "unknown"; - }) {}; - - "gogol-discovery_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-discovery"; @@ -76231,22 +72550,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google APIs Discovery Service SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-dns" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-dns"; - version = "0.1.0"; - sha256 = "d07e3fb4f8cdcd079a80509ffe7300b300679900d8234e8833152fd83d378b40"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud DNS SDK"; - license = "unknown"; - }) {}; - - "gogol-dns_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-dns"; @@ -76256,27 +72562,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud DNS SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-doubleclick-bids" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-bids"; - version = "0.1.0"; - sha256 = "0ac3d6be06ae897c9dd59fde3cc160708a04f0b1853749df5186a60077590fd5"; + version = "0.1.1"; + sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; license = "unknown"; }) {}; - "gogol-doubleclick-bids_0_1_1" = callPackage + "gogol-doubleclick-bids_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-bids"; - version = "0.1.1"; - sha256 = "a0e899ecc589df89980868be218741fb2e7ece21e0837ea46618fd970339de2a"; + version = "0.2.0"; + sha256 = "19f2d882820a756ddc7ad6d22b91ae1198e2ff53db2ad03c897e241a61c4b73c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Bid Manager SDK"; @@ -76285,18 +72590,6 @@ self: { }) {}; "gogol-doubleclick-search" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-doubleclick-search"; - version = "0.1.0"; - sha256 = "2ed70d962d5c1ca189682a9ec22af0a903ebe08223ffd6d4b9abff414ea239db"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google DoubleClick Search SDK"; - license = "unknown"; - }) {}; - - "gogol-doubleclick-search_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-doubleclick-search"; @@ -76306,22 +72599,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google DoubleClick Search SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-drive" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-drive"; - version = "0.1.0"; - sha256 = "7cccab1d269aa3ee5d6276ff78c86f29974f85418148a15a13d195ac7fd29ca3"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Drive SDK"; - license = "unknown"; - }) {}; - - "gogol-drive_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-drive"; @@ -76331,7 +72611,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Drive SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-firebase-dynamiclinks" = callPackage @@ -76348,18 +72627,6 @@ self: { }) {}; "gogol-firebase-rules" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-firebase-rules"; - version = "0.1.0"; - sha256 = "b3f5483c339b0bc5882fdfeb49865d3b13f2c1d61dc7f4e46e25ccc651af2c74"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Firebase Rules SDK"; - license = "unknown"; - }) {}; - - "gogol-firebase-rules_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-firebase-rules"; @@ -76369,22 +72636,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Firebase Rules SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-fitness" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-fitness"; - version = "0.1.0"; - sha256 = "486f83148db7c98021f81c9eff1d2e5adea532246adb9627cc0b824aeedda6cd"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Fitness SDK"; - license = "unknown"; - }) {}; - - "gogol-fitness_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fitness"; @@ -76394,22 +72648,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Fitness SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-fonts" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-fonts"; - version = "0.1.0"; - sha256 = "b87b347f22f13e7fd0e809841b4b075bc62169318575b59a0a3a4ff979b41dc9"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Fonts Developer SDK"; - license = "unknown"; - }) {}; - - "gogol-fonts_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fonts"; @@ -76419,22 +72660,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Fonts Developer SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-freebasesearch" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-freebasesearch"; - version = "0.1.0"; - sha256 = "668e8e58a7830a391c8bcd1836436bb0adf606017a71d94a6aef638fe078e33c"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Freebase Search SDK"; - license = "unknown"; - }) {}; - - "gogol-freebasesearch_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-freebasesearch"; @@ -76444,27 +72672,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Freebase Search SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-fusiontables" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fusiontables"; - version = "0.1.0"; - sha256 = "2473bf1d25ae2cbe2af0c454f6dcb20765ab652502770327e4b0be6b72994ff1"; + version = "0.1.1"; + sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; license = "unknown"; }) {}; - "gogol-fusiontables_0_1_1" = callPackage + "gogol-fusiontables_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-fusiontables"; - version = "0.1.1"; - sha256 = "dda5ab1f88dd93e0bfe8acf046d2feaccb0d3d999dd81b3d06c7e2a5cc7c4a14"; + version = "0.2.0"; + sha256 = "a8a9c0a90d7dea80b4f76047da04e107c45d4eb6a7ffff7ce418f0eaa79ca159"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Fusion Tables SDK"; @@ -76473,18 +72700,6 @@ self: { }) {}; "gogol-games" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-games"; - version = "0.1.0"; - sha256 = "0b20a0a057942b5b99b1060c01c6042017d1db5e3cb49e44a8bf95cd5389ffd6"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Game Services SDK"; - license = "unknown"; - }) {}; - - "gogol-games_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games"; @@ -76494,22 +72709,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-games-configuration" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-games-configuration"; - version = "0.1.0"; - sha256 = "8f27ec3b23e704b6cd9d33d4bf41fa336098ef2d06edfc7482daa734ae2aa937"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Game Services Publishing SDK"; - license = "unknown"; - }) {}; - - "gogol-games-configuration_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-configuration"; @@ -76519,22 +72721,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Publishing SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-games-management" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-games-management"; - version = "0.1.0"; - sha256 = "4a4459968df56bd364be7f62300f9a950c466cfa62bc6db91f2460fd67d9f414"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Game Services Management SDK"; - license = "unknown"; - }) {}; - - "gogol-games-management_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-games-management"; @@ -76544,22 +72733,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Game Services Management SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-genomics" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-genomics"; - version = "0.1.0"; - sha256 = "72098eeef0f3ce6ee3c9febe433ac94a1240a98679a32ca7ce65867f3e972784"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Genomics SDK"; - license = "unknown"; - }) {}; - - "gogol-genomics_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-genomics"; @@ -76569,22 +72745,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Genomics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-gmail" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-gmail"; - version = "0.1.0"; - sha256 = "c5f39483cdfc5123b2bc16a85dccb00651f51cbc05be034ab1f72927d8a1aa8f"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Gmail SDK"; - license = "unknown"; - }) {}; - - "gogol-gmail_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-gmail"; @@ -76594,22 +72757,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Gmail SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-groups-migration" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-groups-migration"; - version = "0.1.0"; - sha256 = "af18dfa8279bc475851870b44d66f015fa36dfdb6136320a00d76a5245d86364"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Groups Migration SDK"; - license = "unknown"; - }) {}; - - "gogol-groups-migration_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-migration"; @@ -76619,27 +72769,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Migration SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-groups-settings" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-settings"; - version = "0.1.0"; - sha256 = "47c2237898cbf007074c767c738f24d2e099cc17ea2914c1434f703933eb1713"; + version = "0.1.1"; + sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; license = "unknown"; }) {}; - "gogol-groups-settings_0_1_1" = callPackage + "gogol-groups-settings_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-groups-settings"; - version = "0.1.1"; - sha256 = "c8e5efeb91f968fbe5ebe7183f7a2ff362589de03bfa4917417d9707fe6ce1ed"; + version = "0.2.0"; + sha256 = "a9239bbb414bc01dc3639d6c808cbbfa681125fc6aa13708c6f6d9c8f24e7ee6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Groups Settings SDK"; @@ -76661,18 +72810,6 @@ self: { }) {}; "gogol-identity-toolkit" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-identity-toolkit"; - version = "0.1.0"; - sha256 = "c6ad66395f449cf7900d1f12657977e5864db8a426acc0f56a9d4674dfbd488d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Identity Toolkit SDK"; - license = "unknown"; - }) {}; - - "gogol-identity-toolkit_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-identity-toolkit"; @@ -76682,22 +72819,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Identity Toolkit SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-kgsearch" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-kgsearch"; - version = "0.1.0"; - sha256 = "c7f006ee6e37cd3c893cd7a60e9cc44d857a7aca5bb29f9d942269c3c88767f3"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Identity and Access Management SDK"; - license = "unknown"; - }) {}; - - "gogol-kgsearch_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-kgsearch"; @@ -76707,22 +72831,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Knowledge Graph Search SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-latencytest" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-latencytest"; - version = "0.1.0"; - sha256 = "866074c84140f6ff0cb13eaef954d015f681b7fb5250d9299cc7c993b9e0953d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Network Performance Monitoring SDK"; - license = "unknown"; - }) {}; - - "gogol-latencytest_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-latencytest"; @@ -76732,22 +72843,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Network Performance Monitoring SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-logging" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-logging"; - version = "0.1.0"; - sha256 = "88ee7e43040ab494ba9b138cfa01a626546dadd9aaca9ac451325b118bb97f73"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Logging SDK"; - license = "unknown"; - }) {}; - - "gogol-logging_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-logging"; @@ -76757,27 +72855,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Logging SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-maps-coordinate" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-coordinate"; - version = "0.1.0"; - sha256 = "85a7cc97ca13c5b65d8d7fa4c49b643cec3913fb51952b0032fd5e889e33d9c0"; + version = "0.1.1"; + sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; license = "unknown"; }) {}; - "gogol-maps-coordinate_0_1_1" = callPackage + "gogol-maps-coordinate_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-coordinate"; - version = "0.1.1"; - sha256 = "5b60120062e741337e299724aa09153f9c7985fff4fb25486a9f7c57df5e8b89"; + version = "0.2.0"; + sha256 = "414b03bd9c3679df9c923dd71aa9ecf35fe29c7e17f33630583a2e4e563f30b4"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Coordinate SDK"; @@ -76786,18 +72883,6 @@ self: { }) {}; "gogol-maps-engine" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-maps-engine"; - version = "0.1.0"; - sha256 = "fe092be561b6b93619ad2626d7b31edad0f08b51f7a9c40273dfafa249d93f09"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Maps Engine SDK"; - license = "unknown"; - }) {}; - - "gogol-maps-engine_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-maps-engine"; @@ -76807,22 +72892,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Maps Engine SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-mirror" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-mirror"; - version = "0.1.0"; - sha256 = "de360430d65ded18ba6f0cc3c4bdf381230ad3cf1e37b0c6aaeb0a85737ba41d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Mirror SDK"; - license = "unknown"; - }) {}; - - "gogol-mirror_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-mirror"; @@ -76832,7 +72904,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Mirror SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-ml" = callPackage @@ -76849,18 +72920,6 @@ self: { }) {}; "gogol-monitoring" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-monitoring"; - version = "0.1.0"; - sha256 = "b3d92680ed5688d6556f58fa5db6ff36e4319f03abb58374ee2d51498b7feab1"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Monitoring SDK"; - license = "unknown"; - }) {}; - - "gogol-monitoring_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-monitoring"; @@ -76870,22 +72929,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Stackdriver Monitoring SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-oauth2" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-oauth2"; - version = "0.1.0"; - sha256 = "7dfa28c2babc8f0ba8b82e4ecf58108a289d97147848678662870d1404c4798d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google OAuth2 SDK"; - license = "unknown"; - }) {}; - - "gogol-oauth2_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-oauth2"; @@ -76895,22 +72941,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google OAuth2 SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-pagespeed" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-pagespeed"; - version = "0.1.0"; - sha256 = "1243c9dc68363fed8a96596d368622ae7b23296f7c231134f354401428f5815b"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google PageSpeed Insights SDK"; - license = "unknown"; - }) {}; - - "gogol-pagespeed_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pagespeed"; @@ -76920,27 +72953,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google PageSpeed Insights SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-partners" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-partners"; - version = "0.1.0"; - sha256 = "205d4a467aa60df3ae42923341eb2fa688f5f9121e92eeff93e042571df8eb7e"; + version = "0.1.1"; + sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; license = "unknown"; }) {}; - "gogol-partners_0_1_1" = callPackage + "gogol-partners_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-partners"; - version = "0.1.1"; - sha256 = "a292356748aa7e00c35f755e1515409b2848244926630902f5ded0773048c8bc"; + version = "0.2.0"; + sha256 = "3bce3a43fc727b78b0d90d566a6769ff704eb4764948d0d2c328d95d5c24722c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Partners SDK"; @@ -76949,18 +72981,6 @@ self: { }) {}; "gogol-people" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-people"; - version = "0.1.0"; - sha256 = "8cb6eba72fbee2057c58ab7521ba962a44cfd131f4b5dc1a382c8b2e97083e50"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google People SDK"; - license = "unknown"; - }) {}; - - "gogol-people_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-people"; @@ -76970,22 +72990,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google People SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-play-moviespartner" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-play-moviespartner"; - version = "0.1.0"; - sha256 = "6ddde72865f91a798e8a1e1281a0a79d6f3d5cd2c34b94146d72bd764d91df9a"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Play Movies Partner SDK"; - license = "unknown"; - }) {}; - - "gogol-play-moviespartner_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-play-moviespartner"; @@ -76995,22 +73002,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Play Movies Partner SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-plus" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-plus"; - version = "0.1.0"; - sha256 = "97646d9b6678b5bb56b0d9ba92bbbdd9baac2e8e50df49f25d60f4bbe08a3840"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google + SDK"; - license = "unknown"; - }) {}; - - "gogol-plus_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus"; @@ -77020,27 +73014,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google + SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-plus-domains" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus-domains"; - version = "0.1.0"; - sha256 = "dce9a8f2f7404a39be2f44b269fc0ef5fa0eb908cc5dda184ea865abca31449f"; + version = "0.1.1"; + sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; license = "unknown"; }) {}; - "gogol-plus-domains_0_1_1" = callPackage + "gogol-plus-domains_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-plus-domains"; - version = "0.1.1"; - sha256 = "7ccfb46bec79938344629a2199df912e6279d8da06f449a16faa69309e49afea"; + version = "0.2.0"; + sha256 = "c5497f9e0637a5e657cfbbf3003e4101de371b407e81e0df8a89db0979dc0a9b"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google + Domains SDK"; @@ -77049,18 +73042,6 @@ self: { }) {}; "gogol-prediction" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-prediction"; - version = "0.1.0"; - sha256 = "f877ae9455f43b924b91e08f11c0c6053b72b78a5be28d8f4ea4ed7256e68ca9"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Prediction SDK"; - license = "unknown"; - }) {}; - - "gogol-prediction_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-prediction"; @@ -77070,27 +73051,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Prediction SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-proximitybeacon" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-proximitybeacon"; - version = "0.1.0"; - sha256 = "b46bfe6c5bffb3714c3b66a9aa6768ad8d62e84588cc20202956da9fc45ad872"; + version = "0.1.1"; + sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; license = "unknown"; }) {}; - "gogol-proximitybeacon_0_1_1" = callPackage + "gogol-proximitybeacon_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-proximitybeacon"; - version = "0.1.1"; - sha256 = "96ef7f2878d294e0d08b2cef02106c40cfc19774dabdee37890b359579d54fb2"; + version = "0.2.0"; + sha256 = "5bff5ddbf059ca8fa55a19f9a892339ef50acb5e5864016cc5a6eae58def1456"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Proximity Beacon SDK"; @@ -77099,18 +73079,6 @@ self: { }) {}; "gogol-pubsub" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-pubsub"; - version = "0.1.0"; - sha256 = "2063ab0083d0f8538bdf9ff73b567dfaf705198efa3507b30a54a38bf4c8c6fb"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud Pub/Sub SDK"; - license = "unknown"; - }) {}; - - "gogol-pubsub_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-pubsub"; @@ -77120,22 +73088,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Pub/Sub SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-qpxexpress" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-qpxexpress"; - version = "0.1.0"; - sha256 = "388e2920fc6c35d8341fe728652448edfe5305d48f8dac579af4ed369d918d42"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google QPX Express SDK"; - license = "unknown"; - }) {}; - - "gogol-qpxexpress_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-qpxexpress"; @@ -77145,22 +73100,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google QPX Express SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-replicapool" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-replicapool"; - version = "0.1.0"; - sha256 = "765772804708e48f0f443d94bed6980454b2a2d01ae390808cd23fa278e068d3"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Instance Group Manager SDK"; - license = "unknown"; - }) {}; - - "gogol-replicapool_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool"; @@ -77170,22 +73112,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-replicapool-updater" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-replicapool-updater"; - version = "0.1.0"; - sha256 = "c57504625cbd16f4cb6c8022736f5b6135dacea1daf9a550aba303e38abe8c40"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Instance Group Updater SDK"; - license = "unknown"; - }) {}; - - "gogol-replicapool-updater_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-replicapool-updater"; @@ -77195,27 +73124,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Group Updater SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-resourcemanager" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourcemanager"; - version = "0.1.0"; - sha256 = "021bfb32c5f98e730815d4731c0beabb61e9ff20645096d6d10ed338a1000d4f"; + version = "0.1.1"; + sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; license = "unknown"; }) {}; - "gogol-resourcemanager_0_1_1" = callPackage + "gogol-resourcemanager_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourcemanager"; - version = "0.1.1"; - sha256 = "b111d37b51d11631d32c0ba201d0483a4693a33d4b805038a74ddca049618577"; + version = "0.2.0"; + sha256 = "32c1537b1a8238e8c91f67a6289fc07d72c596a4b0b3625306565465173f2445"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Resource Manager SDK"; @@ -77224,18 +73152,6 @@ self: { }) {}; "gogol-resourceviews" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-resourceviews"; - version = "0.1.0"; - sha256 = "3ae66598edf8248f78a82f229c0333b3e1de9bfd56f25ebf1339802f51a1c8a2"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Compute Engine Instance Groups SDK"; - license = "unknown"; - }) {}; - - "gogol-resourceviews_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-resourceviews"; @@ -77245,15 +73161,14 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Compute Engine Instance Groups SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-runtimeconfig" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-runtimeconfig"; - version = "0.1.1"; - sha256 = "44efa4354d6cd66ccf7a49d4af0b2243eeac2ad375b3ba6a394abdb65f4d4e5c"; + version = "0.2.0"; + sha256 = "d4b92f4929007d2da9741c46907137a30a8fb308f0defabe4b64b1c8af58a681"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud RuntimeConfig SDK"; @@ -77265,8 +73180,8 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-safebrowsing"; - version = "0.1.1"; - sha256 = "fb510fb5f125c02f768f3b0653fe2c8a65776a0f81b989906867004aaed31de8"; + version = "0.2.0"; + sha256 = "32b972796fddf933ef21c28b4904b7f9192459a5e7b98ce46adca4f3f2d3a171"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Safe Browsing APIs SDK"; @@ -77275,18 +73190,6 @@ self: { }) {}; "gogol-script" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-script"; - version = "0.1.0"; - sha256 = "92ed9c5f8a2ece251dc7a5777cd24ad2f8cab14683eae775b2f9eea30a0bf731"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Apps Script Execution SDK"; - license = "unknown"; - }) {}; - - "gogol-script_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-script"; @@ -77296,7 +73199,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Apps Script Execution SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-servicecontrol" = callPackage @@ -77326,18 +73228,6 @@ self: { }) {}; "gogol-sheets" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-sheets"; - version = "0.1.0"; - sha256 = "ba134680a2c6337acbf7f302d953a993993553618a5032e39c49eaabdc7b7a94"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Sheets SDK"; - license = "unknown"; - }) {}; - - "gogol-sheets_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sheets"; @@ -77347,22 +73237,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Sheets SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-shopping-content" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-shopping-content"; - version = "0.1.0"; - sha256 = "27d3ea61026c0cf577795d1b36766eddcce90f942409ed0dea512d730fbbd361"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Content API for Shopping SDK"; - license = "unknown"; - }) {}; - - "gogol-shopping-content_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-shopping-content"; @@ -77372,22 +73249,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Content API for Shopping SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-siteverification" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-siteverification"; - version = "0.1.0"; - sha256 = "4dd9bcd9e9ba39d4d9a6245086faea856c3baa3b4728e9849d8fe50a7f2ff8e1"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Site Verification SDK"; - license = "unknown"; - }) {}; - - "gogol-siteverification_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-siteverification"; @@ -77397,22 +73261,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Site Verification SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-spectrum" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-spectrum"; - version = "0.1.0"; - sha256 = "1c1f35f2520281a27e9ebd86895cc91432f1ae4f6e26caf5936054fd72fd04a4"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Spectrum Database SDK"; - license = "unknown"; - }) {}; - - "gogol-spectrum_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-spectrum"; @@ -77422,22 +73273,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Spectrum Database SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-sqladmin" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-sqladmin"; - version = "0.1.0"; - sha256 = "04a14790303a9bf830e4fe7471c52924e5ed7f9248676e9f6a3afea7aaab7519"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Cloud SQL Administration SDK"; - license = "unknown"; - }) {}; - - "gogol-sqladmin_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-sqladmin"; @@ -77447,27 +73285,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud SQL Administration SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-storage" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage"; - version = "0.1.0"; - sha256 = "eba6b6c0c2d7fbc9a24f66f08fa02699317a26b5a85cd2936dabb7c418f90912"; + version = "0.1.1"; + sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; license = "unknown"; }) {}; - "gogol-storage_0_1_1" = callPackage + "gogol-storage_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage"; - version = "0.1.1"; - sha256 = "7af4f34560e37bbcd7dfb6a872225806afec7736322f20a99497e3817486aa72"; + version = "0.2.0"; + sha256 = "158528dc7488c5ac987c2cd05e9d1d15576aa9085d8c1ed3bfb9f3cba517d8da"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Storage JSON SDK"; @@ -77479,20 +73316,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage-transfer"; - version = "0.1.0"; - sha256 = "fb860f45966d2c5a3545a554a2446c9f66ab58b7cb85f09137ba452dcbf965cd"; + version = "0.1.1"; + sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; license = "unknown"; }) {}; - "gogol-storage-transfer_0_1_1" = callPackage + "gogol-storage-transfer_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-storage-transfer"; - version = "0.1.1"; - sha256 = "7f32157f51d3b5d3946a70d8015d03004f9d35c7aa5ef614249e516b9acca745"; + version = "0.2.0"; + sha256 = "64aa9748678d9ed6785cd0475b1711b13389b83c84dc99c71cd4fde2dbde3f1e"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Storage Transfer SDK"; @@ -77501,18 +73338,6 @@ self: { }) {}; "gogol-tagmanager" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-tagmanager"; - version = "0.1.0"; - sha256 = "cab01a9f11ac12381e410d16c4a951dc4def7a08e42a94cd084c3e156faf61aa"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Tag Manager SDK"; - license = "unknown"; - }) {}; - - "gogol-tagmanager_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-tagmanager"; @@ -77522,27 +73347,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Tag Manager SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-taskqueue" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-taskqueue"; - version = "0.1.0"; - sha256 = "5f03a174e2bbf26fa35823e50106b476ecfed71757519fa4c251b24961491765"; + version = "0.1.1"; + sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; license = "unknown"; }) {}; - "gogol-taskqueue_0_1_1" = callPackage + "gogol-taskqueue_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-taskqueue"; - version = "0.1.1"; - sha256 = "4797b39b38fb82fc7edf0314d2b168d78c05494c68fa81ef0c978e172452de1c"; + version = "0.2.0"; + sha256 = "5b172c962a9aca7eed4cb4af3e05ccebef93b80584fb6fc902b1c462a8b5b8a6"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google TaskQueue SDK"; @@ -77551,18 +73375,6 @@ self: { }) {}; "gogol-translate" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-translate"; - version = "0.1.0"; - sha256 = "17d71ff0f9665e8d8737b120cae1d73222d2bea8dce031bf49e9246461921679"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Translate SDK"; - license = "unknown"; - }) {}; - - "gogol-translate_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-translate"; @@ -77572,22 +73384,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Translate SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-urlshortener" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-urlshortener"; - version = "0.1.0"; - sha256 = "7247b9d5432d2ef0386134a6ac011b93365779158e62ec56f2d4c8666ceea4ab"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google URL Shortener SDK"; - license = "unknown"; - }) {}; - - "gogol-urlshortener_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-urlshortener"; @@ -77597,27 +73396,26 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google URL Shortener SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-useraccounts" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-useraccounts"; - version = "0.1.0"; - sha256 = "5ca3d5fca236a4c17d66daee9db3f79a8e57e3cccfb8d494514a8f3c3fba7b10"; + version = "0.1.1"; + sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; license = "unknown"; }) {}; - "gogol-useraccounts_0_1_1" = callPackage + "gogol-useraccounts_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-useraccounts"; - version = "0.1.1"; - sha256 = "4064ad99cea0db098c6f74fd36b1ba6167354a0e889f7bbc773b08a045ef8647"; + version = "0.2.0"; + sha256 = "91504ac3cbdb11a45ee6762799bfefb3be973b8883ab84254c3bb3101eb9cc67"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud User Accounts SDK"; @@ -77629,20 +73427,20 @@ self: { ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vision"; - version = "0.1.0"; - sha256 = "0a501b91618996ee75f127838626b632c987b0e91ae15d948afecdd4de4c0b0d"; + version = "0.1.1"; + sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; license = "unknown"; }) {}; - "gogol-vision_0_1_1" = callPackage + "gogol-vision_0_2_0" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-vision"; - version = "0.1.1"; - sha256 = "e6046ce0d2c131eb0d5c0366577a638eb59e536eb4c4e462a27b0bb05090a565"; + version = "0.2.0"; + sha256 = "6c87358e77e3565249701b36d8e5fa552f454dfd496c1f65f6586a5781846071"; libraryHaskellDepends = [ base gogol-core ]; homepage = "https://github.com/brendanhay/gogol"; description = "Google Cloud Vision SDK"; @@ -77651,18 +73449,6 @@ self: { }) {}; "gogol-webmaster-tools" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-webmaster-tools"; - version = "0.1.0"; - sha256 = "0137d9c88a2c4fb1ef1a10a026ff44e628e52dcf5c915d6b479457b98536aec4"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google Search Console SDK"; - license = "unknown"; - }) {}; - - "gogol-webmaster-tools_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-webmaster-tools"; @@ -77672,22 +73458,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google Search Console SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-youtube"; - version = "0.1.0"; - sha256 = "2edc3a34cb428be4be4bec367f718f047936a80ece335a9b841d82ada7c3cc1f"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google YouTube Data SDK"; - license = "unknown"; - }) {}; - - "gogol-youtube_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube"; @@ -77697,22 +73470,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Data SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-analytics" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-youtube-analytics"; - version = "0.1.0"; - sha256 = "8c6a8681cb678edf8208f58f051db36e25cc4b8326319eab071ef573e9e4783d"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google YouTube Analytics SDK"; - license = "unknown"; - }) {}; - - "gogol-youtube-analytics_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-analytics"; @@ -77722,22 +73482,9 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Analytics SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gogol-youtube-reporting" = callPackage - ({ mkDerivation, base, gogol-core }: - mkDerivation { - pname = "gogol-youtube-reporting"; - version = "0.1.0"; - sha256 = "2ba85f30e218fa1718cf1a2dcf3c768d023856cdd30a3544c5ffea0750b3f37c"; - libraryHaskellDepends = [ base gogol-core ]; - homepage = "https://github.com/brendanhay/gogol"; - description = "Google YouTube Reporting SDK"; - license = "unknown"; - }) {}; - - "gogol-youtube-reporting_0_1_1" = callPackage ({ mkDerivation, base, gogol-core }: mkDerivation { pname = "gogol-youtube-reporting"; @@ -77747,7 +73494,6 @@ self: { homepage = "https://github.com/brendanhay/gogol"; description = "Google YouTube Reporting SDK"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gooey" = callPackage @@ -79209,6 +74955,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gridbox" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "gridbox"; + version = "0.2.0.0"; + sha256 = "0f035d7cf07e87a46037e5f52e7742667b58a8e049d1a1211b95aaa8731eb580"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/zaidan/gridbox#readme"; + description = "A grid box model"; + license = stdenv.lib.licenses.mit; + }) {}; + "gridfs" = callPackage ({ mkDerivation, base, bson, bytestring, conduit, conduit-extra , monad-control, mongoDB, mtl, pureMD5, resourcet, tagged, text @@ -82250,8 +78009,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.9.5.0"; - sha256 = "47cb6b1859911f638a69ff7cc4fb3ca837be56c51a98b5ff98e43f638ac406d7"; + version = "4.9.5.1"; + sha256 = "8deca33939717372ca227559dfe82aa0b02af49b19e9ea60051f555dcee2cfe6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83605,8 +79364,8 @@ self: { }: mkDerivation { pname = "happstack-server"; - version = "7.4.6.2"; - sha256 = "0725900491022e8073d0d61408c2f1d170dbeb7c51bc52e1716c9bf829763b09"; + version = "7.4.6.3"; + sha256 = "6dd5f859b114bdbdde00b585800bc4b7ed821dd7bad67bb253e3602d88f5ceef"; libraryHaskellDepends = [ base base64-bytestring blaze-html bytestring containers directory exceptions extensible-exceptions filepath hslogger html @@ -84262,27 +80021,6 @@ self: { }) {}; "hashable" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp - , QuickCheck, random, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, unix - }: - mkDerivation { - pname = "hashable"; - version = "1.2.4.0"; - sha256 = "fb9671db0c39cd48d38e2e13e3352e2bf7dfa6341edfe68789a1753d21bb3cf3"; - libraryHaskellDepends = [ - base bytestring ghc-prim integer-gmp text - ]; - testHaskellDepends = [ - base bytestring ghc-prim HUnit QuickCheck random test-framework - test-framework-hunit test-framework-quickcheck2 text unix - ]; - homepage = "http://github.com/tibbe/hashable"; - description = "A class for types that can be converted to a hash value"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hashable_1_2_5_0" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp , QuickCheck, random, test-framework, test-framework-hunit , test-framework-quickcheck2, text, unix @@ -84301,7 +80039,6 @@ self: { homepage = "http://github.com/tibbe/hashable"; description = "A class for types that can be converted to a hash value"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashable-extras" = callPackage @@ -85082,32 +80819,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl - , pretty-show, process, safe, text, transformers, xdg-basedir - , xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.18"; - sha256 = "c6dabdef4093d0fcbd67fe5b7fa83911f66fdd602bdc02a2615c16d0a1279162"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers directory filepath haskell-gi-base - mtl pretty-show process safe text transformers xdg-basedir - xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - homepage = "https://github.com/haskell-gi/haskell-gi"; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - - "haskell-gi_0_20" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl , pretty-show, process, regex-tdfa, safe, text, transformers @@ -85131,23 +80842,9 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.18.4"; - sha256 = "45fb9bd2b65668d09f0643c3e4e0629df27610dfb501049c4a4b14a5edba8e16"; - libraryHaskellDepends = [ base bytestring containers text ]; - libraryPkgconfigDepends = [ glib ]; - homepage = "https://github.com/haskell-gi/haskell-gi-base"; - description = "Foundation for libraries generated by haskell-gi"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib;}; - - "haskell-gi-base_0_20" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; @@ -85158,7 +80855,6 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi-base"; description = "Foundation for libraries generated by haskell-gi"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; "haskell-google-trends" = callPackage @@ -85210,10 +80906,8 @@ self: { }: mkDerivation { pname = "haskell-import-graph"; - version = "1.0.0"; - sha256 = "af555336b7e734dae263e5f68b439d6c4234d7b2da493917fadfe132a7034dee"; - revision = "1"; - editedCabalFile = "4c2ba0b2c6d5649842b1f124e4183662cdc4db66810017775ce450cf84223d50"; + version = "1.0.1"; + sha256 = "c708c2d5fa7e48c205aeaf1661b07dc52ec4d6e459f3544585b71dbc63f3be92"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85328,30 +81022,6 @@ self: { }) {open-pal = null; open-rte = null; inherit (pkgs) openmpi;}; "haskell-names" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , data-lens-light, filemanip, filepath, haskell-src-exts, mtl - , pretty-show, tasty, tasty-golden, transformers - , traverse-with-class, uniplate - }: - mkDerivation { - pname = "haskell-names"; - version = "0.7.0"; - sha256 = "c0582b2a51526e24483d71f1669bba2ef340ae7014babb3a9a5b59296fc5faf2"; - libraryHaskellDepends = [ - aeson base bytestring containers data-lens-light filepath - haskell-src-exts mtl transformers traverse-with-class uniplate - ]; - testHaskellDepends = [ - base containers filemanip filepath haskell-src-exts mtl pretty-show - tasty tasty-golden traverse-with-class - ]; - homepage = "http://documentup.com/haskell-suite/haskell-names"; - description = "Name resolution library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskell-names_0_8_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , data-lens-light, filemanip, filepath, haskell-src-exts, mtl , pretty-show, tasty, tasty-golden, transformers @@ -85425,25 +81095,6 @@ self: { }) {}; "haskell-packages" = callPackage - ({ mkDerivation, aeson, base, bytestring, Cabal, containers - , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl - , optparse-applicative, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "haskell-packages"; - version = "0.4"; - sha256 = "2c9af5515ce210da304560d6a16b36fa056eefcb2ec609dc0b25c2002ba31021"; - libraryHaskellDepends = [ - aeson base bytestring Cabal containers deepseq directory filepath - haskell-src-exts hse-cpp mtl optparse-applicative tagged - transformers transformers-compat - ]; - homepage = "http://documentup.com/haskell-suite/haskell-packages"; - description = "Haskell suite library for package management and integration with Cabal"; - license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-packages_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl , optparse-applicative, tagged, transformers, transformers-compat @@ -85460,7 +81111,6 @@ self: { homepage = "http://documentup.com/haskell-suite/haskell-packages"; description = "Haskell suite library for package management and integration with Cabal"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-pdf-presenter" = callPackage @@ -85659,29 +81309,6 @@ self: { }) {}; "haskell-src-exts" = callPackage - ({ mkDerivation, array, base, containers, cpphs, directory - , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck - , syb, tasty, tasty-golden, tasty-smallcheck - }: - mkDerivation { - pname = "haskell-src-exts"; - version = "1.17.1"; - sha256 = "ba5c547720514515ad0b94eb8a3d7e22a0e2ad2d85b5e1d178e62c61615528bd"; - revision = "1"; - editedCabalFile = "c07248f2a7b4bee1c7777dc6e441e8d1f32a02fb596ea49f47074c68b3c9ea0b"; - libraryHaskellDepends = [ array base cpphs ghc-prim pretty ]; - libraryToolDepends = [ happy ]; - testHaskellDepends = [ - base containers directory filepath mtl pretty-show smallcheck syb - tasty tasty-golden tasty-smallcheck - ]; - doCheck = false; - homepage = "https://github.com/haskell-suite/haskell-src-exts"; - description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-exts_1_18_2" = callPackage ({ mkDerivation, array, base, containers, cpphs, directory , filepath, ghc-prim, happy, mtl, pretty, pretty-show, smallcheck , tasty, tasty-golden, tasty-smallcheck @@ -85700,7 +81327,6 @@ self: { homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-exts_1_19_1" = callPackage @@ -85770,21 +81396,6 @@ self: { }) {}; "haskell-src-meta" = callPackage - ({ mkDerivation, base, haskell-src-exts, pretty, syb - , template-haskell, th-orphans - }: - mkDerivation { - pname = "haskell-src-meta"; - version = "0.6.0.14"; - sha256 = "769124392398695667c800225cd908cb455dadf54a9317870bd9384e0eeb20c9"; - libraryHaskellDepends = [ - base haskell-src-exts pretty syb template-haskell th-orphans - ]; - description = "Parse source to template-haskell abstract syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskell-src-meta_0_7_0_1" = callPackage ({ mkDerivation, base, haskell-src-exts, pretty, syb , template-haskell, th-orphans }: @@ -85797,7 +81408,6 @@ self: { ]; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-src-meta-mwotton" = callPackage @@ -86794,29 +82404,6 @@ self: { }) {}; "haskintex" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text - , transformers - }: - mkDerivation { - pname = "haskintex"; - version = "0.6.0.1"; - sha256 = "9b45463a0d77e8665cc82b656b6d9f8020c873d73f2dd9fe92fcb85a45e90f44"; - revision = "1"; - editedCabalFile = "8a16e2748e754c6fe0d7bd20186166b46819b12c6853c1275fda55e56d8ef8c7"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers directory filepath - haskell-src-exts HaTeX hint parsec process text transformers - ]; - executableHaskellDepends = [ base ]; - homepage = "http://daniel-diaz.github.io/projects/haskintex"; - description = "Haskell Evaluation inside of LaTeX code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "haskintex_0_7_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, haskell-src-exts, HaTeX, hint, parsec, process, text , transformers @@ -86835,7 +82422,6 @@ self: { homepage = "http://daniel-diaz.github.io/projects/haskintex"; description = "Haskell Evaluation inside of LaTeX code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskmon" = callPackage @@ -87731,23 +83317,6 @@ self: { }) {}; "hasty-hamiltonian" = callPackage - ({ mkDerivation, ad, base, lens, mcmc-types, mwc-probability, pipes - , primitive, transformers - }: - mkDerivation { - pname = "hasty-hamiltonian"; - version = "1.1.5"; - sha256 = "d3a62d1933ca6ebc2b53a7a620922809297350d33986904e69072c1e8bfa3fa6"; - libraryHaskellDepends = [ - base lens mcmc-types mwc-probability pipes primitive transformers - ]; - testHaskellDepends = [ ad base mwc-probability ]; - homepage = "http://github.com/jtobin/hasty-hamiltonian"; - description = "Speedy traversal through parameter space"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hasty-hamiltonian_1_3_0" = callPackage ({ mkDerivation, ad, base, kan-extensions, lens, mcmc-types , mwc-probability, pipes, primitive, transformers }: @@ -87763,7 +83332,6 @@ self: { homepage = "http://github.com/jtobin/hasty-hamiltonian"; description = "Speedy traversal through parameter space"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hat" = callPackage @@ -90029,8 +85597,8 @@ self: { }: mkDerivation { pname = "heterocephalus"; - version = "1.0.3.1"; - sha256 = "9be3bf3945b4a937cb7c34e040ba5ebc220551a4e4685258a9ad3da7280575c4"; + version = "1.0.4.0"; + sha256 = "4a208830f15a3575f10c238bed8ff09827483eec94b8cc068c6907d2106f982a"; libraryHaskellDepends = [ base blaze-html blaze-markup containers dlist parsec shakespeare template-haskell text @@ -91147,8 +86715,8 @@ self: { }: mkDerivation { pname = "highjson"; - version = "0.3.0.0"; - sha256 = "4d1d518ca40891e76e67dc6616d8ec94351efa70715098a745b596c987ddc5f7"; + version = "0.4.0.0"; + sha256 = "c3eb05ed1abd9dd59eedcd22bd60b326059d0c3dcaee2a9f8238b0ac08a26962"; libraryHaskellDepends = [ aeson base hvect lens text ]; testHaskellDepends = [ aeson base hspec lens QuickCheck text ]; homepage = "https://github.com/agrafix/highjson"; @@ -91163,8 +86731,8 @@ self: { }: mkDerivation { pname = "highjson-swagger"; - version = "0.3.0.0"; - sha256 = "d03b13a9fdd2fa9ef3c68cbecd2b1a875242fd68787c667d19e3d592796d992f"; + version = "0.4.0.0"; + sha256 = "2df02d2fd764fd5386094de59e181314ba152bd87dc2905d9869fefd4cb87e1f"; libraryHaskellDepends = [ base highjson hvect insert-ordered-containers lens swagger2 text ]; @@ -91176,6 +86744,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "highjson-th" = callPackage + ({ mkDerivation, aeson, base, bytestring, highjson + , highjson-swagger, hspec, lens, QuickCheck, swagger2 + , template-haskell, text + }: + mkDerivation { + pname = "highjson-th"; + version = "0.4.0.0"; + sha256 = "f30c4937a9db6eb1cea8b9efef76855af3b4745e3a620798681b8cf3c73202c5"; + libraryHaskellDepends = [ + aeson base highjson highjson-swagger swagger2 template-haskell text + ]; + testHaskellDepends = [ + aeson base bytestring highjson highjson-swagger hspec lens + QuickCheck swagger2 text + ]; + homepage = "https://github.com/agrafix/highjson"; + description = "Template Haskell helpers for highjson specs"; + license = stdenv.lib.licenses.mit; + }) {}; + "highlight-versions" = callPackage ({ mkDerivation, ansi-terminal, base, Cabal, containers, hackage-db }: @@ -91608,26 +87197,6 @@ self: { }) {}; "hip" = callPackage - ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour - , deepseq, directory, filepath, hspec, JuicyPixels, netpbm - , primitive, process, QuickCheck, repa, temporary, vector - }: - mkDerivation { - pname = "hip"; - version = "1.2.0.0"; - sha256 = "d72879134b56197e0abf21abd09b0198581cb0302574711ffbcfff6da17dd083"; - libraryHaskellDepends = [ - base bytestring Chart Chart-diagrams colour deepseq directory - filepath JuicyPixels netpbm primitive process repa temporary vector - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/lehins/hip"; - description = "Haskell Image Processing (HIP) Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hip_1_5_2_0" = callPackage ({ mkDerivation, base, bytestring, Chart, Chart-diagrams, colour , deepseq, directory, filepath, hspec, JuicyPixels, netpbm , primitive, process, QuickCheck, repa, temporary, vector @@ -92087,26 +87656,6 @@ self: { }) {}; "hjsonpointer" = callPackage - ({ mkDerivation, aeson, base, hspec, http-types, QuickCheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "hjsonpointer"; - version = "1.0.0.2"; - sha256 = "98e2675781d11e1c9eb903b6a7c35020137625e305efb0fcb8f7614f09e6e8f2"; - libraryHaskellDepends = [ - aeson base QuickCheck text unordered-containers vector - ]; - testHaskellDepends = [ - aeson base hspec http-types QuickCheck text unordered-containers - vector - ]; - homepage = "https://github.com/seagreen/hjsonpointer"; - description = "JSON Pointer library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hjsonpointer_1_1_0_2" = callPackage ({ mkDerivation, aeson, base, hashable, hspec, http-types , QuickCheck, semigroups, text, unordered-containers, vector }: @@ -92125,37 +87674,9 @@ self: { homepage = "https://github.com/seagreen/hjsonpointer"; description = "JSON Pointer library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hjsonschema" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , directory, file-embed, filepath, hjsonpointer, http-client - , http-types, HUnit, pcre-heavy, profunctors, QuickCheck - , scientific, semigroups, tasty, tasty-hunit, tasty-quickcheck - , text, unordered-containers, vector, wai-app-static, warp - }: - mkDerivation { - pname = "hjsonschema"; - version = "1.1.0.1"; - sha256 = "52e85f98ace68a20ad1435b56c0d201a5cbb8c475dd3086aee860aa72da3824d"; - libraryHaskellDepends = [ - aeson base bytestring containers file-embed filepath hjsonpointer - http-client http-types pcre-heavy profunctors QuickCheck scientific - semigroups text unordered-containers vector - ]; - testHaskellDepends = [ - aeson async base bytestring directory filepath hjsonpointer HUnit - profunctors QuickCheck semigroups tasty tasty-hunit - tasty-quickcheck text unordered-containers vector wai-app-static - warp - ]; - homepage = "https://github.com/seagreen/hjsonschema"; - description = "JSON Schema library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hjsonschema_1_5_0_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , directory, file-embed, filepath, hashable, hjsonpointer, hspec , http-client, http-types, pcre-heavy, profunctors, protolude @@ -92180,7 +87701,6 @@ self: { homepage = "https://github.com/seagreen/hjsonschema"; description = "JSON Schema library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hkdf" = callPackage @@ -92624,8 +88144,8 @@ self: { ({ mkDerivation, base, bindings-DSL, git, openssl, process, zlib }: mkDerivation { pname = "hlibgit2"; - version = "0.18.0.15"; - sha256 = "1170c1f71b39d13699018c29688c005c7aa2d07d8bbbb9d383a9a85e5d4c5601"; + version = "0.18.0.16"; + sha256 = "199e4027faafe0a39d18ca3168923d44c57b386b960c72398df1c0fb7eff8e5e"; libraryHaskellDepends = [ base bindings-DSL zlib ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base process ]; @@ -92656,8 +88176,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "1.9.35"; - sha256 = "5e6289dadc77a0862ee12ec09136059011fd779c96ff6ffeec899170a97d7a8a"; + version = "1.9.41"; + sha256 = "2d9299f7952af44b2f06a67af917859fd51e1056c7d405f0930769ea1e093fb4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92671,29 +88191,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_1_9_40" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs - , directory, extra, filepath, haskell-src-exts, hscolour, process - , refact, transformers, uniplate - }: - mkDerivation { - pname = "hlint"; - version = "1.9.40"; - sha256 = "68ff63ac4686ac5b09ff71be811af57a2e640af49e3e606f389901b6388594a1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base cmdargs containers cpphs directory extra - filepath haskell-src-exts hscolour process refact transformers - uniplate - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/ndmitchell/hlint#readme"; - description = "Source code suggestions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hlogger" = callPackage ({ mkDerivation, base, old-locale, time }: mkDerivation { @@ -92799,26 +88296,6 @@ self: { }) {}; "hmatrix" = callPackage - ({ mkDerivation, array, base, binary, bytestring, deepseq - , openblasCompat, random, split, storable-complex, vector - }: - mkDerivation { - pname = "hmatrix"; - version = "0.17.0.2"; - sha256 = "28ed9558064917636db095ef76e10b59ae935e3ee68c96ff0d27f9e405ccfab9"; - configureFlags = [ "-fopenblas" ]; - libraryHaskellDepends = [ - array base binary bytestring deepseq random split storable-complex - vector - ]; - librarySystemDepends = [ openblasCompat ]; - preConfigure = "sed -i hmatrix.cabal -e 's@/usr/@/dont/hardcode/paths/@'"; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Numeric Linear Algebra"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) openblasCompat;}; - - "hmatrix_0_18_0_0" = callPackage ({ mkDerivation, array, base, binary, bytestring, deepseq , openblasCompat, random, split, storable-complex, vector }: @@ -92836,7 +88313,6 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numeric Linear Algebra"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "hmatrix-banded" = callPackage @@ -92880,22 +88356,6 @@ self: { }) {inherit (pkgs) glpk;}; "hmatrix-gsl" = callPackage - ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector - }: - mkDerivation { - pname = "hmatrix-gsl"; - version = "0.17.0.0"; - sha256 = "fc50e9f80adee9f93874b20aae1a8009a1dcd94316784827618d5ad192e578c9"; - libraryHaskellDepends = [ - array base hmatrix process random vector - ]; - libraryPkgconfigDepends = [ gsl ]; - homepage = "https://github.com/albertoruiz/hmatrix"; - description = "Numerical computation"; - license = "GPL"; - }) {inherit (pkgs) gsl;}; - - "hmatrix-gsl_0_18_0_1" = callPackage ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector }: mkDerivation { @@ -92909,27 +88369,9 @@ self: { homepage = "https://github.com/albertoruiz/hmatrix"; description = "Numerical computation"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl;}; "hmatrix-gsl-stats" = callPackage - ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex - , vector - }: - mkDerivation { - pname = "hmatrix-gsl-stats"; - version = "0.4.1.4"; - sha256 = "98fe0e49be78a1ff7e5ca44ab086d57bafcf97b86bc249d940501a28dacffafa"; - libraryHaskellDepends = [ - base binary hmatrix storable-complex vector - ]; - libraryPkgconfigDepends = [ gsl ]; - homepage = "http://code.haskell.org/hmatrix-gsl-stats"; - description = "GSL Statistics interface"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gsl;}; - - "hmatrix-gsl-stats_0_4_1_6" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector }: @@ -92944,7 +88386,6 @@ self: { homepage = "http://code.haskell.org/hmatrix-gsl-stats"; description = "GSL Statistics interface"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gsl;}; "hmatrix-mmap" = callPackage @@ -93426,14 +88867,15 @@ self: { "hoauth2" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types - , text + , text, unordered-containers }: mkDerivation { pname = "hoauth2"; - version = "0.5.4.0"; - sha256 = "dc83b0cd5ee51b9c9b28ea04417341dbd146720f43ac73792b180e205ea4cdf9"; + version = "0.5.7"; + sha256 = "7b196e4b70b8207c4beb3479f5ab4476c17d9c0ec7d8f1fcb658590641e9b9ec"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types text + unordered-containers ]; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; @@ -93525,27 +88967,6 @@ self: { }) {}; "hocilib" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, inline-c - , ocilib, tasty, tasty-hunit, template-haskell - }: - mkDerivation { - pname = "hocilib"; - version = "0.1.0"; - sha256 = "44354cbcfd324ce02786131fc3e0ffac29d4a8676854cac45e675e47cdc35e51"; - libraryHaskellDepends = [ - base containers inline-c template-haskell - ]; - librarySystemDepends = [ ocilib ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ base bytestring tasty tasty-hunit ]; - testSystemDepends = [ ocilib ]; - homepage = "https://github.com/fpinsight/hocilib"; - description = "FFI binding to OCILIB"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {ocilib = null;}; - - "hocilib_0_2_0" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, inline-c , ocilib, tasty, tasty-hunit, template-haskell }: @@ -93821,28 +89242,6 @@ self: { }) {}; "homplexity" = callPackage - ({ mkDerivation, base, containers, cpphs, deepseq, directory - , filepath, happy, haskell-src-exts, hflags, template-haskell - , uniplate - }: - mkDerivation { - pname = "homplexity"; - version = "0.4.3.3"; - sha256 = "a536f540770c741a12387df2e6f68042f9644311e9077dbdd7d59a4551753609"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base containers cpphs deepseq directory filepath haskell-src-exts - hflags template-haskell uniplate - ]; - executableToolDepends = [ happy ]; - testHaskellDepends = [ base haskell-src-exts uniplate ]; - homepage = "https://github.com/mgajda/homplexity"; - description = "Haskell code quality tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "homplexity_0_4_3_4" = callPackage ({ mkDerivation, base, containers, cpphs, deepseq, directory , filepath, happy, haskell-src-exts, hflags, template-haskell , uniplate @@ -93862,7 +89261,6 @@ self: { homepage = "https://github.com/mgajda/homplexity"; description = "Haskell code quality tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "honi" = callPackage @@ -95584,24 +90982,6 @@ self: { }) {}; "hreader" = callPackage - ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl - , tagged, transformers-base - }: - mkDerivation { - pname = "hreader"; - version = "1.0.2"; - sha256 = "49e1e805966fab3f82ef2e1f2565b2a760b73026f392410b53df6c2c8b8f59d4"; - libraryHaskellDepends = [ - base exceptions hset mmorph monad-control mtl tagged - transformers-base - ]; - testHaskellDepends = [ base hset transformers-base ]; - homepage = "https://bitbucket.org/s9gf4ult/hreader"; - description = "Generalization of MonadReader and ReaderT using hset"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hreader_1_1_0" = callPackage ({ mkDerivation, base, exceptions, hset, mmorph, monad-control, mtl , tagged, transformers, transformers-base }: @@ -95617,7 +90997,6 @@ self: { homepage = "https://bitbucket.org/s9gf4ult/hreader"; description = "Generalization of MonadReader and ReaderT using hset"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hreader-lens" = callPackage @@ -97094,20 +92473,6 @@ self: { }) {}; "hsdns" = callPackage - ({ mkDerivation, adns, base, containers, network }: - mkDerivation { - pname = "hsdns"; - version = "1.6.1"; - sha256 = "64c1475d7625733c9fafe804ae809d459156f6a96a922adf99e5d8e02553c368"; - libraryHaskellDepends = [ base containers network ]; - librarySystemDepends = [ adns ]; - homepage = "http://github.com/peti/hsdns"; - description = "Asynchronous DNS Resolver"; - license = stdenv.lib.licenses.lgpl3; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) adns;}; - - "hsdns_1_7" = callPackage ({ mkDerivation, adns, base, containers, network }: mkDerivation { pname = "hsdns"; @@ -97118,7 +92483,6 @@ self: { homepage = "http://github.com/peti/hsdns"; description = "Asynchronous DNS Resolver"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {inherit (pkgs) adns;}; @@ -97140,19 +92504,6 @@ self: { }) {}; "hse-cpp" = callPackage - ({ mkDerivation, base, cpphs, haskell-src-exts }: - mkDerivation { - pname = "hse-cpp"; - version = "0.1"; - sha256 = "a075790dd132107b8005478179fcaf7e37a78c3011ca536ff0d95e0b437c2b38"; - revision = "1"; - editedCabalFile = "9ed587127e9760a075bf6ea478997e1a1fb9e500102bd883206aa843e7d92a4b"; - libraryHaskellDepends = [ base cpphs haskell-src-exts ]; - description = "Preprocess+parse haskell code"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hse-cpp_0_2" = callPackage ({ mkDerivation, base, cpphs, haskell-src-exts }: mkDerivation { pname = "hse-cpp"; @@ -97161,7 +92512,6 @@ self: { libraryHaskellDepends = [ base cpphs haskell-src-exts ]; description = "Preprocess+parse haskell code"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsebaysdk" = callPackage @@ -97275,6 +92625,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsexif_0_6_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, hspec, HUnit + , iconv, text, time + }: + mkDerivation { + pname = "hsexif"; + version = "0.6.1.0"; + sha256 = "868a46bcd841a2db36eebba803962f966c24c4a98b7581c9f329fd596bafab4f"; + libraryHaskellDepends = [ + base binary bytestring containers iconv text time + ]; + testHaskellDepends = [ + base binary bytestring containers hspec HUnit iconv text time + ]; + homepage = "https://github.com/emmanueltouzery/hsexif"; + description = "EXIF handling library in pure Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsfacter" = callPackage ({ mkDerivation, base, containers, language-puppet, text }: mkDerivation { @@ -97390,27 +92760,6 @@ self: { }) {}; "hsignal" = callPackage - ({ mkDerivation, array, base, binary, blas, bytestring, gsl - , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack - , mtl, storable-complex, vector - }: - mkDerivation { - pname = "hsignal"; - version = "0.2.7.4"; - sha256 = "290436ca76d13a4435da0b33d20a69663d955abcf361661cf9835e7eedb4f53a"; - libraryHaskellDepends = [ - array base binary bytestring hmatrix hmatrix-gsl hmatrix-gsl-stats - hstatistics mtl storable-complex vector - ]; - librarySystemDepends = [ blas liblapack ]; - libraryPkgconfigDepends = [ gsl ]; - homepage = "http://code.haskell.org/hsignal"; - description = "Signal processing and EEG data analysis"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) blas; inherit (pkgs) gsl; - inherit (pkgs) liblapack;}; - - "hsignal_0_2_7_5" = callPackage ({ mkDerivation, array, base, binary, blas, bytestring, gsl , hmatrix, hmatrix-gsl, hmatrix-gsl-stats, hstatistics, liblapack , mtl, storable-complex, vector @@ -97428,7 +92777,6 @@ self: { homepage = "http://code.haskell.org/hsignal"; description = "Signal processing and EEG data analysis"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) gsl; inherit (pkgs) liblapack;}; @@ -98019,30 +93367,6 @@ self: { }) {}; "hspec" = callPackage - ({ mkDerivation, base, directory, hspec-core, hspec-discover - , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder - , transformers - }: - mkDerivation { - pname = "hspec"; - version = "2.2.4"; - sha256 = "724b0af9c871711f10a414d335a2ed0caabb94efb8576f94b43386b7f103c9b1"; - revision = "1"; - editedCabalFile = "eb22cb737adc3312b21699b6ac4137489590ada1ee9ee9ae21aae3c342b3880f"; - libraryHaskellDepends = [ - base hspec-core hspec-discover hspec-expectations HUnit QuickCheck - transformers - ]; - testHaskellDepends = [ - base 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; - }) {}; - - "hspec_2_4_1" = callPackage ({ mkDerivation, base, call-stack, directory, hspec-core , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck , stringbuilder, transformers @@ -98063,7 +93387,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A Testing Framework for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-attoparsec" = callPackage @@ -98111,32 +93434,6 @@ self: { }) {}; "hspec-core" = callPackage - ({ mkDerivation, ansi-terminal, async, base, deepseq - , hspec-expectations, hspec-meta, HUnit, process, QuickCheck - , quickcheck-io, random, setenv, silently, tf-random, time - , transformers - }: - mkDerivation { - pname = "hspec-core"; - version = "2.2.4"; - sha256 = "328ac2525b9eb0fe4807d5ae10fe2d846220f9a8b5ac6b5d316e1bea9e2d0475"; - revision = "1"; - editedCabalFile = "9a0c9fc612eb71ee55ebcaacbce010b87ffef8a535ed6ee1f50d8bd952dc86c3"; - libraryHaskellDepends = [ - ansi-terminal async base deepseq hspec-expectations HUnit - QuickCheck quickcheck-io random setenv tf-random time transformers - ]; - testHaskellDepends = [ - ansi-terminal async base deepseq hspec-expectations hspec-meta - HUnit process QuickCheck quickcheck-io random setenv silently - tf-random time transformers - ]; - homepage = "http://hspec.github.io/"; - description = "A Testing Framework for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-core_2_4_1" = callPackage ({ mkDerivation, ansi-terminal, array, async, base, call-stack , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -98160,26 +93457,9 @@ self: { 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 { - pname = "hspec-discover"; - version = "2.2.4"; - sha256 = "bb8ddb3c53d4c0cc3829c60d9b848aa19d843b19f22ef26355a12fb0d1e2e7af"; - 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; - }) {}; - - "hspec-discover_2_4_1" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { pname = "hspec-discover"; @@ -98193,22 +93473,9 @@ self: { 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, HUnit }: - mkDerivation { - pname = "hspec-expectations"; - version = "0.7.2"; - sha256 = "371a176b22ebdbc94b7bba55e0bda2296b44c11af01d20b23e4350ef7094a6f0"; - libraryHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/sol/hspec-expectations#readme"; - description = "Catchy combinators for HUnit"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-expectations_0_8_2" = callPackage ({ mkDerivation, base, call-stack, HUnit, nanospec }: mkDerivation { pname = "hspec-expectations"; @@ -98219,7 +93486,6 @@ self: { homepage = "https://github.com/hspec/hspec-expectations#readme"; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations-lens" = callPackage @@ -98363,27 +93629,6 @@ self: { }) {}; "hspec-megaparsec" = callPackage - ({ mkDerivation, base, containers, hspec, hspec-expectations - , megaparsec - }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "0.2.1"; - sha256 = "6474bc9a4d77cf68c4415bfa2d76da77ece418d6570429ca6c8b68eb7463de6b"; - revision = "2"; - editedCabalFile = "6da45ba059597259f057ddbfeb7b852beccd3476a21f7e0e2e68ced36a5668c8"; - libraryHaskellDepends = [ - base containers hspec-expectations megaparsec - ]; - testHaskellDepends = [ - base containers hspec hspec-expectations megaparsec - ]; - homepage = "https://github.com/mrkkrp/hspec-megaparsec"; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hspec-megaparsec_0_3_1" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec }: @@ -98400,31 +93645,9 @@ self: { homepage = "https://github.com/mrkkrp/hspec-megaparsec"; description = "Utility functions for testing Megaparsec parsers with Hspec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-meta" = callPackage - ({ mkDerivation, ansi-terminal, async, base, deepseq, directory - , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io - , random, setenv, time, transformers - }: - mkDerivation { - pname = "hspec-meta"; - version = "2.2.1"; - sha256 = "aa7b54c33cad9842783035d1a5cddbbbc3d556c8b2c8f6d0e6bfd3177b9e37d4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal async base deepseq hspec-expectations HUnit - QuickCheck quickcheck-io random setenv time transformers - ]; - executableHaskellDepends = [ base directory filepath ]; - homepage = "http://hspec.github.io/"; - description = "A version of Hspec which is used to test Hspec itself"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-meta_2_3_2" = callPackage ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq , directory, filepath, hspec-expectations, HUnit, QuickCheck , quickcheck-io, random, setenv, time, transformers @@ -98447,7 +93670,6 @@ self: { homepage = "http://hspec.github.io/"; description = "A version of Hspec which is used to test Hspec itself"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-monad-control" = callPackage @@ -98485,22 +93707,6 @@ self: { }) {}; "hspec-setup" = callPackage - ({ mkDerivation, base, directory, filepath, process, projectroot }: - mkDerivation { - pname = "hspec-setup"; - version = "0.1.1.1"; - sha256 = "fd294bd10fc0fa1573e84d78ba7f6fd77e294efbaac419a5530e0818ece91109"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base directory filepath process projectroot - ]; - homepage = "https://github.com/yamadapc/haskell-hspec-setup"; - description = "Add an hspec test-suite in one command"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-setup_0_2_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bytestring, cryptohash , directory, directory-tree, filepath, haskell-src-exts, hspec , language-dockerfile, pretty, process, projectroot, QuickCheck @@ -98528,7 +93734,6 @@ self: { homepage = "https://github.com/yamadapc/haskell-hspec-setup"; description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-shouldbe" = callPackage @@ -98557,23 +93762,6 @@ self: { }) {}; "hspec-smallcheck" = callPackage - ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }: - mkDerivation { - pname = "hspec-smallcheck"; - version = "0.4.1"; - sha256 = "c5ddd014ad58679554d2726a4442a124d7a3a9fad04c928c610cdc46773fc0f5"; - revision = "1"; - editedCabalFile = "b53fe047da5d19509d2b756c094a2acba8f7cc7011b750b0ae3f77176a53c5f6"; - libraryHaskellDepends = [ base hspec-core smallcheck ]; - testHaskellDepends = [ - base hspec hspec-core QuickCheck smallcheck - ]; - homepage = "http://hspec.github.io/"; - description = "SmallCheck support for the Hspec testing framework"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-smallcheck_0_4_2" = callPackage ({ mkDerivation, base, hspec, hspec-core, QuickCheck, smallcheck }: mkDerivation { pname = "hspec-smallcheck"; @@ -98586,7 +93774,6 @@ self: { homepage = "http://hspec.github.io/"; description = "SmallCheck support for the Hspec testing framework"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-snap" = callPackage @@ -98682,30 +93869,6 @@ self: { }) {}; "hspec-wai" = callPackage - ({ mkDerivation, base, base-compat, bytestring, case-insensitive - , hspec, hspec-core, hspec-expectations, http-types, QuickCheck - , text, transformers, wai, wai-extra, with-location - }: - mkDerivation { - pname = "hspec-wai"; - version = "0.6.6"; - sha256 = "89a1753cd56b6f312a0af11b7f312c744c73a97d8ab3facfd87f8e4e3080b0e0"; - libraryHaskellDepends = [ - base base-compat bytestring case-insensitive hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra with-location - ]; - testHaskellDepends = [ - base base-compat bytestring case-insensitive hspec hspec-core - hspec-expectations http-types QuickCheck text transformers wai - wai-extra with-location - ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Experimental Hspec support for testing WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai_0_8_0" = callPackage ({ mkDerivation, base, base-compat, bytestring, case-insensitive , hspec, hspec-core, hspec-expectations, http-types, QuickCheck , text, transformers, wai, wai-extra @@ -98727,28 +93890,9 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Experimental Hspec support for testing WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-wai-json" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring - , case-insensitive, hspec, hspec-wai, template-haskell - }: - mkDerivation { - pname = "hspec-wai-json"; - version = "0.6.1"; - sha256 = "303e0e67c217ead3ef64f3ac3870b6c9b14a4135df5e8b2c79ad73df5a347c69"; - libraryHaskellDepends = [ - aeson aeson-qq base bytestring case-insensitive hspec-wai - template-haskell - ]; - testHaskellDepends = [ base hspec hspec-wai ]; - homepage = "https://github.com/hspec/hspec-wai#readme"; - description = "Testing JSON APIs with hspec-wai"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hspec-wai-json_0_8_0" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell }: @@ -98764,7 +93908,6 @@ self: { homepage = "https://github.com/hspec/hspec-wai#readme"; description = "Testing JSON APIs with hspec-wai"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-webdriver" = callPackage @@ -99231,22 +94374,6 @@ self: { }) {}; "hstatistics" = callPackage - ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random - , vector - }: - mkDerivation { - pname = "hstatistics"; - version = "0.2.5.4"; - sha256 = "e657ac9bb672b502d5dec0e8920679a5833be5bfe0a8a981b7eccc0a99a0e47b"; - libraryHaskellDepends = [ - array base hmatrix hmatrix-gsl-stats random vector - ]; - homepage = "http://code.haskell.org/hstatistics"; - description = "Statistics"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hstatistics_0_3" = callPackage ({ mkDerivation, array, base, hmatrix, hmatrix-gsl-stats, random , vector }: @@ -99260,7 +94387,6 @@ self: { homepage = "http://code.haskell.org/hstatistics"; description = "Statistics"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstats" = callPackage @@ -99541,25 +94667,6 @@ self: { }) {}; "hsx2hs" = callPackage - ({ mkDerivation, base, bytestring, haskell-src-exts - , haskell-src-meta, mtl, template-haskell, utf8-string - }: - mkDerivation { - pname = "hsx2hs"; - version = "0.13.5"; - sha256 = "0dbaa29287ef82bfbe573f399a635aa109fe675e4dd91f3ee8c2cefd5593ed6e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta mtl - template-haskell utf8-string - ]; - homepage = "https://github.com/seereason/hsx2hs"; - description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsx2hs_0_14_0" = callPackage ({ mkDerivation, base, bytestring, haskell-src-exts , haskell-src-meta, mtl, template-haskell, utf8-string }: @@ -99576,7 +94683,6 @@ self: { homepage = "https://github.com/seereason/hsx2hs"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsyscall" = callPackage @@ -100078,26 +95184,6 @@ self: { }) {}; "http-api-data" = callPackage - ({ mkDerivation, base, bytestring, directory, doctest, filepath - , hspec, HUnit, QuickCheck, text, time, time-locale-compat - }: - mkDerivation { - pname = "http-api-data"; - version = "0.2.4"; - sha256 = "6bb90863343b17b9ce6ee8cfce9a41db0b4287343aa6cf0654a3ad5c5c5e6635"; - libraryHaskellDepends = [ - base bytestring text time time-locale-compat - ]; - testHaskellDepends = [ - base bytestring directory doctest filepath hspec HUnit QuickCheck - text time - ]; - homepage = "http://github.com/fizruk/http-api-data"; - description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-api-data_0_3_5" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , doctest, filepath, hashable, hspec, HUnit, QuickCheck , quickcheck-instances, text, time, time-locale-compat @@ -100119,7 +95205,6 @@ self: { homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-attoparsec" = callPackage @@ -100136,36 +95221,6 @@ self: { }) {}; "http-client" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, exceptions, filepath - , ghc-prim, hspec, http-types, mime-types, monad-control, network - , network-uri, random, streaming-commons, text, time, transformers - , zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.4.31.2"; - sha256 = "16410148a9705677cdd89510192caf1abd3460db2a17ce0c2fafd7bd0c15d88b"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - exceptions filepath ghc-prim http-types mime-types network - network-uri random streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client_0_5_5" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -100192,7 +95247,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-auth" = callPackage @@ -100328,27 +95382,6 @@ self: { }) {}; "http-client-tls" = callPackage - ({ mkDerivation, base, bytestring, connection, data-default-class - , hspec, http-client, http-types, network, tls - }: - mkDerivation { - pname = "http-client-tls"; - version = "0.2.4.1"; - sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3"; - revision = "1"; - editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c"; - libraryHaskellDepends = [ - base bytestring connection data-default-class http-client network - tls - ]; - testHaskellDepends = [ base hspec http-client http-types ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "http-client backend using the connection package and tls library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "http-client-tls_0_3_3_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, connection , cryptonite, data-default-class, exceptions, hspec, http-client , http-types, memory, network, tls, transformers @@ -100367,7 +95400,6 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-common" = callPackage @@ -100389,36 +95421,6 @@ self: { }) {}; "http-conduit" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, connection, cookie - , data-default-class, exceptions, hspec, http-client - , http-client-tls, http-types, HUnit, lifted-base, monad-control - , mtl, network, resourcet, streaming-commons, temporary, text, time - , transformers, utf8-string, wai, wai-conduit, warp, warp-tls - }: - mkDerivation { - pname = "http-conduit"; - version = "2.1.11"; - sha256 = "75df5c0515080a09b4cdc73a759523b10265a692ff50beb964766d4f8dcf0d7f"; - libraryHaskellDepends = [ - aeson base bytestring conduit conduit-extra data-default-class - exceptions http-client http-client-tls http-types lifted-base - monad-control mtl resourcet transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive conduit - conduit-extra connection cookie data-default-class hspec - http-client http-types HUnit lifted-base network streaming-commons - temporary text time transformers utf8-string wai wai-conduit warp - warp-tls - ]; - doCheck = false; - homepage = "http://www.yesodweb.com/book/http-conduit"; - description = "HTTP client package with conduit interface and HTTPS support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-conduit_2_2_3" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -100446,7 +95448,6 @@ self: { homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-conduit-browser" = callPackage @@ -100998,29 +95999,6 @@ self: { }) {}; "http2" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , bytestring-builder, case-insensitive, containers, directory - , doctest, filepath, Glob, hex, hspec, psqueues, stm, text - , unordered-containers, vector, word8 - }: - mkDerivation { - pname = "http2"; - version = "1.6.2"; - sha256 = "99e75ac0fa19276d276ec63bb94eefb2e952b0a374aea8f3d2c2408a634b6fe7"; - libraryHaskellDepends = [ - array base bytestring bytestring-builder case-insensitive - containers psqueues stm - ]; - testHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - case-insensitive containers directory doctest filepath Glob hex - hspec psqueues stm text unordered-containers vector word8 - ]; - description = "HTTP/2.0 library including frames and HPACK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http2_1_6_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, case-insensitive, containers, directory , doctest, filepath, Glob, hex, hspec, psqueues, stm, text @@ -101042,7 +96020,6 @@ self: { homepage = "https://github.com/kazu-yamamoto/http2"; description = "HTTP/2 library including frames, priority queues and HPACK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "httpd-shed" = callPackage @@ -101679,19 +96656,6 @@ self: { }) {}; "hvect" = callPackage - ({ mkDerivation, base, HTF }: - mkDerivation { - pname = "hvect"; - version = "0.3.1.0"; - sha256 = "b9ba2408a3718b7a38b72cf7f81ce51ac9f0db63908969d386213c47b6526ab8"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base HTF ]; - homepage = "https://github.com/agrafix/hvect"; - description = "Simple strict heterogeneous lists"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hvect_0_4_0_0" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "hvect"; @@ -101702,7 +96666,6 @@ self: { homepage = "https://github.com/agrafix/hvect"; description = "Simple strict heterogeneous lists"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-balancedparens" = callPackage @@ -101726,31 +96689,6 @@ self: { }) {}; "hw-bits" = callPackage - ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap - , parsec, QuickCheck, resourcet, safe, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.1.0.1"; - sha256 = "7d20025de04db0e4639aded0ae6ad6b9252358a14626a1bfeb726dfbf084fd0e"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring hw-prim parsec safe vector - ]; - executableHaskellDepends = [ - base criterion mmap resourcet vector - ]; - testHaskellDepends = [ - base bytestring hspec hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-bits#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-bits_0_5_0_0" = callPackage ({ mkDerivation, base, bytestring, hspec, hw-int, hw-prim , hw-string-parse, QuickCheck, safe, vector }: @@ -101771,27 +96709,6 @@ self: { }) {}; "hw-conduit" = callPackage - ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , hw-bits, resourcet, word8 - }: - mkDerivation { - pname = "hw-conduit"; - version = "0.0.0.11"; - sha256 = "e0e1193a901858d9bc5fccc51f99977a9bffd24993f9de6c1c3030aa0a1ed77b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bytestring conduit hw-bits resourcet word8 - ]; - executableHaskellDepends = [ base criterion ]; - testHaskellDepends = [ base bytestring hspec ]; - homepage = "http://github.com/haskell-works/hw-conduit#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-conduit_0_1_0_0" = callPackage ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec , hw-bits, resourcet, word8 }: @@ -101997,26 +96914,6 @@ self: { }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck - , random, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.1.0.3"; - sha256 = "f237844283733b85403e18d5243925946946395a2b7c2d731b7312f4a0293b84"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring deepseq random vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base bytestring hspec QuickCheck random vector - ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_4_0_2" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { pname = "hw-prim"; @@ -102027,30 +96924,9 @@ self: { homepage = "http://github.com/haskell-works/hw-prim#readme"; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.3.0.0"; - sha256 = "c1b053a7b5752c55636bd95ad30678f0143aa0a3afc962ba2827187309782cfe"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base hw-bits hw-prim vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector - ]; - homepage = "http://github.com/haskell-works/hw-rankselect#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-rankselect_0_8_0_0" = callPackage ({ mkDerivation, base, hspec, hw-balancedparens, hw-bits, hw-prim , hw-rankselect-base, QuickCheck, vector }: @@ -102104,25 +96980,6 @@ self: { }) {}; "hw-succinct" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, conduit, containers - , hw-bits, hw-conduit, hw-parser, hw-prim, hw-rankselect - , mono-traversable, text, vector, word8 - }: - mkDerivation { - pname = "hw-succinct"; - version = "0.0.0.14"; - sha256 = "f3e2ec65f1d7e0baa7cda17442cdcd60635cd2693a38873361df9578b65ffbeb"; - libraryHaskellDepends = [ - attoparsec base bytestring conduit containers hw-bits hw-conduit - hw-parser hw-prim hw-rankselect mono-traversable text vector word8 - ]; - homepage = "http://github.com/haskell-works/hw-succinct#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "hw-succinct_0_1_0_1" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit, containers , hw-balancedparens, hw-bits, hw-prim, hw-rankselect , hw-rankselect-base, mmap, mono-traversable, text, vector, word8 @@ -103668,19 +98525,6 @@ self: { }) {}; "identicon" = callPackage - ({ mkDerivation, base, bytestring, hspec, JuicyPixels }: - mkDerivation { - pname = "identicon"; - version = "0.1.0"; - sha256 = "cc710ce81b969cd4a6a13b3ea46c72e5a5dd9805e8f437f5c54c9ba6b4abac93"; - libraryHaskellDepends = [ base bytestring JuicyPixels ]; - testHaskellDepends = [ base bytestring hspec JuicyPixels ]; - homepage = "https://github.com/mrkkrp/identicon"; - description = "Flexible generation of identicons"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "identicon_0_2_0" = callPackage ({ mkDerivation, base, bytestring, hspec, JuicyPixels }: mkDerivation { pname = "identicon"; @@ -103691,7 +98535,6 @@ self: { homepage = "https://github.com/mrkkrp/identicon"; description = "Flexible generation of identicons"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "identifiers" = callPackage @@ -103785,49 +98628,6 @@ self: { }) {}; "idris" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal - , ansi-wl-pprint, array, async, base, base64-bytestring, binary - , blaze-html, blaze-markup, bytestring, cheapskate, containers - , deepseq, directory, filepath, fingertree, fsnotify, gmp - , haskeline, ieee754, libffi, mtl, network, optparse-applicative - , parsers, pretty, process, regex-tdfa, safe, split, tagged, tasty - , tasty-golden, tasty-rerun, terminal-size, text, time - , transformers, transformers-compat, trifecta, uniplate, unix - , unordered-containers, utf8-string, vector - , vector-binary-instances, zip-archive - }: - mkDerivation { - pname = "idris"; - version = "0.12.3"; - sha256 = "3a9f3d5aeb032b1d987402cf4ca54a2fbfc7b02d852a629f528943a5fe5b59c6"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint array async - base base64-bytestring binary blaze-html blaze-markup bytestring - cheapskate containers deepseq directory filepath fingertree - fsnotify haskeline ieee754 libffi mtl network optparse-applicative - parsers pretty process regex-tdfa safe split terminal-size text - time transformers transformers-compat trifecta uniplate unix - unordered-containers utf8-string vector vector-binary-instances - zip-archive - ]; - librarySystemDepends = [ gmp ]; - executableHaskellDepends = [ - base directory filepath haskeline transformers - ]; - testHaskellDepends = [ - base bytestring containers directory filepath haskeline - optparse-applicative process tagged tasty tasty-golden tasty-rerun - time transformers - ]; - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) gmp;}; - - "idris_0_99" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary , blaze-html, blaze-markup, bytestring, cheapskate, containers @@ -103868,7 +98668,6 @@ self: { homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gmp;}; "ieee" = callPackage @@ -103907,18 +98706,6 @@ self: { }) {}; "ieee754" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "ieee754"; - version = "0.7.9"; - sha256 = "dc1860c545d7143ea8c7e53509ac535ca2932495f0f89b2801c960295cfcdd15"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/patperry/hs-ieee754"; - description = "Utilities for dealing with IEEE floating point numbers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ieee754_0_8_0" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "ieee754"; @@ -103928,7 +98715,6 @@ self: { homepage = "http://github.com/patperry/hs-ieee754"; description = "Utilities for dealing with IEEE floating point numbers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ieee754-parser" = callPackage @@ -104589,41 +99375,6 @@ self: { }) {}; "imm" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base - , bytestring, case-insensitive, chunked-data, comonad, compdata - , conduit, conduit-combinators, conduit-parse, connection - , containers, directory, dyre, exceptions, fast-logger, filepath - , free, hashable, HaskellNet, HaskellNet-SSL, http-client - , http-client-tls, http-types, mime-mail, mono-traversable - , monoid-subclasses, network, opml-conduit, optparse-applicative - , rainbow, rainbox, rss-conduit, text, time, timerep, tls - , transformers, uri-bytestring, xml, xml-conduit - }: - mkDerivation { - pname = "imm"; - version = "1.0.1.0"; - sha256 = "287a4815b43de90e89b27a356215e57d97c03ba4f929965b1a8ca5c4fe35658b"; - revision = "1"; - editedCabalFile = "b6f35aaba374bd580f6f40b4629047706562a9d677ff917a7b0dee1063817e25"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint atom-conduit base bytestring case-insensitive - chunked-data comonad compdata conduit conduit-combinators - conduit-parse connection containers directory dyre exceptions - fast-logger filepath free hashable HaskellNet HaskellNet-SSL - http-client http-client-tls http-types mime-mail mono-traversable - monoid-subclasses network opml-conduit optparse-applicative rainbow - rainbox rss-conduit text time timerep tls transformers - uri-bytestring xml xml-conduit - ]; - executableHaskellDepends = [ base free ]; - homepage = "https://github.com/k0ral/imm"; - description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; - license = "unknown"; - }) {}; - - "imm_1_1_0_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, atom-conduit, base , blaze-html, blaze-markup, bytestring, case-insensitive , chunked-data, comonad, conduit, conduit-combinators, connection @@ -104655,7 +99406,6 @@ self: { homepage = "https://github.com/k0ral/imm"; description = "Execute arbitrary actions for each unread element of RSS/Atom feeds"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "immortal" = callPackage @@ -105092,18 +99842,6 @@ self: { }) {}; "indents" = callPackage - ({ mkDerivation, base, concatenative, mtl, parsec }: - mkDerivation { - pname = "indents"; - version = "0.3.3"; - sha256 = "b61f51ac894609cb5571cc3ded12db5de97185a8de236c69ec24c87457109f9a"; - libraryHaskellDepends = [ base concatenative mtl parsec ]; - homepage = "http://patch-tag.com/r/salazar/indents"; - description = "indentation sensitive parser-combinators for parsec"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "indents_0_4_0_0" = callPackage ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }: mkDerivation { pname = "indents"; @@ -105114,7 +99852,6 @@ self: { homepage = "http://github.com/jaspervdj/indents"; description = "indentation sensitive parser-combinators for parsec"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "index-core" = callPackage @@ -105328,24 +100065,6 @@ self: { }) {}; "inflections" = callPackage - ({ mkDerivation, base, containers, HUnit, parsec, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "inflections"; - version = "0.2.0.1"; - sha256 = "4bc856a2b409fbf874714f7bf50b9db4701242cf58e133bd31b1ae39fe8e2c35"; - libraryHaskellDepends = [ base containers parsec ]; - testHaskellDepends = [ - base containers HUnit parsec QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "https://github.com/stackbuilders/inflections-hs"; - description = "Inflections library for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inflections_0_3_0_0" = callPackage ({ mkDerivation, base, exceptions, hspec, hspec-megaparsec , megaparsec, QuickCheck, text, unordered-containers }: @@ -105362,7 +100081,6 @@ self: { homepage = "https://github.com/stackbuilders/inflections-hs"; description = "Inflections library for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inflist" = callPackage @@ -105637,31 +100355,6 @@ self: { }) {aether = null;}; "insert-ordered-containers" = callPackage - ({ mkDerivation, aeson, base, base-compat, hashable, lens - , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "insert-ordered-containers"; - version = "0.1.0.1"; - sha256 = "4905e5d128c19887a79b281150acb16cb3b043ab2c5a7788b0151ba7d46b900a"; - revision = "3"; - editedCabalFile = "c81fa69aa035ad468b45c812c16b80bc70020b05bf2d4a8298c90b4f772c98b1"; - libraryHaskellDepends = [ - aeson base base-compat hashable lens semigroupoids semigroups text - transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat hashable lens QuickCheck semigroupoids - semigroups tasty tasty-quickcheck text transformers - unordered-containers - ]; - homepage = "https://github.com/phadej/insert-ordered-containers#readme"; - description = "Associative containers retating insertion order for traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "insert-ordered-containers_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, base-compat, hashable, lens , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck , text, transformers, unordered-containers @@ -105684,7 +100377,6 @@ self: { homepage = "https://github.com/phadej/insert-ordered-containers#readme"; description = "Associative containers retating insertion order for traversals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -108680,36 +103372,6 @@ self: { }) {}; "jose" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, byteable, bytestring, cryptonite, data-default-class - , hspec, lens, memory, mtl, network-uri, QuickCheck - , quickcheck-instances, safe, semigroups, tasty, tasty-hspec - , tasty-quickcheck, template-haskell, text, time - , unordered-containers, vector, x509 - }: - mkDerivation { - pname = "jose"; - version = "0.4.0.3"; - sha256 = "742b8037e5cc9c427789196bd425594c3fb17768fb584c8434548415aa5e0f0a"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors byteable - bytestring cryptonite data-default-class lens memory mtl - network-uri QuickCheck quickcheck-instances safe semigroups - template-haskell text time unordered-containers vector x509 - ]; - testHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors byteable - bytestring cryptonite data-default-class hspec lens memory mtl - network-uri QuickCheck quickcheck-instances safe semigroups tasty - tasty-hspec tasty-quickcheck template-haskell text time - unordered-containers vector x509 - ]; - homepage = "https://github.com/frasertweedale/hs-jose"; - description = "Javascript Object Signing and Encryption and JSON Web Token library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "jose_0_5_0_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , byteable, bytestring, containers, cryptonite, hspec, lens, memory , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances @@ -108739,7 +103401,6 @@ self: { homepage = "https://github.com/frasertweedale/hs-jose"; description = "Javascript Object Signing and Encryption and JSON Web Token library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jose-jwt" = callPackage @@ -109012,8 +103673,8 @@ self: { }: mkDerivation { pname = "json-assertions"; - version = "1.0.8"; - sha256 = "d4e060ec54e264581e47d409e303dc3165c311dcfcd6127278c99b7a876ae259"; + version = "1.0.9"; + sha256 = "5a046e3559638d902adbf01d8ba99c3e3aef01e4c1ee26b5701ebdcd7a0f980b"; libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; @@ -110464,31 +105125,6 @@ self: { }) {}; "kawhi" = callPackage - ({ mkDerivation, aeson, base, bytestring, exceptions, http-client - , http-conduit, http-types, mtl, safe, scientific, smallcheck - , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text - }: - mkDerivation { - pname = "kawhi"; - version = "0.0.1"; - sha256 = "bb7bb30129c065032d217834d9f991df63ddfa55ee14e4c45ef5ddf141839d6f"; - revision = "1"; - editedCabalFile = "624bf276517215fb85d51f9252dce93acfde800feaa6439d054f6037bc2f3cb3"; - libraryHaskellDepends = [ - aeson base bytestring exceptions http-client http-conduit - http-types mtl safe scientific text - ]; - testHaskellDepends = [ - aeson base bytestring exceptions http-client http-types mtl - scientific smallcheck tasty tasty-hunit tasty-quickcheck - tasty-smallcheck text - ]; - homepage = "https://github.com/hamsterdam/kawhi"; - description = "stats.NBA.com library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "kawhi_0_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-client , http-conduit, http-types, mtl, safe, scientific, smallcheck , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text @@ -110509,7 +105145,6 @@ self: { homepage = "https://github.com/hamsterdam/kawhi"; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kazura-queue" = callPackage @@ -113278,50 +107913,6 @@ self: { }) {}; "language-puppet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hspec, hspec-megaparsec - , http-api-data, http-client, HUnit, lens, lens-aeson, megaparsec - , memory, mtl, operational, optparse-applicative, parallel-io - , parsec, pcre-utils, process, random, regex-pcre-builtin - , scientific, semigroups, servant, servant-client, split, stm - , strict-base-types, temporary, text, time, transformers, unix - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "language-puppet"; - version = "1.3.1.1"; - sha256 = "e2fba21b6adb148896819687062378022393fc6b237d0c65ddb7196bc86ddd12"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring - case-insensitive containers cryptonite directory either exceptions - filecache formatting hashable hruby hslogger hspec http-api-data - http-client lens lens-aeson megaparsec memory mtl operational - parsec pcre-utils process random regex-pcre-builtin scientific - semigroups servant servant-client split stm strict-base-types text - time transformers unix unordered-containers vector yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers Glob hslogger http-client lens - megaparsec mtl optparse-applicative parallel-io regex-pcre-builtin - servant-client strict-base-types text transformers - unordered-containers vector yaml - ]; - testHaskellDepends = [ - ansi-wl-pprint base Glob hslogger hspec hspec-megaparsec HUnit lens - megaparsec mtl scientific strict-base-types temporary text - transformers unix unordered-containers vector - ]; - homepage = "http://lpuppet.banquise.net/"; - description = "Tools to parse and evaluate the Puppet DSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "x86_64-linux" ]; - }) {}; - - "language-puppet_1_3_5_1" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -113362,7 +107953,7 @@ self: { homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + hydraPlatforms = [ "x86_64-linux" ]; }) {}; "language-python" = callPackage @@ -113506,28 +108097,6 @@ self: { }) {}; "language-thrift" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, containers, hspec - , hspec-discover, megaparsec, QuickCheck, scientific, semigroups - , text, transformers - }: - mkDerivation { - pname = "language-thrift"; - version = "0.9.0.2"; - sha256 = "a5c204193572f1272a9e1593f553df6d6471ea01a6432475fff0115b458bd740"; - libraryHaskellDepends = [ - ansi-wl-pprint base containers megaparsec scientific semigroups - text transformers - ]; - testHaskellDepends = [ - ansi-wl-pprint base containers hspec hspec-discover megaparsec - QuickCheck scientific semigroups text transformers - ]; - homepage = "https://github.com/abhinav/language-thrift#readme"; - description = "Parser and pretty printer for the Thrift IDL format"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "language-thrift_0_10_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, hspec , hspec-discover, megaparsec, QuickCheck, scientific, semigroups , text, transformers @@ -113547,7 +108116,6 @@ self: { homepage = "https://github.com/abhinav/language-thrift#readme"; description = "Parser and pretty printer for the Thrift IDL format"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-typescript" = callPackage @@ -114506,39 +109074,6 @@ self: { }) {}; "lens" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , comonad, containers, contravariant, distributive, exceptions - , filepath, free, ghc-prim, hashable, hlint, HUnit, kan-extensions - , mtl, parallel, profunctors, QuickCheck, reflection, semigroupoids - , semigroups, tagged, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, text, transformers, transformers-compat - , unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.14"; - sha256 = "70a3cd18ef352950b88d6cac449988b9320704b56dceda80e7de9f2907ee5f4b"; - revision = "1"; - editedCabalFile = "ec2f258fa783b324c6c9177b16b5432e757928b5efec042295c88306148059c4"; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring comonad containers - contravariant distributive exceptions filepath free ghc-prim - hashable kan-extensions mtl parallel profunctors reflection - semigroupoids semigroups tagged template-haskell text transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base containers hlint HUnit mtl QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - transformers - ]; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens_4_15_1" = callPackage ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring , comonad, containers, contravariant, deepseq, directory , distributive, doctest, exceptions, filepath, free @@ -114572,7 +109107,6 @@ self: { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-action" = callPackage @@ -116193,25 +110727,6 @@ self: { }) {}; "line" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , cryptohash-sha256, http-types, lens, text, time, transformers - , wai, wreq - }: - mkDerivation { - pname = "line"; - version = "1.0.1.0"; - sha256 = "b356e813369b9ebf80ea71a79e658caabbc32645de8821eb878809afb0f1e1d5"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring cryptohash-sha256 - http-types lens text time transformers wai wreq - ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/noraesae/line"; - description = "Haskell SDK for the LINE API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "line_2_2_0" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , cryptohash-sha256, hspec, hspec-wai, http-conduit, http-types , QuickCheck, quickcheck-instances, raw-strings-qq, scotty, text @@ -116233,7 +110748,6 @@ self: { homepage = "https://github.com/noraesae/line"; description = "Haskell SDK for the LINE API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "line-break" = callPackage @@ -118129,31 +112643,6 @@ self: { }) {}; "log-domain" = callPackage - ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq - , directory, distributive, doctest, filepath, generic-deriving - , hashable, hashable-extras, safecopy, semigroupoids, semigroups - , simple-reflect, vector - }: - mkDerivation { - pname = "log-domain"; - version = "0.10.3.1"; - sha256 = "36f427506218358b20a2066d5fb38406816fabac18ca26c807a416a795643815"; - revision = "2"; - editedCabalFile = "d5c0d4af0c551eb4b014ce825c1ff6a92fa947225992a89ec9f4b67ece705c6f"; - libraryHaskellDepends = [ - base binary bytes cereal comonad deepseq distributive hashable - hashable-extras safecopy semigroupoids semigroups vector - ]; - testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect - ]; - homepage = "http://github.com/ekmett/log-domain/"; - description = "Log-domain arithmetic"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "log-domain_0_11" = callPackage ({ mkDerivation, base, binary, bytes, cereal, comonad, deepseq , directory, distributive, doctest, filepath, generic-deriving , hashable, safecopy, semigroupoids, semigroups, simple-reflect @@ -118174,7 +112663,6 @@ self: { homepage = "http://github.com/ekmett/log-domain/"; description = "Log-domain arithmetic"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "log-effect" = callPackage @@ -118401,8 +112889,8 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.1.1"; - sha256 = "4e1a6f746757ebf787820cbdb202b0b9ff206a44a24895d5500bec2ffc789fc5"; + version = "1.1.2"; + sha256 = "7a39a46028c456b024088fcc5995f7552abe21f6578019970cb079083180d12c"; libraryHaskellDepends = [ async base exceptions free monad-control mtl semigroups stm stm-delay text time transformers transformers-base wl-pprint-text @@ -118410,7 +112898,6 @@ self: { homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging-facade" = callPackage @@ -120134,8 +114621,8 @@ self: { }: mkDerivation { pname = "mailchimp"; - version = "0.1.0"; - sha256 = "dbbc4645a3322e11ce33059a4660dd837574f58530aaa459b4d99dc7b1b91fe2"; + version = "0.1.1"; + sha256 = "d6bdac26adc60ded7352010674a0b562f9b809e5c49954dd738d1cbfd6cb95d6"; libraryHaskellDepends = [ aeson attoparsec base bytestring http-client http-client-tls servant servant-client text transformers @@ -122018,30 +116505,6 @@ self: { }) {}; "megaparsec" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , HUnit, mtl, QuickCheck, scientific, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - , transformers - }: - mkDerivation { - pname = "megaparsec"; - version = "5.0.1"; - sha256 = "8bd9c4f4f1d92cf45577ceabd13f58e0a980848142fba1036fa37bcab4aa3b25"; - libraryHaskellDepends = [ - base bytestring containers deepseq exceptions mtl scientific text - transformers - ]; - testHaskellDepends = [ - base bytestring containers exceptions HUnit mtl QuickCheck - scientific test-framework test-framework-hunit - test-framework-quickcheck2 text transformers - ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "megaparsec_5_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, exceptions , hspec, hspec-expectations, mtl, QuickCheck, scientific, text , transformers @@ -122061,7 +116524,6 @@ self: { homepage = "https://github.com/mrkkrp/megaparsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "meldable-heap" = callPackage @@ -122353,21 +116815,6 @@ self: { }) {}; "memory" = callPackage - ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty - , tasty-hunit, tasty-quickcheck - }: - mkDerivation { - pname = "memory"; - version = "0.13"; - sha256 = "dc73602573eaed85b1887f07057151c7de63f559ef90a10297c363d9b120870a"; - libraryHaskellDepends = [ base bytestring deepseq 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_1" = callPackage ({ mkDerivation, base, bytestring, deepseq, ghc-prim, tasty , tasty-hunit, tasty-quickcheck }: @@ -122380,7 +116827,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 @@ -122444,18 +116890,6 @@ self: { }) {}; "mersenne-random-pure64" = callPackage - ({ mkDerivation, base, old-time, random }: - mkDerivation { - pname = "mersenne-random-pure64"; - version = "0.2.0.5"; - sha256 = "3ca131d6c26fe8a086c40c6e79459149286c31083e0e110f7032aeba8038346e"; - libraryHaskellDepends = [ base old-time random ]; - homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; - description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "mersenne-random-pure64_0_2_2_0" = callPackage ({ mkDerivation, base, random, time }: mkDerivation { pname = "mersenne-random-pure64"; @@ -122465,7 +116899,6 @@ self: { homepage = "http://code.haskell.org/~dons/code/mersenne-random-pure64/"; description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "messagepack" = callPackage @@ -122630,28 +117063,6 @@ self: { }) {}; "metrics" = callPackage - ({ mkDerivation, ansi-terminal, async, base, bytestring, containers - , lens, mtl, mwc-random, primitive, QuickCheck, text, time, unix - , unordered-containers, vector, vector-algorithms - }: - mkDerivation { - pname = "metrics"; - version = "0.3.0.2"; - sha256 = "0df2801b630fcfe5c4a1968ccc1571016fb4c9408dfc881c599ba6f872543c02"; - libraryHaskellDepends = [ - ansi-terminal base bytestring containers lens mtl mwc-random - primitive text time unix unordered-containers vector - vector-algorithms - ]; - testHaskellDepends = [ - async base lens mwc-random primitive QuickCheck unix - ]; - description = "High-performance application metric tracking"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "metrics_0_4_0_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , HUnit, lens, mwc-random, primitive, QuickCheck, text, time , transformers, transformers-base, unix-compat @@ -122839,29 +117250,6 @@ self: { }) {}; "microlens-aeson" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens - , scientific, tasty, tasty-hunit, text, unordered-containers - , vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.1.1.3"; - sha256 = "4e43bdbd0d258804ee4de0f78149dc93cfe1aaa2e1e235bc11b1965c94166731"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring microlens scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring microlens tasty tasty-hunit text - unordered-containers vector - ]; - homepage = "http://github.com/fosskers/microlens-aeson/"; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "microlens-aeson_2_2_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers , vector @@ -123217,8 +117605,8 @@ self: { }: mkDerivation { pname = "mighttpd2"; - version = "3.3.4"; - sha256 = "9a8dd3e2bf2a62f34695a8baf8b715223c3aa57de1c3b30d5a604d364ae1d4b4"; + version = "3.3.5"; + sha256 = "89e4e32bab7820b01e2b6e45cf70e406af1639aaf8534f769225efd89cc3730a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -123241,23 +117629,6 @@ self: { }) {}; "mighty-metropolis" = callPackage - ({ mkDerivation, base, containers, mcmc-types, mwc-probability - , pipes, primitive, transformers - }: - mkDerivation { - pname = "mighty-metropolis"; - version = "1.0.4"; - sha256 = "6e670796298b3f47a7226c0ce51a97889395119e3de32e4722186af55d8092cf"; - libraryHaskellDepends = [ - base mcmc-types mwc-probability pipes primitive transformers - ]; - testHaskellDepends = [ base containers mwc-probability ]; - homepage = "http://github.com/jtobin/mighty-metropolis"; - description = "The Metropolis algorithm"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mighty-metropolis_1_2_0" = callPackage ({ mkDerivation, base, containers, kan-extensions, mcmc-types , mwc-probability, pipes, primitive, transformers }: @@ -123273,7 +117644,6 @@ self: { homepage = "http://github.com/jtobin/mighty-metropolis"; description = "The Metropolis algorithm"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mikmod" = callPackage @@ -123334,8 +117704,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.0.1"; - sha256 = "2fe50795fe7a1826d1a24e66f5f31823cc83621de5137dd98196e2ce7420db10"; + version = "0.5.0.2"; + sha256 = "8e770eba91b0caddd5fb16b96f191ca7f4554689fc88f41261687a1af74f5c4b"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base mtl murmur-hash network random resource-pool semigroups transformers @@ -123383,8 +117753,8 @@ self: { }: mkDerivation { pname = "mime-mail"; - version = "0.4.12"; - sha256 = "93e1caa9932bec12dc1b931db2f3ea9e2e2db9b8382b7babaf0a5e559936217c"; + version = "0.4.13"; + sha256 = "a089fd837b77b75eb36dc1749da422820d2658d0145a378e6de32f3b30b7a440"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring filepath process random text @@ -123591,6 +117961,39 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "minio-hs" = callPackage + ({ mkDerivation, async, base, bytestring, case-insensitive, conduit + , conduit-combinators, conduit-extra, containers, cryptonite + , cryptonite-conduit, data-default, directory, exceptions, filepath + , http-client, http-conduit, http-types, lifted-async, lifted-base + , memory, monad-control, protolude, QuickCheck, resourcet, tasty + , tasty-hunit, tasty-quickcheck, tasty-smallcheck, temporary, text + , time, transformers, transformers-base, xml-conduit + }: + mkDerivation { + pname = "minio-hs"; + version = "0.1.0"; + sha256 = "7138f31251268521dd35b143dd943f87f32c3f3b7606487b8f176e4561ddf908"; + libraryHaskellDepends = [ + async base bytestring case-insensitive conduit conduit-combinators + conduit-extra containers cryptonite cryptonite-conduit data-default + exceptions filepath http-client http-conduit http-types + lifted-async lifted-base memory monad-control protolude resourcet + text time transformers transformers-base xml-conduit + ]; + testHaskellDepends = [ + async base bytestring case-insensitive conduit conduit-combinators + conduit-extra containers cryptonite cryptonite-conduit data-default + directory exceptions filepath http-client http-conduit http-types + lifted-async lifted-base memory monad-control protolude QuickCheck + resourcet tasty tasty-hunit tasty-quickcheck tasty-smallcheck + temporary text time transformers transformers-base xml-conduit + ]; + homepage = "https://github.com/donatello/minio-hs#readme"; + description = "A Minio client library, compatible with S3 like services"; + license = stdenv.lib.licenses.asl20; + }) {}; + "minions" = callPackage ({ mkDerivation, ansi-terminal, base, MissingH, process, time }: mkDerivation { @@ -124099,31 +118502,6 @@ self: { }) {}; "modify-fasta" = callPackage - ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative - , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text - , text-show - }: - mkDerivation { - pname = "modify-fasta"; - version = "0.8.2.1"; - sha256 = "5af7cddb753353ac1e16e15e5962e6a6c46eeb6a1d1ae38a8f014e20b04e61a0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers fasta regex-tdfa regex-tdfa-text split text - text-show - ]; - executableHaskellDepends = [ - base containers fasta mtl optparse-applicative pipes pipes-text - split text - ]; - homepage = "https://github.com/GregorySchwartz/modify-fasta"; - description = "Modify fasta (and CLIP) files in several optional ways"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "modify-fasta_0_8_2_3" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split , text, text-show @@ -124570,8 +118948,8 @@ self: { }: mkDerivation { pname = "monad-extras"; - version = "0.5.11"; - sha256 = "76972ce47148f8a60498a878394135cd4079bef79f79f12c9cd86d1766230467"; + version = "0.6.0"; + sha256 = "df33d7c51a97d16226b8160d9bc09686cb6f7b7bf5c54557381c6fe4a3c84f2c"; libraryHaskellDepends = [ base mmorph monad-control stm transformers transformers-base ]; @@ -124885,10 +119263,8 @@ self: { }: mkDerivation { pname = "monad-metrics"; - version = "0.1.0.1"; - sha256 = "f34fd76689245c12d694de7db877ea9ab20c259aafc57489f1fa6baecb1f2d61"; - revision = "1"; - editedCabalFile = "265f5c26b239a08c4c003eda08a9863928f2a3ac6530d24566cf3ecad4522dcd"; + version = "0.1.0.2"; + sha256 = "a64e5f3aebe020c0f38892874f74b2b94ad84b319cee2e7ec092c5b2bd842276"; libraryHaskellDepends = [ base clock containers ekg-core microlens mtl text transformers ]; @@ -125610,6 +119986,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "monetdb-mapi" = callPackage + ({ mkDerivation, base, bindings-monetdb-mapi }: + mkDerivation { + pname = "monetdb-mapi"; + version = "0.1.0.0"; + sha256 = "b9e2b238b7442757e849fa61016251c42fc52d8950cc56fd3f008bbe7f02e76c"; + libraryHaskellDepends = [ base bindings-monetdb-mapi ]; + description = "Mid-level bindings for the MonetDB API (mapi)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "money" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -125840,26 +120227,6 @@ self: { }) {}; "monoid-subclasses" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "0.4.2.1"; - sha256 = "4fe3360d06c09b66ba89c080337e2813ad225b1e6a28a580410930e882f5032a"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - homepage = "https://github.com/blamario/monoid-subclasses/"; - description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "monoid-subclasses_0_4_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector }: @@ -125877,7 +120244,6 @@ self: { homepage = "https://github.com/blamario/monoid-subclasses/"; description = "Subclasses of Monoid"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-transformer" = callPackage @@ -126154,34 +120520,6 @@ self: { }) {}; "morte" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, 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.2"; - sha256 = "277ba41cc40236a8a02dd154d29108ddc9d8ca7706daa5fe3177189487363b5a"; - 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 optparse-applicative text ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_5" = callPackage ({ mkDerivation, alex, array, base, binary, containers, deepseq , Earley, http-client, http-client-tls, microlens, microlens-mtl , mtl, optparse-applicative, pipes, QuickCheck, system-fileio @@ -126207,7 +120545,6 @@ self: { ]; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mosaico-lib" = callPackage @@ -127905,18 +122242,6 @@ self: { }) {}; "mwc-probability" = callPackage - ({ mkDerivation, base, mwc-random, primitive, transformers }: - mkDerivation { - pname = "mwc-probability"; - version = "1.2.2"; - sha256 = "a54e9e9e51c7b67e0eb8244d584fcfc999ab7af00e5146ffdf3efed837d5915a"; - libraryHaskellDepends = [ base mwc-random primitive transformers ]; - homepage = "http://github.com/jtobin/mwc-probability"; - description = "Sampling function-based probability distributions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mwc-probability_1_3_0" = callPackage ({ mkDerivation, base, mwc-random, primitive, transformers }: mkDerivation { pname = "mwc-probability"; @@ -127926,7 +122251,6 @@ self: { homepage = "http://github.com/jtobin/mwc-probability"; description = "Sampling function-based probability distributions"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mwc-random" = callPackage @@ -127957,6 +122281,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mxnet" = callPackage + ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: + mkDerivation { + pname = "mxnet"; + version = "0.1.0.1"; + sha256 = "9407f88beb3f0f472b3aa61ca9a16b0ae41c6b3eff6b1bb868d4787ad27bb10e"; + libraryHaskellDepends = [ base c2hs-extra ]; + librarySystemDepends = [ mxnet ]; + libraryToolDepends = [ c2hs ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "MXNet interface in Haskell"; + license = stdenv.lib.licenses.mit; + }) {mxnet = null;}; + + "mxnet-examples" = callPackage + ({ mkDerivation, base, mxnet }: + mkDerivation { + pname = "mxnet-examples"; + version = "0.1.0.0"; + sha256 = "147cb175fd9b409dd11292b3ce3ab98359a69a4fbd6c42fdcd4a75b0c7e8f7bf"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base mxnet ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "Examples for MXNet in Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + + "mxnet-nnvm" = callPackage + ({ mkDerivation, base, c2hs, c2hs-extra, mxnet }: + mkDerivation { + pname = "mxnet-nnvm"; + version = "0.1.0.0"; + sha256 = "1e9e0b48a91789553befa80b8714365a63a9185809463a6127df715eb11f6561"; + libraryHaskellDepends = [ base c2hs-extra ]; + librarySystemDepends = [ mxnet ]; + libraryToolDepends = [ c2hs ]; + homepage = "http://github.com/sighingnow/mxnet-haskell#readme"; + description = "NNVM interface in Haskell"; + license = stdenv.lib.licenses.mit; + }) {mxnet = null;}; + "myTestlll" = callPackage ({ mkDerivation, ansi-terminal, array, arrows, base, bytestring , Cabal, CCA, containers, deepseq, Euterpea, ghc-prim, HCodecs @@ -128764,23 +123130,6 @@ self: { }) {}; "natural-transformation" = callPackage - ({ mkDerivation, base, containers, quickcheck-instances, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "natural-transformation"; - version = "0.3.1"; - sha256 = "9b5a39f18790f33807298d47dc7098e2863ca874e8b3d2b419bf696f2ad09702"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base containers quickcheck-instances tasty tasty-quickcheck - ]; - homepage = "https://github.com/ku-fpg/natural-transformation"; - description = "A natural transformation package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "natural-transformation_0_4" = callPackage ({ mkDerivation, base, containers, quickcheck-instances, tasty , tasty-quickcheck }: @@ -128795,7 +123144,6 @@ self: { homepage = "https://github.com/ku-fpg/natural-transformation"; description = "A natural transformation package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "naturalcomp" = callPackage @@ -129786,10 +124134,8 @@ self: { ({ mkDerivation, base, bytestring, network, text, time, vector }: mkDerivation { pname = "network-carbon"; - version = "1.0.7"; - sha256 = "9cb794e29273aedf7f3fba7eed81a6a9f83791809095c22c11bf094a687dc9c0"; - revision = "1"; - editedCabalFile = "aed14a345bcd3d3ef50f393ffd360e8d2870aa0272926190565c39e7e4989c4b"; + version = "1.0.8"; + sha256 = "071b81db16f33edfb0dd11e918911f177b9584da27b3481c23a82a9d29f61d86"; libraryHaskellDepends = [ base bytestring network text time vector ]; @@ -132348,36 +126694,6 @@ self: { }) {}; "octane" = callPackage - ({ mkDerivation, aeson, base, bimap, binary, binary-bits - , bytestring, containers, data-binary-ieee754, data-default-class - , deepseq, file-embed, http-client, http-client-tls - , overloaded-records, regex-compat, tasty, tasty-hspec - , tasty-quickcheck, text, unordered-containers, vector - }: - mkDerivation { - pname = "octane"; - version = "0.16.3"; - sha256 = "e62faeb9bec990995d507e7542ebde84edfb42cbae4b0369bfe4aadec05d91fe"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bimap binary binary-bits bytestring containers - data-binary-ieee754 data-default-class deepseq file-embed - overloaded-records regex-compat text unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base binary bytestring http-client http-client-tls - ]; - testHaskellDepends = [ - base binary binary-bits bytestring containers tasty tasty-hspec - tasty-quickcheck text - ]; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - }) {}; - - "octane_0_18_2" = callPackage ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers , data-default-class, file-embed, http-client, http-client-tls , overloaded-records, rattletrap, text @@ -132398,7 +126714,6 @@ self: { homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octohat" = callPackage @@ -132834,6 +127149,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "onama" = callPackage + ({ mkDerivation, base, containers, parsec, tagsoup }: + mkDerivation { + pname = "onama"; + version = "0.2.2.0"; + sha256 = "df85a43fa050f6d6afc6f56789fdf176da7b615019871b3a8f4f82c635f47626"; + libraryHaskellDepends = [ base containers parsec tagsoup ]; + description = "HTML-parsing primitives for Parsec"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "once" = callPackage ({ mkDerivation, base, containers, hashable, template-haskell , unordered-containers @@ -132856,8 +127182,8 @@ self: { }: mkDerivation { pname = "one-liner"; - version = "0.7"; - sha256 = "2ea06f985f3755c870b2cdcd9b7ab0d541b51e1687507acccd833eb2de258ab4"; + version = "0.8"; + sha256 = "83831911ce829082bff57e5596bbb23947a153cd5ad6dd90f02b3152faf22ea6"; libraryHaskellDepends = [ base bifunctors contravariant ghc-prim profunctors tagged transformers @@ -132958,8 +127284,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.5.2.2"; - sha256 = "e09e565314d59a420349f0a5295ee4f9ed7215d579741fcf06d376703dd3d102"; + version = "0.5.3.0"; + sha256 = "6ceda758d97c5b0b547182fb2c7a0379f0f5843e76f4bbd0baa81a171a763d73"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -133825,37 +128151,6 @@ self: { }) {}; "opml-conduit" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, conduit - , conduit-combinators, conduit-parse, containers, data-default - , exceptions, foldl, hlint, lens-simple, mono-traversable - , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances - , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text - , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse - , xml-types - }: - mkDerivation { - pname = "opml-conduit"; - version = "0.5.0.1"; - sha256 = "69c22270aa0f3a9c45dcf993e9de06982a780b5e035e343f257bf9d8fd8a2533"; - libraryHaskellDepends = [ - base case-insensitive conduit conduit-parse containers exceptions - foldl lens-simple mono-traversable monoid-subclasses parsers - semigroups text time timerep uri-bytestring xml-conduit - xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-combinators conduit-parse - containers data-default exceptions hlint lens-simple - mono-traversable mtl parsers QuickCheck quickcheck-instances - resourcet semigroups tasty tasty-hunit tasty-quickcheck text time - uri-bytestring xml-conduit-parse - ]; - homepage = "https://github.com/k0ral/opml-conduit"; - description = "Streaming parser/renderer for the OPML 2.0 format."; - license = "unknown"; - }) {}; - - "opml-conduit_0_6_0_1" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, conduit , conduit-combinators, containers, data-default, hlint, lens-simple , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck @@ -133881,7 +128176,6 @@ self: { homepage = "https://github.com/k0ral/opml-conduit"; description = "Streaming parser/renderer for the OPML 2.0 format."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opn" = callPackage @@ -134031,29 +128325,13 @@ self: { }) {}; "optparse-applicative" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, process, transformers - , transformers-compat - }: - mkDerivation { - pname = "optparse-applicative"; - version = "0.12.1.0"; - sha256 = "18b46d6d2c17e941bb02f84e980390f056795dce73ece946d71d3d4d002313d5"; - libraryHaskellDepends = [ - ansi-wl-pprint base process transformers transformers-compat - ]; - homepage = "https://github.com/pcapriotti/optparse-applicative"; - description = "Utilities and combinators for parsing command line options"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-applicative_0_13_0_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, process, QuickCheck , transformers, transformers-compat }: mkDerivation { pname = "optparse-applicative"; - version = "0.13.0.0"; - sha256 = "cec6b1d94d347898a25446fb8a6643399d8429cf326f221e38a02d849b2b0cac"; + version = "0.13.1.0"; + sha256 = "f1fcf9d7e78ddf14083a07d8fe1aa65d75c5102e0d44df981585bce54c5c2a2b"; libraryHaskellDepends = [ ansi-wl-pprint base process transformers transformers-compat ]; @@ -134061,7 +128339,6 @@ self: { homepage = "https://github.com/pcapriotti/optparse-applicative"; description = "Utilities and combinators for parsing command line options"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-declarative" = callPackage @@ -134077,22 +128354,6 @@ self: { }) {}; "optparse-generic" = callPackage - ({ mkDerivation, base, bytestring, optparse-applicative - , system-filepath, text, time, transformers, void - }: - mkDerivation { - pname = "optparse-generic"; - version = "1.1.1"; - sha256 = "02938fa18d2d2aee9ccd69ed402771e01eff20da280be5a1ca1229e07929c611"; - libraryHaskellDepends = [ - base bytestring optparse-applicative system-filepath text time - transformers void - ]; - description = "Auto-generate a command-line parser for your datatype"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-generic_1_1_4" = callPackage ({ mkDerivation, base, bytestring, optparse-applicative, semigroups , system-filepath, text, time, transformers, void }: @@ -134106,7 +128367,6 @@ self: { ]; description = "Auto-generate a command-line parser for your datatype"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-helper" = callPackage @@ -134421,8 +128681,8 @@ self: { pname = "orgstat"; version = "0.0.1"; sha256 = "573cf350998a5625162d997290d932ab962f3ed594e20e81c810c962892635c8"; - revision = "1"; - editedCabalFile = "ccd6a9c2b4f92b27c55e90af11ecd4841bb757e48f066a0407b37af49240238b"; + revision = "2"; + editedCabalFile = "90bf3eedb1ad96d0ac2601cbd6732270793c6b5a4d3fdc26592b688a3a387d47"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134946,30 +129206,6 @@ self: { }) {}; "pagerduty" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bytestring - , bytestring-conversion, conduit, data-default-class, exceptions - , generics-sop, http-client, http-types, lens, lens-aeson, mmorph - , monad-control, mtl, template-haskell, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unordered-containers - }: - mkDerivation { - pname = "pagerduty"; - version = "0.0.7"; - sha256 = "5e46075a080cf6c6561977e3f0cdd53a32a627b3a193d58c61a05e628757fe9c"; - libraryHaskellDepends = [ - aeson base bifunctors bytestring bytestring-conversion conduit - data-default-class exceptions generics-sop http-client http-types - lens lens-aeson mmorph monad-control mtl template-haskell text time - time-locale-compat transformers transformers-base - transformers-compat unordered-containers - ]; - homepage = "http://github.com/brendanhay/pagerduty"; - description = "Client library for PagerDuty Integration and REST APIs"; - license = "unknown"; - }) {}; - - "pagerduty_0_0_8" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring , bytestring-conversion, conduit, data-default-class, exceptions , generics-sop, http-client, http-types, lens, lens-aeson, mmorph @@ -134991,7 +129227,6 @@ self: { homepage = "http://github.com/brendanhay/pagerduty"; description = "Client library for PagerDuty Integration and REST APIs"; license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pagination" = callPackage @@ -135023,6 +129258,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "paint" = callPackage + ({ mkDerivation, base, text }: + mkDerivation { + pname = "paint"; + version = "1.0.0"; + sha256 = "a4029057144e91384edfa6e6c56e90b2fe2f1e166201d73f9f8e02e265b6424f"; + libraryHaskellDepends = [ base text ]; + homepage = "https://github.com/lovasko/paint"; + description = "Colorization of text for command-line output"; + license = "unknown"; + }) {}; + "palette" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { @@ -135084,55 +129331,6 @@ self: { }) {}; "pandoc" = callPackage - ({ mkDerivation, aeson, ansi-terminal, array, base - , base64-bytestring, binary, blaze-html, blaze-markup, bytestring - , cmark, containers, data-default, deepseq, Diff, directory - , executable-path, extensible-exceptions, filemanip, filepath - , ghc-prim, haddock-library, highlighting-kate, hslua, HTTP - , http-client, http-client-tls, http-types, HUnit, JuicyPixels, mtl - , network, network-uri, old-time, pandoc-types, parsec, process - , QuickCheck, random, scientific, SHA, syb, tagsoup, temporary - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , texmath, text, time, unordered-containers, vector, xml, yaml - , zip-archive, zlib - }: - mkDerivation { - pname = "pandoc"; - version = "1.17.1"; - sha256 = "5978baaf664ce254b508108a6be9d5a11a2c2ac61462ae85286be2ecdb010c86"; - revision = "1"; - editedCabalFile = "0ceaa11f58bcbaa0b3aa8babf7a92de818ff331f38193c8e42ee8bc174113681"; - configureFlags = [ "-fhttps" "-f-trypandoc" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array base base64-bytestring binary blaze-html blaze-markup - bytestring cmark containers data-default deepseq directory - extensible-exceptions filemanip filepath ghc-prim haddock-library - highlighting-kate hslua HTTP http-client http-client-tls http-types - JuicyPixels mtl network network-uri old-time pandoc-types parsec - process random scientific SHA syb tagsoup temporary texmath text - time unordered-containers vector xml yaml zip-archive zlib - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory extensible-exceptions - filepath highlighting-kate HTTP network network-uri pandoc-types - text yaml - ]; - testHaskellDepends = [ - ansi-terminal base bytestring containers Diff directory - executable-path filepath highlighting-kate HUnit pandoc-types - process QuickCheck syb test-framework test-framework-hunit - test-framework-quickcheck2 text zip-archive - ]; - doCheck = false; - homepage = "http://pandoc.org"; - description = "Conversion between markup formats"; - license = "GPL"; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - - "pandoc_1_19_2_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , cmark, containers, data-default, deepseq, Diff, directory @@ -135177,7 +129375,6 @@ self: { homepage = "http://pandoc.org"; description = "Conversion between markup formats"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; @@ -135390,22 +129587,6 @@ self: { }) {}; "pandoc-types" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , ghc-prim, syb - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.16.1.1"; - sha256 = "f8feb3aef9adc16e7a81d4fd4548e5a142366c59a826272f9b04a9dddbfb9524"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim syb - ]; - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pandoc-types_1_17_0_5" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, HUnit, QuickCheck, string-qq, syb, test-framework , test-framework-hunit, test-framework-quickcheck2 @@ -135424,7 +129605,6 @@ self: { homepage = "http://johnmacfarlane.net/pandoc"; description = "Types for representing a structured document"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-unlit" = callPackage @@ -139281,30 +133461,6 @@ self: { }) {}; "pinboard" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, either, hspec - , http-client, http-client-tls, http-types, mtl, network - , old-locale, profunctors, QuickCheck, random, semigroups, text - , time, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "pinboard"; - version = "0.9.6"; - sha256 = "1b999ac66e530a840b425a4656b8499eccf1928bb25dd059a09b9e14863347db"; - libraryHaskellDepends = [ - aeson base bytestring containers either http-client http-client-tls - http-types mtl network old-locale profunctors random text time - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bytestring containers hspec mtl QuickCheck semigroups - text time transformers unordered-containers - ]; - homepage = "https://github.com/jonschoning/pinboard"; - description = "Access to the Pinboard API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "pinboard_0_9_12_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec , http-client, http-client-tls, http-types, monad-logger, mtl , network, profunctors, QuickCheck, random, safe-exceptions @@ -139328,7 +133484,6 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinch" = callPackage @@ -139354,24 +133509,6 @@ self: { }) {}; "pinchot" = callPackage - ({ mkDerivation, base, containers, Earley, lens, ListLike - , non-empty-sequence, pretty-show, semigroups, template-haskell - , transformers - }: - mkDerivation { - pname = "pinchot"; - version = "0.22.0.0"; - sha256 = "248a9e9108d5e12afd4da1aa5bc6bc8d2e732257da318c60bb225844edb88617"; - libraryHaskellDepends = [ - base containers Earley lens ListLike non-empty-sequence pretty-show - semigroups template-haskell transformers - ]; - homepage = "http://www.github.com/massysett/pinchot"; - description = "Write grammars, not parsers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pinchot_0_24_0_0" = callPackage ({ mkDerivation, base, containers, Earley, lens, pretty-show , semigroups, template-haskell, transformers }: @@ -139386,7 +133523,6 @@ self: { homepage = "http://www.github.com/massysett/pinchot"; description = "Write grammars, not parsers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipe-enumerator" = callPackage @@ -139418,23 +133554,6 @@ self: { }) {}; "pipes" = callPackage - ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework - , test-framework-quickcheck2, transformers - }: - mkDerivation { - pname = "pipes"; - version = "4.1.9"; - sha256 = "c2d5d08761bbb62dca03f81b3d99bb2f50a386c52c30b2abc8c3ca8aabdea3ea"; - libraryHaskellDepends = [ base mmorph mtl transformers ]; - testHaskellDepends = [ - base mtl QuickCheck test-framework test-framework-quickcheck2 - transformers - ]; - description = "Compositional pipelines"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes_4_3_2" = callPackage ({ mkDerivation, base, exceptions, mmorph, mtl, QuickCheck , test-framework, test-framework-quickcheck2, transformers }: @@ -139451,7 +133570,6 @@ self: { ]; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-aeson" = callPackage @@ -139614,20 +133732,6 @@ self: { }) {inherit (pkgs) bzip2;}; "pipes-cacophony" = callPackage - ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: - mkDerivation { - pname = "pipes-cacophony"; - version = "0.4.0"; - sha256 = "224ff8983cc61a92bc733cbdd2a9632b30858ef7a644203a346c0c9d18821ec0"; - libraryHaskellDepends = [ base bytestring cacophony pipes ]; - testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/centromere/pipes-cacophony"; - description = "Pipes for Noise-secured network connections"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "pipes-cacophony_0_4_1" = callPackage ({ mkDerivation, base, bytestring, cacophony, hlint, memory, pipes }: mkDerivation { @@ -139907,16 +134011,16 @@ self: { "pipes-fluid" = callPackage ({ mkDerivation, async, base, constraints, hspec, lens , lifted-async, mmorph, monad-control, mtl, pipes - , pipes-concurrency, pipes-misc, stm, these, transformers - , transformers-base + , pipes-concurrency, pipes-misc, semigroups, stm, these + , transformers, transformers-base }: mkDerivation { pname = "pipes-fluid"; - version = "0.4.0.0"; - sha256 = "c82a04b5799e9c94a1989fc6f940ad4fb624259e6c8eda98515fe43d7b67131d"; + version = "0.5.0.3"; + sha256 = "0d2ef03e16992ef96a4f5d15f1c6d566c7ea7d65eb87e9c64be081d8a60b2b39"; libraryHaskellDepends = [ - base constraints lens lifted-async monad-control pipes stm these - transformers transformers-base + base constraints lens lifted-async monad-control pipes semigroups + stm these transformers transformers-base ]; testHaskellDepends = [ async base constraints hspec lens lifted-async mmorph monad-control @@ -140176,8 +134280,8 @@ self: { }: mkDerivation { pname = "pipes-postgresql-simple"; - version = "0.1.2.0"; - sha256 = "81f11a44938d2ba1744f0ba82053a3a5aaaa0cfc716f5a4762ff4bde7415328a"; + version = "0.1.3.0"; + sha256 = "53de5231df1c0591e9dbd3b989a4075e45fa2a493adce060b53b8e741dbae688"; libraryHaskellDepends = [ async base bytestring exceptions mtl pipes pipes-concurrency pipes-safe postgresql-simple stm text transformers @@ -140238,18 +134342,23 @@ self: { }) {}; "pipes-s3" = callPackage - ({ mkDerivation, aws, base, bytestring, http-client - , http-client-tls, pipes, pipes-bytestring, pipes-safe, resourcet - , text, transformers + ({ mkDerivation, aws, base, bytestring, exceptions, http-client + , http-client-tls, http-types, pipes, pipes-bytestring, pipes-safe + , QuickCheck, resourcet, tasty, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "pipes-s3"; - version = "0.1.0.0"; - sha256 = "a41869e5fa135c8abb3749474cb4c7e9fd572de201109de79176a4c09e33d813"; + version = "0.3.0.2"; + sha256 = "fd89bb1af54af172c2b4fb2c75782a1cbf8ff7778fbb40da1bc2d2e3ec2fa4e7"; libraryHaskellDepends = [ - aws base bytestring http-client http-client-tls pipes + aws base bytestring http-client http-client-tls http-types pipes pipes-bytestring pipes-safe resourcet text transformers ]; + testHaskellDepends = [ + base bytestring exceptions pipes pipes-bytestring pipes-safe + QuickCheck tasty tasty-quickcheck text + ]; homepage = "http://github.com/bgamari/pipes-s3"; description = "A simple interface for streaming data to and from Amazon S3"; license = stdenv.lib.licenses.bsd3; @@ -140257,24 +134366,6 @@ self: { }) {}; "pipes-safe" = callPackage - ({ mkDerivation, base, containers, exceptions, monad-control, mtl - , pipes, transformers, transformers-base - }: - mkDerivation { - pname = "pipes-safe"; - version = "2.2.4"; - sha256 = "502dca5ab38596c70917906ed979f917db52ed91b938d52d96dcb7c56735486e"; - revision = "1"; - editedCabalFile = "c91c8835d9ed03ad82795b877f080a06ed43557bacf5bce90121ca0e6d58e873"; - libraryHaskellDepends = [ - base containers exceptions monad-control mtl pipes transformers - transformers-base - ]; - description = "Safety for the pipes ecosystem"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pipes-safe_2_2_5" = callPackage ({ mkDerivation, base, containers, exceptions, monad-control, mtl , pipes, transformers, transformers-base }: @@ -140288,7 +134379,6 @@ self: { ]; description = "Safety for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-shell" = callPackage @@ -140574,28 +134664,6 @@ self: { }) {}; "pkcs10" = callPackage - ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base - , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, transformers, x509 - }: - mkDerivation { - pname = "pkcs10"; - version = "0.1.1.0"; - sha256 = "1d4665fa5a429e859535e132c507b1e1ec713de50d3e085de9731bbd1c9cbeec"; - libraryHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem - x509 - ]; - testHaskellDepends = [ - asn1-encoding asn1-parse asn1-types base bytestring cryptonite pem - QuickCheck tasty tasty-hunit tasty-quickcheck transformers x509 - ]; - homepage = "https://github.com/fcomb/pkcs10-hs#readme"; - description = "PKCS#10 library"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "pkcs10_0_2_0_0" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, cryptonite, pem, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, transformers, x509 @@ -140615,7 +134683,6 @@ self: { homepage = "https://github.com/fcomb/pkcs10-hs#readme"; description = "PKCS#10 library"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pkcs7" = callPackage @@ -141137,6 +135204,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pocket" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client + , http-client-tls, servant, servant-client, text, transformers + }: + mkDerivation { + pname = "pocket"; + version = "0.1.0"; + sha256 = "c73d73f4221023178324a954c4c0f5873febed698db8ed86acf70d999eb6b712"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring http-client http-client-tls + servant servant-client text transformers + ]; + homepage = "https://github.com/jpvillaisaza/pocket-haskell"; + description = "Bindings for the Pocket API"; + license = stdenv.lib.licenses.mit; + }) {}; + "pocket-dns" = callPackage ({ mkDerivation, aeson, base, bytestring, cabal-test-bin , data-default, dns, hspec, hspec-contrib, hspec-server @@ -141260,29 +135344,6 @@ self: { }) {}; "pointful" = callPackage - ({ mkDerivation, base, containers, haskell-src-exts, mtl, syb - , transformers - }: - mkDerivation { - pname = "pointful"; - version = "1.0.8"; - sha256 = "813152e920e7aad9d2ba2ab5d922deff9cd82ec156f981d16de4bc91320967ac"; - revision = "1"; - editedCabalFile = "b2038459d89251a94f3cc8709f5be0ce80c0cc1be72e2b65fca387efdd61d477"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers haskell-src-exts mtl syb transformers - ]; - executableHaskellDepends = [ - base containers haskell-src-exts mtl syb transformers - ]; - homepage = "http://github.com/23Skidoo/pointful"; - description = "Pointful refactoring tool"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "pointful_1_0_9" = callPackage ({ mkDerivation, base, containers, haskell-src-exts-simple, mtl , syb, transformers }: @@ -141301,7 +135362,6 @@ self: { homepage = "http://github.com/23Skidoo/pointful"; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pointless-fun" = callPackage @@ -142517,27 +136577,6 @@ self: { }) {}; "postgresql-simple-url" = callPackage - ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty - , tasty-quickcheck - }: - mkDerivation { - pname = "postgresql-simple-url"; - version = "0.1.0.1"; - sha256 = "cf165ec652e1192f392349e09e413a776921ddef71d95bac0d23e9f81cfbe8a0"; - revision = "7"; - editedCabalFile = "f4f8535e362cc496675fa36640cea043fbe46e99e2d3bc8ee449ebe6a293c8cc"; - libraryHaskellDepends = [ - base network-uri postgresql-simple split - ]; - testHaskellDepends = [ - base postgresql-simple tasty tasty-quickcheck - ]; - homepage = "https://github.com/futurice/postgresql-simple-url"; - description = "Parse postgres:// url into ConnectInfo"; - license = stdenv.lib.licenses.mit; - }) {}; - - "postgresql-simple-url_0_2_0_0" = callPackage ({ mkDerivation, base, network-uri, postgresql-simple, split, tasty , tasty-quickcheck }: @@ -142554,7 +136593,6 @@ self: { homepage = "https://github.com/futurice/postgresql-simple-url"; description = "Parse postgres:// url into ConnectInfo"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-transactional" = callPackage @@ -143947,22 +137985,6 @@ self: { }) {}; "process-extras" = callPackage - ({ mkDerivation, base, bytestring, deepseq, generic-deriving - , ListLike, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.4.1.4"; - sha256 = "05cd949158ff605cb63fc86a2de1b51bfd8d27bf54b5fbe6427a1941e938cfc0"; - libraryHaskellDepends = [ - base bytestring deepseq generic-deriving ListLike process text - ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - }) {}; - - "process-extras_0_7_1" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq , generic-deriving, HUnit, ListLike, mtl, process, text }: @@ -143978,7 +138000,6 @@ self: { homepage = "https://github.com/seereason/process-extras"; description = "Process extras"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "process-iterio" = callPackage @@ -144262,25 +138283,6 @@ self: { }) {}; "profiteur" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, filepath - , text, unordered-containers, vector - }: - mkDerivation { - pname = "profiteur"; - version = "0.3.0.3"; - sha256 = "4f9929059826c24be4c4cbfae00cfea5985c20c4c2ddb03d56a47cd72c18e144"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson attoparsec base bytestring filepath text unordered-containers - vector - ]; - homepage = "http://github.com/jaspervdj/profiteur"; - description = "Treemap visualiser for GHC prof files"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "profiteur_0_4_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, filepath , ghc-prof, js-jquery, scientific, text, unordered-containers , vector @@ -144298,7 +138300,6 @@ self: { homepage = "http://github.com/jaspervdj/profiteur"; description = "Treemap visualiser for GHC prof files"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "profunctor-extras" = callPackage @@ -144654,8 +138655,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.2.3"; - sha256 = "078b51c15e4dbce6f55cd26eeb82ed6307e3c47661ab6518f421a1c95e60a11a"; + version = "3.3.0"; + sha256 = "dba271f7078786ba229c5dfe72caf4f03b92044506fab82e1a0ed24c555d9172"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145271,19 +139272,6 @@ self: { }) {}; "publicsuffix" = callPackage - ({ mkDerivation, base, filepath, hspec, template-haskell }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20160716"; - sha256 = "19d7fd9990954284073323d9d22a892f1b600761e5353e9a0473d46591956956"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - }) {}; - - "publicsuffix_0_20170109" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { pname = "publicsuffix"; @@ -145294,7 +139282,6 @@ self: { homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; description = "The publicsuffix list exposed as proper Haskell types"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "publicsuffixlist" = callPackage @@ -145717,59 +139704,12 @@ self: { }) {}; "purescript" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal - , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring - , clock, containers, directory, dlist, edit-distance, file-embed - , filepath, fsnotify, Glob, haskeline, hspec, hspec-discover - , http-client, http-types, HUnit, language-javascript, lifted-base - , monad-control, monad-logger, mtl, network, optparse-applicative - , parallel, parsec, pattern-arrows, pipes, pipes-http, process - , protolude, regex-tdfa, safe, semigroups, silently, sourcemap - , spdx, split, stm, syb, text, time, transformers - , transformers-base, transformers-compat, unordered-containers - , utf8-string, vector, wai, wai-websockets, warp, websockets - }: - mkDerivation { - pname = "purescript"; - version = "0.9.3"; - sha256 = "0e4628232508a37568103d3ffcce68355258af388bba1b0bb3847c1fb33b91e5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-better-errors ansi-terminal base base-compat bower-json - boxes bytestring clock containers directory dlist edit-distance - filepath fsnotify Glob haskeline http-client http-types - language-javascript lifted-base monad-control monad-logger mtl - parallel parsec pattern-arrows pipes pipes-http process protolude - regex-tdfa safe semigroups sourcemap spdx split stm syb text time - transformers transformers-base transformers-compat - unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson ansi-terminal ansi-wl-pprint base base-compat boxes - bytestring containers directory file-embed filepath Glob haskeline - http-types monad-logger mtl network optparse-applicative parsec - process protolude split stm text time transformers - transformers-compat utf8-string wai wai-websockets warp websockets - ]; - testHaskellDepends = [ - aeson aeson-better-errors base base-compat boxes bytestring - containers directory filepath Glob haskeline hspec hspec-discover - HUnit mtl optparse-applicative parsec process protolude silently - stm text time transformers transformers-compat utf8-string vector - ]; - doCheck = false; - homepage = "http://www.purescript.org/"; - description = "PureScript Programming Language Compiler"; - license = stdenv.lib.licenses.mit; - }) {}; - - "purescript_0_10_5" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-pretty - , ansi-terminal, ansi-wl-pprint, base, base-compat, bower-json - , boxes, bytestring, clock, containers, data-ordlist, directory - , dlist, edit-distance, file-embed, filepath, foldl, fsnotify, Glob - , haskeline, hspec, hspec-discover, http-client, http-types, HUnit + , ansi-terminal, ansi-wl-pprint, base, base-compat, blaze-html + , bower-json, boxes, bytestring, cheapskate, clock, containers + , data-ordlist, deepseq, directory, dlist, edit-distance + , file-embed, filepath, foldl, fsnotify, Glob, haskeline, hspec + , hspec-discover, http-client, http-types, HUnit , language-javascript, lens, lifted-base, monad-control , monad-logger, mtl, network, optparse-applicative, parallel , parsec, pattern-arrows, pipes, pipes-http, process, protolude @@ -145781,19 +139721,20 @@ self: { }: mkDerivation { pname = "purescript"; - version = "0.10.5"; - sha256 = "0d36361819866efe703eb3ae37f597316098ec3ead6edc9236ea63d54bdc8916"; + version = "0.10.7"; + sha256 = "85dff2f4b6916e9d45b6a1b2674dc6c91c56ac6c1597f627d5f1cbee9d0b3a9d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-better-errors ansi-terminal base base-compat bower-json - boxes bytestring clock containers data-ordlist directory dlist - edit-distance filepath fsnotify Glob haskeline http-client - http-types language-javascript lens lifted-base monad-control - monad-logger mtl parallel parsec pattern-arrows pipes pipes-http - process protolude regex-tdfa safe scientific semigroups sourcemap - spdx split stm syb text time transformers transformers-base - transformers-compat unordered-containers utf8-string vector + aeson aeson-better-errors ansi-terminal base base-compat blaze-html + bower-json boxes bytestring cheapskate clock containers + data-ordlist deepseq directory dlist edit-distance filepath + fsnotify Glob haskeline http-client http-types language-javascript + lens lifted-base monad-control monad-logger mtl parallel parsec + pattern-arrows pipes pipes-http process protolude regex-tdfa safe + scientific semigroups sourcemap spdx split stm syb text time + transformers transformers-base transformers-compat + unordered-containers utf8-string vector ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal ansi-wl-pprint base base-compat @@ -145806,15 +139747,14 @@ self: { testHaskellDepends = [ aeson aeson-better-errors base base-compat bower-json boxes bytestring containers directory filepath Glob haskeline hspec - hspec-discover HUnit mtl optparse-applicative parsec process - protolude silently stm text time transformers transformers-compat - utf8-string vector + hspec-discover HUnit lens monad-logger mtl optparse-applicative + parsec process protolude silently stm text time transformers + transformers-compat utf8-string vector ]; doCheck = false; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bridge" = callPackage @@ -145824,8 +139764,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.8.0.1"; - sha256 = "ab3cf87f637053e0378ca266166e5699ae4acfb5f404dae9ac4a793890124329"; + version = "0.10.0.0"; + sha256 = "6bfb056e3dc2f93a4bb5db20e1151f258145ae7a8c2a13a2e8478936b4ff37d3"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -145838,15 +139778,15 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "purescript-bridge_0_9_0_0" = callPackage + "purescript-bridge_0_10_1_0" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, hspec, hspec-expectations-pretty-diff, lens , mtl, text, transformers }: mkDerivation { pname = "purescript-bridge"; - version = "0.9.0.0"; - sha256 = "ba7ed603c5cc92099b48388ce4caade457f6f51a8b3eaf87c665aea21d394f04"; + version = "0.10.1.0"; + sha256 = "1a5f92b77f01a214272aed6df3c0b47d28c8f7954c07b2d16f7cdd3f2c596223"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -146001,6 +139941,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pusher-http-haskell_1_2_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptohash, hashable, hspec, http-client, http-types, QuickCheck + , text, time, transformers, unordered-containers + }: + mkDerivation { + pname = "pusher-http-haskell"; + version = "1.2.0.0"; + sha256 = "372de78c2efaf60512d22311ad38bd6e968e9e29de171517438c8b129a4b7371"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptohash hashable + http-client http-types text time transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec http-client http-types QuickCheck text + transformers unordered-containers + ]; + homepage = "https://github.com/pusher-community/pusher-http-haskell"; + description = "Haskell client library for the Pusher HTTP API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pusher-ws" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , hashable, http-conduit, lens, lens-aeson, network, scientific @@ -146855,19 +140818,6 @@ self: { }) {}; "quickcheck-assertions" = callPackage - ({ mkDerivation, base, hspec, ieee754, QuickCheck }: - mkDerivation { - pname = "quickcheck-assertions"; - version = "0.2.0"; - sha256 = "600fbafab414f5fba7df40a10635aa407d3af8de3938a6c2866bf80f0952f740"; - libraryHaskellDepends = [ base ieee754 QuickCheck ]; - testHaskellDepends = [ base hspec ieee754 QuickCheck ]; - homepage = "https://github.com/s9gf4ult/quickcheck-assertions"; - description = "HUnit like assertions for QuickCheck"; - license = stdenv.lib.licenses.lgpl3; - }) {}; - - "quickcheck-assertions_0_3_0" = callPackage ({ mkDerivation, base, hspec, ieee754, pretty-show, QuickCheck }: mkDerivation { pname = "quickcheck-assertions"; @@ -146878,7 +140828,6 @@ self: { homepage = "https://github.com/s9gf4ult/quickcheck-assertions"; description = "HUnit like assertions for QuickCheck"; license = stdenv.lib.licenses.lgpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-combinators" = callPackage @@ -147892,8 +141841,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, quickcheck-io }: mkDerivation { pname = "ramus"; - version = "0.1.0"; - sha256 = "8acc90e5aec53ea31b8da0a1dd0164c4e2aa6e3226c5b69da0882b5c47255537"; + version = "0.1.2"; + sha256 = "dcddddc416e79c401604565b7297a945f814edeed056fb3b897eda5f4f0b794e"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck quickcheck-io ]; homepage = "https://github.com/NickSeagull/ramus#readme"; @@ -148561,33 +142510,6 @@ self: { }) {}; "rasterific-svg" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, directory - , filepath, FontyFruity, JuicyPixels, lens, linear, mtl - , optparse-applicative, Rasterific, scientific, svg-tree, text - , transformers, vector - }: - mkDerivation { - pname = "rasterific-svg"; - version = "0.3.1.2"; - sha256 = "83c90ea97d73f05003de2a4622ed26754fa52cb94a3341feada477713332a789"; - revision = "1"; - editedCabalFile = "1a66db5d85478533f4d6702dd36b158f464f3a725a365bcb68fefed59edfa586"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers directory filepath FontyFruity - JuicyPixels lens linear mtl Rasterific scientific svg-tree text - transformers vector - ]; - executableHaskellDepends = [ - base directory filepath FontyFruity JuicyPixels - optparse-applicative Rasterific svg-tree - ]; - description = "SVG renderer based on Rasterific"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rasterific-svg_0_3_2_1" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , filepath, FontyFruity, JuicyPixels, lens, linear, mtl , optparse-applicative, primitive, Rasterific, scientific, svg-tree @@ -148610,7 +142532,6 @@ self: { ]; description = "SVG renderer based on Rasterific"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rate-limit" = callPackage @@ -150487,10 +144408,8 @@ self: { ({ mkDerivation, base, blaze-html, blaze-markup, reform, text }: mkDerivation { pname = "reform-blaze"; - version = "0.2.4.1"; - sha256 = "d4acf094d75cef125e9d587646b9bbb66ce927b43ed16c99738f11e80569678b"; - revision = "1"; - editedCabalFile = "abe598582e2e9627ce899e3fe47c1d495da157d0059115aca220beecee6a05f1"; + version = "0.2.4.3"; + sha256 = "11bcf127356bf5840a0947ea1058cbf1e08096ab0fc872aa5c1ec7d88e40b2e4"; libraryHaskellDepends = [ base blaze-html blaze-markup reform text ]; @@ -150503,8 +144422,8 @@ self: { ({ mkDerivation, base, blaze-markup, reform, shakespeare, text }: mkDerivation { pname = "reform-hamlet"; - version = "0.0.5.1"; - sha256 = "a0271fc7580463d3790f26e651836e0030178444987c9132b3c74dab249286f2"; + version = "0.0.5.3"; + sha256 = "512729389fc3eec118a8079486eb2319e1e8eaecdeecafdd6b36205373ce3466"; libraryHaskellDepends = [ base blaze-markup reform shakespeare text ]; @@ -152405,26 +146324,6 @@ self: { }) {}; "reroute" = callPackage - ({ mkDerivation, base, deepseq, hashable, hspec, hvect, mtl - , path-pieces, text, unordered-containers, vector - }: - mkDerivation { - pname = "reroute"; - version = "0.4.0.1"; - sha256 = "d1c3636aa6d2895055721ff9290a595fff2ce3e9d917e9af7e36aafb71701f0e"; - libraryHaskellDepends = [ - base deepseq hashable hvect mtl path-pieces text - unordered-containers - ]; - testHaskellDepends = [ - base hspec hvect mtl text unordered-containers vector - ]; - homepage = "http://github.com/agrafix/Spock"; - description = "abstract implementation of typed and untyped web routing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "reroute_0_4_1_0" = callPackage ({ mkDerivation, base, deepseq, hashable, hspec, http-api-data , hvect, mtl, text, unordered-containers, vector }: @@ -152442,7 +146341,6 @@ self: { homepage = "http://github.com/agrafix/Spock"; description = "abstract implementation of typed and untyped web routing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reserve" = callPackage @@ -152749,34 +146647,6 @@ self: { }) {}; "rest-gen" = callPackage - ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal - , code-builder, directory, fclabels, filepath, hashable - , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema - , pretty, process, rest-core, safe, scientific, semigroups, split - , test-framework, test-framework-hunit, text, uniplate - , unordered-containers, vector - }: - mkDerivation { - pname = "rest-gen"; - version = "0.19.0.3"; - sha256 = "9ed4224ed8de81c56000b6814724bfed46f4e7b8890fe5892d308b6edcab2e76"; - revision = "1"; - editedCabalFile = "d613ead87b1c5a0a7fee13c46dc42edf4c9e486277a14f1a3ce5314799963abd"; - libraryHaskellDepends = [ - aeson base base-compat blaze-html Cabal code-builder directory - fclabels filepath hashable haskell-src-exts HStringTemplate hxt - json-schema pretty process rest-core safe scientific semigroups - split text uniplate unordered-containers vector - ]; - testHaskellDepends = [ - base fclabels haskell-src-exts HUnit rest-core test-framework - test-framework-hunit - ]; - description = "Documentation and client generation from rest definition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rest-gen_0_20_0_0" = callPackage ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal , code-builder, directory, fclabels, filepath, hashable , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema @@ -152802,7 +146672,6 @@ self: { ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-happstack" = callPackage @@ -154202,21 +148071,6 @@ self: { }) {}; "rotating-log" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, time }: - mkDerivation { - pname = "rotating-log"; - version = "0.4"; - sha256 = "661a22b9f5b05d7dd8989f61f1d625862d57b18aa19fba7077746f05be77b451"; - libraryHaskellDepends = [ - base bytestring directory filepath time - ]; - testHaskellDepends = [ base bytestring directory filepath time ]; - homepage = "http://github.com/Soostone/rotating-log"; - description = "Size-limited, concurrent, automatically-rotating log writer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "rotating-log_0_4_2" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, old-locale , time, time-locale-compat }: @@ -154234,7 +148088,6 @@ self: { homepage = "http://github.com/Soostone/rotating-log"; description = "Size-limited, concurrent, automatically-rotating log writer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roundRobin" = callPackage @@ -154540,33 +148393,6 @@ self: { }) {}; "rss-conduit" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra - , conduit-parse, containers, data-default, exceptions, foldl, hlint - , lens-simple, mono-traversable, parsers, QuickCheck - , quickcheck-instances, resourcet, safe, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring - , xml-conduit, xml-conduit-parse, xml-types - }: - mkDerivation { - pname = "rss-conduit"; - version = "0.2.0.2"; - sha256 = "304a2918743f7b65191ce8c4a57c94b1c3afb2692e5c79d6b0822a05be3294d1"; - libraryHaskellDepends = [ - base conduit conduit-parse containers exceptions foldl lens-simple - mono-traversable parsers safe text time timerep uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra conduit-parse data-default - exceptions hlint lens-simple mono-traversable parsers QuickCheck - quickcheck-instances resourcet tasty tasty-hunit tasty-quickcheck - text time uri-bytestring xml-conduit xml-conduit-parse xml-types - ]; - description = "Streaming parser/renderer for the RSS 2.0 standard."; - license = "unknown"; - }) {}; - - "rss-conduit_0_3_0_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-combinators , conduit-extra, containers, data-default, hlint, lens-simple , mono-traversable, QuickCheck, quickcheck-instances, resourcet @@ -154590,7 +148416,6 @@ self: { ]; description = "Streaming parser/renderer for the RSS 2.0 standard."; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss2irc" = callPackage @@ -155019,8 +148844,8 @@ self: { ({ mkDerivation, base, deepseq, QuickCheck }: mkDerivation { pname = "safe"; - version = "0.3.11"; - sha256 = "6a58c8199a8c5ee7ca14077b69c2e876b29be51c797ec4b93de9c7ab3c7bd879"; + version = "0.3.13"; + sha256 = "4a75af71313ef98bb66fbb4f1416f6f1220cd37a2c8b1462ed8c5a982a264884"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq QuickCheck ]; homepage = "https://github.com/ndmitchell/safe#readme"; @@ -155028,20 +148853,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "safe_0_3_12" = callPackage - ({ mkDerivation, base, deepseq, QuickCheck }: - mkDerivation { - pname = "safe"; - version = "0.3.12"; - sha256 = "738c849bdc619f9bbcd23f7fc956af2b87a182a9887ac88c1a80895ae931e29e"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base deepseq QuickCheck ]; - homepage = "https://github.com/ndmitchell/safe#readme"; - description = "Library of safe (exception free) functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "safe-access" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -155543,23 +149354,6 @@ self: { }) {}; "sampling" = callPackage - ({ mkDerivation, base, foldl, mwc-random, primitive, vector }: - mkDerivation { - pname = "sampling"; - version = "0.2.0"; - sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a"; - revision = "1"; - editedCabalFile = "705929c9a629db8150478fd996315889fb8e5ab16dd584bc969727d6cc7e25b1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base foldl mwc-random primitive vector ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/jtobin/sampling"; - description = "Sample values from collections"; - license = stdenv.lib.licenses.mit; - }) {}; - - "sampling_0_3_2" = callPackage ({ mkDerivation, base, containers, foldl, mwc-random, primitive , vector }: @@ -155574,7 +149368,6 @@ self: { homepage = "https://github.com/jtobin/sampling"; description = "Sample values from collections"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "samtools" = callPackage @@ -155913,8 +149706,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "2.1.6"; - sha256 = "85387a8556d0b25b009ab48b6bcbafb5ac91bfb7dc5442838376f913be59924b"; + version = "2.1.7"; + sha256 = "481f1bb36ecd467b2e60d2a97c6393384d78b96ece7afd644d96641ee51bb32e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155964,8 +149757,8 @@ self: { }: mkDerivation { pname = "sbv"; - version = "5.12"; - sha256 = "0c43caeb77fd6a3d6d4e8e71835da0ca5e207dcc2b0bf6ef07abb7dd5c3bd55f"; + version = "5.14"; + sha256 = "92dc71b96071162a47383c5f4833e8b78c2874009e671e2a6bc8de9707328e7e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156107,24 +149900,6 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, containers, curl, data-default - , HUnit, regex-base, regex-tdfa, tagsoup, text - }: - mkDerivation { - pname = "scalpel"; - version = "0.3.1"; - sha256 = "5db9046a506f40d713fb678e496b7fd9cfa21c453bd5e6f574720d57826a204f"; - libraryHaskellDepends = [ - base bytestring containers curl data-default regex-base regex-tdfa - tagsoup text - ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; - homepage = "https://github.com/fimad/scalpel"; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel_0_5_0" = callPackage ({ mkDerivation, base, bytestring, curl, data-default, scalpel-core , tagsoup, text }: @@ -156138,7 +149913,6 @@ self: { homepage = "https://github.com/fimad/scalpel"; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalpel-core" = callPackage @@ -156531,31 +150305,6 @@ self: { }) {}; "scientific" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq - , ghc-prim, hashable, integer-gmp, QuickCheck, smallcheck, tasty - , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck - , text, vector - }: - mkDerivation { - pname = "scientific"; - version = "0.3.4.9"; - sha256 = "108330662b0af9a04d7da55864211ce12008efe36614d897ba635e80670918a8"; - revision = "1"; - editedCabalFile = "833f5960e622c7346c3c02547538da037bcc4eececc00ba2ab9412eabdb71d61"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq ghc-prim hashable - integer-gmp text vector - ]; - testHaskellDepends = [ - base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml - tasty-hunit tasty-quickcheck tasty-smallcheck text - ]; - homepage = "https://github.com/basvandijk/scientific"; - description = "Numbers represented using scientific notation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "scientific_0_3_4_10" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq , ghc-prim, hashable, integer-gmp, integer-logarithms, QuickCheck , smallcheck, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck @@ -156576,7 +150325,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 @@ -157180,23 +150928,6 @@ self: { }) {}; "sdl2" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.1.3.1"; - sha256 = "788a7f1e2bb08e393b806d9f700f62234703ec85b772e0e25ff740b4aafaae14"; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.2+)."; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_2_0" = callPackage ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 , StateVar, text, transformers, vector }: @@ -157211,7 +150942,6 @@ self: { libraryPkgconfigDepends = [ SDL2 ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.4+)."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -157947,8 +151677,8 @@ self: { }: mkDerivation { pname = "semiring-num"; - version = "0.8.0.0"; - sha256 = "13b47bc891b8b2bcfe648409554e4b811ce964d86febd1403584beb5f3b21a4e"; + version = "0.9.0.1"; + sha256 = "2605eddf961927ce04be8167a2a01123ee0a0dcae55dcd44f3830736ae4d9830"; libraryHaskellDepends = [ base containers template-haskell ]; testHaskellDepends = [ base containers doctest nat-sized-numbers QuickCheck smallcheck @@ -158532,19 +152262,21 @@ self: { "servant" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , bytestring-conversion, case-insensitive, directory, doctest - , filemanip, filepath, hspec, http-api-data, http-media, http-types - , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances - , string-conversions, text, url, vault + , case-insensitive, directory, doctest, filemanip, filepath, hspec + , http-api-data, http-media, http-types, mmorph, mtl, network-uri + , QuickCheck, quickcheck-instances, string-conversions, text, url + , vault }: mkDerivation { pname = "servant"; - version = "0.8.1"; - sha256 = "2b5494ceb4d8123c7a92535d0cf109485e165dfc9cba9471b11127e04556d8c1"; + version = "0.9.1.1"; + sha256 = "fb3372f676ab07dfab1695ccd0e23d98c948318f4b4d5ae827a6fa5284c4e5fa"; + revision = "1"; + editedCabalFile = "a9be93ef6e6464dc76f4572fe372095b9e77fdbaf92966569b5a50ee4829de4d"; libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring bytestring-conversion - case-insensitive http-api-data http-media http-types mmorph mtl - network-uri string-conversions text vault + aeson attoparsec base base-compat bytestring case-insensitive + http-api-data http-media http-types mmorph mtl network-uri + string-conversions text vault ]; testHaskellDepends = [ aeson attoparsec base base-compat bytestring directory doctest @@ -158645,7 +152377,6 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "Authentication combinators for servant"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-client" = callPackage @@ -158752,6 +152483,47 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-server_0_2_1_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, bytestring-conversion, case-insensitive, cookie + , crypto-api, data-default-class, entropy, hspec, http-api-data + , http-client, http-types, jose, lens, lens-aeson, markdown-unlit + , monad-time, mtl, QuickCheck, servant-auth, servant-server, text + , time, transformers, unordered-containers, wai, warp, wreq + }: + mkDerivation { + pname = "servant-auth-server"; + version = "0.2.1.0"; + sha256 = "0f9e848300a916de0892c55a8b530a02d3fc8bcbc7983012780355a88e266c84"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens monad-time mtl + servant-auth servant-server text time unordered-containers wai + ]; + executableHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy http-api-data jose lens markdown-unlit + monad-time mtl servant-auth servant-server text time transformers + unordered-containers wai warp + ]; + testHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + bytestring-conversion case-insensitive cookie crypto-api + data-default-class entropy hspec http-api-data http-client + http-types jose lens lens-aeson monad-time mtl QuickCheck + servant-auth servant-server text time unordered-containers wai warp + wreq + ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "servant-server/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-server" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder , bytestring, bytestring-conversion, case-insensitive, cookie @@ -158790,7 +152562,6 @@ self: { homepage = "http://github.com/plow-technologies/servant-auth#readme"; description = "servant-server/servant-auth compatibility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-auth-token" = callPackage @@ -158801,8 +152572,8 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.3.2.0"; - sha256 = "e15307d04c1011f118696c791d641d2a22844737d2484138147beb49f1abcae2"; + version = "0.4.0.0"; + sha256 = "e194c5c860508e22b8eb030d6c52c431df9fd7631a6287b042b48daf74825250"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl persistent persistent-postgresql persistent-template pwstore-fast @@ -158814,14 +152585,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-acid" = callPackage + ({ mkDerivation, acid-state, aeson-injector, base, bytestring + , containers, ghc-prim, monad-control, mtl, safe, safecopy + , servant-auth-token, servant-auth-token-api, servant-server + , template-haskell, text, time, transformers, transformers-base + , uuid + }: + mkDerivation { + pname = "servant-auth-token-acid"; + version = "0.4.0.0"; + sha256 = "22c16f9a7d05a3555c7f3195248165b384c99792bf0e952326d3992831da318b"; + libraryHaskellDepends = [ + acid-state aeson-injector base bytestring containers ghc-prim + monad-control mtl safe safecopy servant-auth-token + servant-auth-token-api servant-server template-haskell text time + transformers transformers-base uuid + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Acid-state backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-token-api" = callPackage ({ mkDerivation, aeson, aeson-injector, base, lens, raw-strings-qq , servant, servant-docs, servant-swagger, swagger2, text }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.3.2.0"; - sha256 = "f2fe6ed30518036c9866095521fc9212877e3760ea9a57fd40543d601b8c5e4e"; + version = "0.4.0.0"; + sha256 = "6a8ab7ae1f63d2aecca8c6d63f2b305238b010e5c2e19e4c7f51e01d6bb65526"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -158832,6 +152625,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-token-persistent" = callPackage + ({ mkDerivation, aeson-injector, base, bytestring, containers + , ghc-prim, monad-control, mtl, persistent, persistent-postgresql + , persistent-template, servant-auth-token, servant-auth-token-api + , servant-server, text, time, transformers, transformers-base, uuid + }: + mkDerivation { + pname = "servant-auth-token-persistent"; + version = "0.4.0.0"; + sha256 = "8b2a6cbc45e3f52ac5d12cd05c052373ca758599672b6086b3148e0dd5f9a075"; + libraryHaskellDepends = [ + aeson-injector base bytestring containers ghc-prim monad-control + mtl persistent persistent-postgresql persistent-template + servant-auth-token servant-auth-token-api servant-server text time + transformers transformers-base uuid + ]; + homepage = "https://github.com/ncrashed/servant-auth-token#readme"; + description = "Persistent backend for servant-auth-token server"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-blaze" = callPackage ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { @@ -158861,27 +152675,29 @@ self: { }) {}; "servant-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, deepseq, exceptions, hspec, http-api-data - , http-client, http-client-tls, http-media, http-types, HUnit - , network, network-uri, QuickCheck, safe, servant, servant-server - , string-conversions, text, transformers, transformers-compat, wai - , warp + ({ mkDerivation, aeson, attoparsec, base, base-compat + , base64-bytestring, bytestring, deepseq, exceptions, hspec + , http-api-data, http-client, http-client-tls, http-media + , http-types, HUnit, mtl, network, network-uri, QuickCheck, safe + , servant, servant-server, string-conversions, text, transformers + , transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.8.1"; - sha256 = "a007328f261e8d5596fee87cf541d0886bd1d644fb545fbb05fca683d8f8e33a"; + version = "0.9.1.1"; + sha256 = "6e085faa1a8ecab076ffdec61b97b6e7c8fff7eb18a9a4cf3538c26b7b99c724"; + revision = "1"; + editedCabalFile = "d3ac72d1b11dd6ebf86076237d8ffab3b87e8b6f04d2af1b28a2c5506faa82c5"; libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring exceptions - http-api-data http-client http-client-tls http-media http-types - network-uri safe servant string-conversions text transformers - transformers-compat + aeson attoparsec base base-compat base64-bytestring bytestring + exceptions http-api-data http-client http-client-tls http-media + http-types mtl network-uri safe servant string-conversions text + transformers transformers-compat ]; testHaskellDepends = [ - aeson base bytestring deepseq hspec http-client http-media - http-types HUnit network QuickCheck servant servant-server text - transformers transformers-compat wai warp + aeson base base-compat bytestring deepseq hspec http-api-data + http-client http-media http-types HUnit network QuickCheck servant + servant-server text transformers transformers-compat wai warp ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; @@ -158978,24 +152794,23 @@ self: { "servant-docs" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , bytestring-conversion, case-insensitive, control-monad-omega - , hashable, hspec, http-media, http-types, lens, servant - , string-conversions, text, unordered-containers + , case-insensitive, control-monad-omega, hashable, hspec + , http-media, http-types, lens, servant, string-conversions, text + , unordered-containers }: mkDerivation { pname = "servant-docs"; - version = "0.8.1"; - sha256 = "5a68ef0248da54fddf2fbba0a209a2bbba4144a576c681545b8019041645868d"; + version = "0.9.1.1"; + sha256 = "7c4205d25caa926355221e62842c3e58337d05022b1e4341045ac385e568bc79"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty base bytestring bytestring-conversion - case-insensitive control-monad-omega hashable http-media http-types - lens servant string-conversions text unordered-containers + aeson aeson-pretty base bytestring case-insensitive + control-monad-omega hashable http-media http-types lens servant + string-conversions text unordered-containers ]; executableHaskellDepends = [ - aeson base bytestring-conversion lens servant string-conversions - text + aeson base lens servant string-conversions text ]; testHaskellDepends = [ aeson base hspec lens servant string-conversions @@ -159003,7 +152818,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-docs_0_10" = callPackage @@ -159101,7 +152915,6 @@ self: { homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-examples" = callPackage @@ -159132,8 +152945,8 @@ self: { ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.8.1"; - sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171"; + version = "0.9.1.1"; + sha256 = "da9baf46c97b3ef3009a69c8d1ca40e188409c0027490c9e173b9ebd3da7c9ca"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; description = "Helpers for generating clients for servant APIs in any programming language"; @@ -159245,27 +153058,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, servant - , servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.8.1"; - sha256 = "5f60d692953f9f5f1570c7fd6b1c8c524545e588b3f1c63669ef219dde8c0363"; - libraryHaskellDepends = [ - base base-compat charset lens servant servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - servant text - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Automatically derive javascript functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-js_0_9_1" = callPackage ({ mkDerivation, base, base-compat, charset, hspec , hspec-expectations, language-ecmascript, lens, QuickCheck , servant, servant-foreign, text @@ -159286,7 +153078,6 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage @@ -159451,31 +153242,6 @@ self: { }) {}; "servant-purescript" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, http-types, lens, mainland-pretty, purescript-bridge - , servant, servant-foreign, servant-server, servant-subscriber - , text - }: - mkDerivation { - pname = "servant-purescript"; - version = "0.3.1.5"; - sha256 = "3bf4363b2154c7fb3e6da4eb9f5ef227c5e15d4cc6048342086d77426f74b9d5"; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath http-types lens - mainland-pretty purescript-bridge servant servant-foreign - servant-server servant-subscriber text - ]; - testHaskellDepends = [ - aeson base containers lens mainland-pretty purescript-bridge - servant servant-foreign servant-subscriber text - ]; - homepage = "https://github.com/eskimor/servant-purescript#readme"; - description = "Generate PureScript accessor functions for you servant API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-purescript_0_6_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, http-types, lens, mainland-pretty, purescript-bridge , servant, servant-foreign, servant-server, servant-subscriber @@ -159500,6 +153266,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-pushbullet-client" = callPackage + ({ mkDerivation, aeson, base, http-api-data, http-client + , http-client-tls, microlens, microlens-th, scientific, servant + , servant-client, text, time, unordered-containers + }: + mkDerivation { + pname = "servant-pushbullet-client"; + version = "0.0.3.0"; + sha256 = "f6374498a3f6cfd59b8562cd506408dcbd6805cb107d2a756c1e3700aef09b9d"; + libraryHaskellDepends = [ + aeson base http-api-data http-client http-client-tls microlens + microlens-th scientific servant servant-client text time + unordered-containers + ]; + description = "Bindings to the Pushbullet API using servant-client"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-quickcheck" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring , case-insensitive, clock, data-default-class, hspec, hspec-core @@ -159584,18 +153368,19 @@ self: { "servant-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, bytestring-conversion, containers - , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-wai, http-api-data, http-types, mtl, network, network-uri - , parsec, QuickCheck, safe, servant, should-not-typecheck, split - , string-conversions, system-filepath, temporary, text - , transformers, transformers-compat, wai, wai-app-static, wai-extra - , warp, word8 + , base64-bytestring, bytestring, containers, directory, doctest + , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data + , http-types, mtl, network, network-uri, parsec, QuickCheck, safe + , servant, should-not-typecheck, split, string-conversions + , system-filepath, temporary, text, transformers + , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.8.1"; - sha256 = "2a662864df00ce431eb1a6d01245d65c1483847c6228c540e6374108fe84a2b2"; + version = "0.9.1.1"; + sha256 = "1e0683557ece1f7a8a7b11e5c7cd1fd042783777157d95a67e28a0518c91bdd1"; + revision = "1"; + editedCabalFile = "0fd5137ad4ab43f5a6fde1a944eb23ce6d75c42fb909e4a82b579ab1c3739771"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -159606,11 +153391,11 @@ self: { ]; executableHaskellDepends = [ aeson base servant text wai warp ]; testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring - bytestring-conversion directory doctest exceptions filemanip - filepath hspec hspec-wai http-types mtl network parsec QuickCheck - safe servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra warp + aeson base base-compat base64-bytestring bytestring directory + doctest exceptions filemanip filepath hspec hspec-wai http-types + mtl network parsec QuickCheck safe servant should-not-typecheck + string-conversions temporary text transformers transformers-compat + wai wai-extra warp ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; @@ -162035,24 +155820,6 @@ self: { }) {}; "simple-log" = callPackage - ({ mkDerivation, async, base, containers, deepseq, directory - , exceptions, filepath, mtl, SafeSemaphore, text, time - , transformers - }: - mkDerivation { - pname = "simple-log"; - version = "0.4.0"; - sha256 = "548c444505f70beb02b14b5b1e0c647acaa1879edc5699ef365ec516a9b55aa5"; - libraryHaskellDepends = [ - async base containers deepseq directory exceptions filepath mtl - SafeSemaphore text time transformers - ]; - homepage = "http://github.com/mvoidex/simple-log"; - description = "Simple log for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "simple-log_0_5_1" = callPackage ({ mkDerivation, async, base, containers, deepseq, directory , exceptions, filepath, mtl, SafeSemaphore, text, time , transformers @@ -162068,7 +155835,6 @@ self: { homepage = "http://github.com/mvoidex/simple-log"; description = "Simple log for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-log-syslog" = callPackage @@ -163574,24 +157340,6 @@ self: { }) {}; "smsaero" = callPackage - ({ mkDerivation, aeson, base, containers, http-api-data - , http-client, servant, servant-client, servant-docs, text, time - }: - mkDerivation { - pname = "smsaero"; - version = "0.6.2"; - sha256 = "32f2dcbde9d588e11cebba3149a5e3a9e915cb47e13de8a4466690a171d490ec"; - libraryHaskellDepends = [ - aeson base containers http-api-data http-client servant - servant-client servant-docs text time - ]; - homepage = "https://github.com/GetShopTV/smsaero"; - description = "SMSAero API and HTTP client based on servant library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "smsaero_0_7_1" = callPackage ({ mkDerivation, aeson, base, containers, http-api-data , http-client, servant, servant-client, servant-docs, text, time }: @@ -164011,16 +157759,16 @@ self: { }) {}; "snap-error-collector" = callPackage - ({ mkDerivation, async, base, containers, monad-loops - , MonadCatchIO-transformers, snap, stm, time, transformers + ({ mkDerivation, async, base, containers, lifted-base, monad-loops + , snap, stm, time, transformers }: mkDerivation { pname = "snap-error-collector"; - version = "1.1.1"; - sha256 = "9dadb634f69f0a9549c951c18c24c176db7c1b8024594563c55dfe00e6d21cac"; + version = "1.1.2"; + sha256 = "8c313ebefaa89447d6193d3346d37d46e198279fe4eb7218228da03fb3ba485c"; libraryHaskellDepends = [ - async base containers monad-loops MonadCatchIO-transformers snap - stm time transformers + async base containers lifted-base monad-loops snap stm time + transformers ]; homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; @@ -165086,12 +158834,12 @@ self: { ({ mkDerivation, array, base, binary, bytestring, snappy }: mkDerivation { pname = "snappy-framing"; - version = "0.1.0"; - sha256 = "62c960bbe61da6afb89a7e78dacab87e19e0f627f39c76c211f045a42d99ffd4"; + version = "0.1.1"; + sha256 = "f01b99cfa2e8d2c677e45e1852e0ae0a00034b8318e69d84b1857936c8c24be5"; libraryHaskellDepends = [ array base binary bytestring snappy ]; homepage = "https://github.com/kim/snappy-framing"; description = "Snappy Framing Format in Haskell"; - license = "unknown"; + license = stdenv.lib.licenses.mpl20; }) {}; "snappy-iteratee" = callPackage @@ -165423,19 +159171,6 @@ self: { }) {}; "socket" = callPackage - ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }: - mkDerivation { - pname = "socket"; - version = "0.6.1.0"; - sha256 = "c010f5b5c705483f52a8c1d45f07f57b49e8b61c07187bc3e50d658c72c409e6"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ async base bytestring tasty tasty-hunit ]; - homepage = "https://github.com/lpeterse/haskell-socket"; - description = "An extensible socket library"; - license = stdenv.lib.licenses.mit; - }) {}; - - "socket_0_7_0_0" = callPackage ({ mkDerivation, async, base, bytestring, QuickCheck, tasty , tasty-hunit, tasty-quickcheck }: @@ -165450,7 +159185,6 @@ self: { homepage = "https://github.com/lpeterse/haskell-socket"; description = "An extensible socket library"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-activation" = callPackage @@ -165471,8 +159205,8 @@ self: { }: mkDerivation { pname = "socket-io"; - version = "1.3.6"; - sha256 = "6ec1577c7f701253bc85a9df03379d77ae99c33d1db5ee4f7e6b06972701fb1a"; + version = "1.3.7"; + sha256 = "bbd92d2a6711e950e6bb2da8342a3e103c66638cad2207820c5cb6d8090fef0a"; libraryHaskellDepends = [ aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector @@ -165610,30 +159344,6 @@ self: { }) {}; "solga" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, hashable - , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck - , resourcet, safe-exceptions, scientific, text - , unordered-containers, vector, wai, wai-extra - }: - mkDerivation { - pname = "solga"; - version = "0.1.0.1"; - sha256 = "4949717429b3698d619bca644fedb340b8f0eaac50e3e9b0b55007d9eb1db8ba"; - libraryHaskellDepends = [ - aeson base bytestring containers http-types resourcet - safe-exceptions text wai wai-extra - ]; - testHaskellDepends = [ - aeson base bytestring hashable hspec hspec-wai hspec-wai-json - http-types QuickCheck scientific text unordered-containers vector - wai wai-extra - ]; - homepage = "https://github.com/chpatrick/solga"; - description = "Simple typesafe web routing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "solga_0_1_0_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable , hspec, hspec-wai, hspec-wai-json, http-types, QuickCheck , resourcet, safe-exceptions, scientific, text @@ -165655,7 +159365,6 @@ self: { homepage = "https://github.com/chpatrick/solga"; description = "Simple typesafe web routing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solga-swagger" = callPackage @@ -166032,8 +159741,8 @@ self: { "sparkle" = callPackage ({ mkDerivation, base, binary, bytestring, choice - , distributed-closure, filepath, jni, jvm, process, regex-tdfa - , singletons, streaming, text, vector, zip-archive + , distributed-closure, filepath, jni, jvm, jvm-streaming, process + , regex-tdfa, singletons, streaming, text, vector, zip-archive }: mkDerivation { pname = "sparkle"; @@ -166043,7 +159752,7 @@ self: { isExecutable = true; libraryHaskellDepends = [ base binary bytestring choice distributed-closure jni jvm - singletons streaming text vector + jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ base bytestring filepath process regex-tdfa text zip-archive @@ -166332,23 +160041,6 @@ self: { }) {}; "speedy-slice" = callPackage - ({ mkDerivation, base, containers, lens, mcmc-types - , mwc-probability, pipes, primitive, transformers - }: - mkDerivation { - pname = "speedy-slice"; - version = "0.1.5"; - sha256 = "d072049b142e1df47a2a6b269dc7a9fc754a1ecd62ed5c6a6e8fb4122dd02441"; - libraryHaskellDepends = [ - base lens mcmc-types mwc-probability pipes primitive transformers - ]; - testHaskellDepends = [ base containers mwc-probability ]; - homepage = "http://github.com/jtobin/speedy-slice"; - description = "Speedy slice sampling"; - license = stdenv.lib.licenses.mit; - }) {}; - - "speedy-slice_0_3_0" = callPackage ({ mkDerivation, base, containers, kan-extensions, lens, mcmc-types , mwc-probability, pipes, primitive, transformers }: @@ -166364,7 +160056,6 @@ self: { homepage = "http://github.com/jtobin/speedy-slice"; description = "Speedy slice sampling"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spelling-suggest" = callPackage @@ -166884,8 +160575,8 @@ self: { }: mkDerivation { pname = "sproxy2"; - version = "1.94.0"; - sha256 = "3affef81be078269b7acbfa761d2e1fde761ee7b4e4fe6182a67e7278ae4a2cb"; + version = "1.94.1"; + sha256 = "be00dbeb5a81ecd38034ea549772eb3f3c94c8185a26c2f7de86c17084586e21"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -167495,32 +161186,6 @@ self: { }) {}; "stache" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, file-embed, filepath, hspec - , hspec-megaparsec, megaparsec, mtl, template-haskell, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "stache"; - version = "0.1.8"; - sha256 = "a8617924e087b02c3afb3308a8a1102828e352dba7545648703e5d0c2c3c35b2"; - revision = "2"; - editedCabalFile = "293e587834fd528a8f1869027b1de5f3ea492597350688a86db36c18453757d9"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath megaparsec mtl template-haskell text unordered-containers - vector - ]; - testHaskellDepends = [ - aeson base bytestring containers file-embed hspec hspec-megaparsec - megaparsec text yaml - ]; - homepage = "https://github.com/stackbuilders/stache"; - description = "Mustache templates for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stache_0_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , directory, exceptions, file-embed, filepath, hspec , hspec-megaparsec, megaparsec, mtl, template-haskell, text @@ -167544,7 +161209,6 @@ self: { homepage = "https://github.com/stackbuilders/stache"; description = "Mustache templates for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stack" = callPackage @@ -167814,52 +161478,6 @@ self: { }) {}; "stackage-curator" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal - , classy-prelude-conduit, conduit, conduit-extra, containers - , cryptohash, cryptohash-conduit, data-default-class, directory - , exceptions, filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale - , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stm, store, streaming-commons, syb - , system-fileio, system-filepath, tar, temporary, text, time - , transformers, unix-compat, unordered-containers, utf8-string - , vector, xml-conduit, xml-types, yaml, zlib - }: - mkDerivation { - pname = "stackage-curator"; - version = "0.14.3"; - sha256 = "ce868f0bc6c385d23672421df9a8613c418e50e793a9ffbb16a2e0a4003ba8fa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring blaze-html byteable bytestring Cabal - classy-prelude-conduit conduit conduit-extra containers cryptohash - cryptohash-conduit data-default-class directory exceptions filepath - hashable html-conduit http-client http-client-tls http-conduit - lucid mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stm store - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib - ]; - executableHaskellDepends = [ - aeson base http-client http-client-tls optparse-applicative - optparse-simple system-filepath text - ]; - testHaskellDepends = [ - base Cabal classy-prelude-conduit containers directory hspec - http-client http-client-tls QuickCheck text yaml - ]; - homepage = "https://github.com/fpco/stackage-curator"; - description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "stackage-curator_0_14_5" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal , classy-prelude-conduit, conduit, conduit-extra, containers @@ -169284,46 +162902,6 @@ self: { }) {}; "store" = callPackage - ({ mkDerivation, array, base, base-orphans, base64-bytestring - , bytestring, cereal, cereal-vector, conduit, containers, criterion - , cryptohash, deepseq, directory, fail, filepath, ghc-prim - , hashable, hspec, hspec-smallcheck, integer-gmp, lifted-base - , monad-control, mono-traversable, primitive, resourcet, safe - , semigroups, smallcheck, store-core, syb, template-haskell, text - , th-lift, th-lift-instances, th-orphans, th-reify-many - , th-utilities, time, transformers, unordered-containers, vector - , vector-binary-instances, void, weigh - }: - mkDerivation { - pname = "store"; - version = "0.2.1.2"; - sha256 = "5accb9a9aa79fd5dbc315b398a926722dee424935271c9a6cb90aea84f3e1cad"; - libraryHaskellDepends = [ - array base base-orphans base64-bytestring bytestring conduit - containers cryptohash deepseq directory fail filepath ghc-prim - hashable hspec hspec-smallcheck integer-gmp lifted-base - monad-control mono-traversable primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector void - ]; - testHaskellDepends = [ - array base base-orphans base64-bytestring bytestring cereal - cereal-vector conduit containers criterion cryptohash deepseq - directory fail filepath ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable primitive - resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector vector-binary-instances void weigh - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast binary serialization"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "store_0_3" = callPackage ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bytestring, cereal, cereal-vector, conduit , containers, criterion, cryptohash, deepseq, directory, filepath @@ -169367,22 +162945,6 @@ self: { }) {}; "store-core" = callPackage - ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text - , transformers - }: - mkDerivation { - pname = "store-core"; - version = "0.2.0.2"; - sha256 = "025f6d186f96329d1f0b76e2e2753e78852413896d19917856c096bf22e6420e"; - libraryHaskellDepends = [ - base bytestring fail ghc-prim primitive text transformers - ]; - homepage = "https://github.com/fpco/store#readme"; - description = "Fast and lightweight binary serialization"; - license = stdenv.lib.licenses.mit; - }) {}; - - "store-core_0_3" = callPackage ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text , transformers }: @@ -169396,7 +162958,6 @@ self: { homepage = "https://github.com/fpco/store#readme"; description = "Fast and lightweight binary serialization"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "str" = callPackage @@ -169418,34 +162979,6 @@ self: { }) {}; "stratosphere" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.1.6"; - sha256 = "16f6aefde00cb48105506b8f396f61d32947a36456a29a377da512d40b81aae1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hlint lens tasty - tasty-hspec template-haskell text unordered-containers - ]; - homepage = "https://github.com/frontrowed/stratosphere#readme"; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stratosphere_0_4_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , hashable, hlint, lens, tasty, tasty-hspec, template-haskell, text , unordered-containers @@ -169465,7 +162998,6 @@ self: { homepage = "https://github.com/frontrowed/stratosphere#readme"; description = "EDSL for AWS CloudFormation"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stratum-tool" = callPackage @@ -169986,6 +163518,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "strict-writer" = callPackage + ({ mkDerivation, base, doctest, mtl }: + mkDerivation { + pname = "strict-writer"; + version = "0.4.0.0"; + sha256 = "bae1b58384f96a61eb491dc432d5fe6551fe2d5cfb0f0c3c736a819a12844caa"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/oisdk/strict-writer"; + description = "A stricter writer, which uses StateT in order to avoid space leaks"; + license = stdenv.lib.licenses.mit; + }) {}; + "strictify" = callPackage ({ mkDerivation, base, directory, filepath, process, unix }: mkDerivation { @@ -170304,8 +163849,8 @@ self: { }: mkDerivation { pname = "stripe-core"; - version = "2.1.0"; - sha256 = "74d48a1db4244258b1850e2e657cb53fabe1d280638530a1f730e46538973ce5"; + version = "2.2.0"; + sha256 = "ca694e710f1670ea844e8f65ab483b9acb24e27dc26de1f8500b11d8f13af559"; libraryHaskellDepends = [ aeson base bytestring mtl text time transformers unordered-containers @@ -170319,8 +163864,8 @@ self: { ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { pname = "stripe-haskell"; - version = "2.1.0"; - sha256 = "83f88fe7c264ee30b7da8e0630f0efeee722677d745705cc2059ea9ba3d82775"; + version = "2.2.0"; + sha256 = "f69fe32fd135a802587339d5043411f030cb2e2627df739193252f3015e971a0"; libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; @@ -170334,8 +163879,8 @@ self: { }: mkDerivation { pname = "stripe-http-streams"; - version = "2.1.0"; - sha256 = "053e696d1f2d671594bd0ffe70e473f54fb551bee0bdf040222e7a995174301e"; + version = "2.2.0"; + sha256 = "83b86304a51975625196dfac2db567e82e93ae437ef4fdd26204061c360ac07a"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-streams io-streams stripe-core text @@ -170347,7 +163892,25 @@ self: { description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {stripe-tests = null;}; + }) {}; + + "stripe-tests" = callPackage + ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core + , mtl, random, stripe-core, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "stripe-tests"; + version = "2.2.0"; + sha256 = "7a7c5771408807509ed5708ed7e9e6f7d10d8e6d39ecaf7a1fce0b61b73b4913"; + libraryHaskellDepends = [ + aeson base bytestring free hspec hspec-core mtl random stripe-core + text time transformers unordered-containers + ]; + homepage = "https://github.com/dmjio/stripe-haskell"; + description = "Tests for Stripe API bindings for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; "strips" = callPackage ({ mkDerivation, base, containers, hspec, mtl }: @@ -170574,35 +164137,6 @@ self: { }) {}; "stylish-haskell" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative - , strict, syb, test-framework, test-framework-hunit, yaml - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.6.1.0"; - sha256 = "eef85fe3940779e092c3a3ffa26c17ae6c96625a5fa606f0c816a37fce357b0d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl syb yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl optparse-applicative strict syb yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts HUnit mtl syb test-framework test-framework-hunit - yaml - ]; - homepage = "https://github.com/jaspervdj/stylish-haskell"; - description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "stylish-haskell_0_7_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative , strict, syb, test-framework, test-framework-hunit, yaml @@ -170629,7 +164163,6 @@ self: { homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stylized" = callPackage @@ -171190,23 +164723,6 @@ self: { }) {}; "svg-tree" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, containers - , JuicyPixels, lens, linear, mtl, scientific, text, transformers - , vector, xml - }: - mkDerivation { - pname = "svg-tree"; - version = "0.5.1.2"; - sha256 = "0c285cf21203555c7d7179e6c3924c0ba1b5e03ed42dacf596ff891317893da0"; - libraryHaskellDepends = [ - attoparsec base bytestring containers JuicyPixels lens linear mtl - scientific text transformers vector xml - ]; - description = "SVG file loader and serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "svg-tree_0_6" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , JuicyPixels, lens, linear, mtl, scientific, text, transformers , vector, xml @@ -171221,7 +164737,6 @@ self: { ]; description = "SVG file loader and serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svg2q" = callPackage @@ -171338,23 +164853,6 @@ self: { }) {}; "swagger" = callPackage - ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text - , time, transformers - }: - mkDerivation { - pname = "swagger"; - version = "0.2.2"; - sha256 = "19ffcf443fd03a87258fb4b3225166315d0fd835a7539ea70d7992619329ecc2"; - libraryHaskellDepends = [ - aeson base bytestring text time transformers - ]; - testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; - description = "Implementation of swagger data model"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "swagger_0_3_0" = callPackage ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text , time, transformers }: @@ -173654,6 +167152,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tasty-auto_0_1_0_2" = callPackage + ({ mkDerivation, base, directory, filepath, tasty, tasty-hspec + , tasty-hunit, tasty-quickcheck, tasty-smallcheck + }: + mkDerivation { + pname = "tasty-auto"; + version = "0.1.0.2"; + sha256 = "d76076b780cce1a83b50b4602928d3756a5df72f4294e50b5f1499c5f6381a1c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ + base directory filepath tasty tasty-hspec tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/minad/tasty-auto#readme"; + description = "Auto discovery for Tasty with support for ingredients and test tree generation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { @@ -173984,6 +167504,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-stats" = callPackage + ({ mkDerivation, base, containers, directory, process, stm, tagged + , tasty, time + }: + mkDerivation { + pname = "tasty-stats"; + version = "0.2.0.0"; + sha256 = "73a1e34f30eeddf2e855c1c8813338ae4aa23f29ea74f4c0272f0e6de5007e9d"; + libraryHaskellDepends = [ + base containers directory process stm tagged tasty time + ]; + homepage = "https://github.com/minad/tasty-stats#readme"; + description = "Collect statistics of your Tasty testsuite in a CSV file"; + license = stdenv.lib.licenses.mit; + }) {}; + "tasty-tap" = callPackage ({ mkDerivation, base, containers, directory, stm, tasty , tasty-golden, tasty-hunit @@ -174135,30 +167671,6 @@ self: { }) {}; "tcp-streams" = callPackage - ({ mkDerivation, base, bytestring, data-default-class, HsOpenSSL - , HsOpenSSL-x509-system, HUnit, io-streams, network, openssl, pem - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, tls, x509, x509-store, x509-system - }: - mkDerivation { - pname = "tcp-streams"; - version = "0.4.0.0"; - sha256 = "e6ada5a4c34cb8653bd03c5db43229f8f954bc0eda60e8169b4fd1c4156a0824"; - libraryHaskellDepends = [ - base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system - io-streams network pem tls x509 x509-store x509-system - ]; - librarySystemDepends = [ openssl ]; - testHaskellDepends = [ - base bytestring HUnit io-streams network QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - description = "One stop solution for tcp client and server with tls support"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) openssl;}; - - "tcp-streams_0_6_0_0" = callPackage ({ mkDerivation, base, bytestring, data-default-class, directory , HUnit, io-streams, network, pem, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, tls, x509 @@ -174785,26 +168297,6 @@ self: { }) {}; "terminal-progress-bar" = callPackage - ({ mkDerivation, base, base-unicode-symbols, HUnit, stm, stm-chans - , test-framework, test-framework-hunit - }: - mkDerivation { - pname = "terminal-progress-bar"; - version = "0.0.1.4"; - sha256 = "a36b3a305c58def80aa01fc2df46f4c15ea411a4531dd1723784e839448cbb51"; - libraryHaskellDepends = [ - base base-unicode-symbols stm stm-chans - ]; - testHaskellDepends = [ - base base-unicode-symbols HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/roelvandijk/terminal-progress-bar"; - description = "A simple progress bar in the terminal"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "terminal-progress-bar_0_1_1" = callPackage ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework , test-framework-hunit }: @@ -174947,24 +168439,6 @@ self: { }) {}; "test-fixture" = callPackage - ({ mkDerivation, base, data-default, hspec, hspec-discover, mtl - , template-haskell, th-to-exp, transformers - }: - mkDerivation { - pname = "test-fixture"; - version = "0.4.2.0"; - sha256 = "4c07ffa83b70dd44cd5b4824629fa021e9971360e29ed05baa8708eb7954981a"; - libraryHaskellDepends = [ base data-default mtl template-haskell ]; - testHaskellDepends = [ - base hspec hspec-discover mtl template-haskell th-to-exp - transformers - ]; - homepage = "http://github.com/cjdev/test-fixture#readme"; - description = "Test monadic side-effects"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "test-fixture_0_5_0_0" = callPackage ({ mkDerivation, base, data-default, haskell-src-exts , haskell-src-meta, hspec, hspec-discover, mtl, template-haskell , th-orphans, th-to-exp, transformers @@ -174984,7 +168458,6 @@ self: { homepage = "http://github.com/cjdev/test-fixture#readme"; description = "Test monadic side-effects"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework" = callPackage @@ -175503,27 +168976,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.8.6.7"; - sha256 = "9e5fd9571a7257bdc8cfa6e0da077b16e867011a9f813065d68dd046bd358c88"; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - }) {}; - - "texmath_0_9_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text , utf8-string, xml @@ -175542,7 +168994,6 @@ self: { homepage = "http://github.com/jgm/texmath"; description = "Conversion between formats used to represent mathematics"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -175927,19 +169378,6 @@ self: { }) {}; "text-metrics" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, text }: - mkDerivation { - pname = "text-metrics"; - version = "0.1.0"; - sha256 = "b7af083250d9debefa2ef85b53aeab2e90b4939705f5f14df8af5b173d679b4f"; - libraryHaskellDepends = [ base text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; - homepage = "https://github.com/mrkkrp/text-metrics"; - description = "Calculate various string metrics efficiently"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "text-metrics_0_2_0" = callPackage ({ mkDerivation, base, hspec, QuickCheck, text }: mkDerivation { pname = "text-metrics"; @@ -175950,7 +169388,6 @@ self: { 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 @@ -176086,37 +169523,6 @@ self: { }) {}; "text-show" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors - , bytestring, bytestring-builder, containers, contravariant - , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec - , integer-gmp, nats, QuickCheck, quickcheck-instances, semigroups - , tagged, template-haskell, text, th-lift, transformers - , transformers-compat, void - }: - mkDerivation { - pname = "text-show"; - version = "3.4"; - sha256 = "ce8a7adcca87617766a4c988808ff41fee20a2c84ac5442d6f3d8c5cec55d7c7"; - libraryHaskellDepends = [ - array base base-compat bifunctors bytestring bytestring-builder - containers contravariant generic-deriving ghc-boot-th ghc-prim - integer-gmp nats semigroups tagged template-haskell text th-lift - transformers transformers-compat void - ]; - testHaskellDepends = [ - array base base-compat base-orphans bifunctors bytestring - bytestring-builder containers contravariant deriving-compat - generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats - QuickCheck quickcheck-instances semigroups tagged template-haskell - text th-lift transformers transformers-compat void - ]; - homepage = "https://github.com/RyanGlScott/text-show"; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-show_3_4_1_1" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, bytestring-builder, containers, contravariant , deriving-compat, generic-deriving, ghc-boot-th, ghc-prim, hspec @@ -176148,40 +169554,6 @@ self: { }) {}; "text-show-instances" = callPackage - ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring - , containers, directory, generic-deriving, ghc-boot, ghc-prim - , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty - , QuickCheck, quickcheck-instances, random, semigroups, tagged - , template-haskell, terminfo, text, text-show, th-orphans, time - , transformers, transformers-compat, unix, unordered-containers - , vector, xhtml - }: - mkDerivation { - pname = "text-show-instances"; - version = "3.4"; - sha256 = "bf2e9e4a8ed01481024cce33a611daf52d733527e2ceb2ef2a576cf79ace6322"; - libraryHaskellDepends = [ - base base-compat bifunctors binary bytestring containers directory - ghc-boot haskeline hoopl hpc old-locale old-time pretty random - semigroups tagged template-haskell terminfo text text-show time - transformers transformers-compat unix unordered-containers vector - xhtml - ]; - testHaskellDepends = [ - base base-compat bifunctors binary bytestring containers directory - generic-deriving ghc-boot ghc-prim haskeline hoopl hpc hspec - old-locale old-time pretty QuickCheck quickcheck-instances random - semigroups tagged template-haskell terminfo text text-show - th-orphans time transformers transformers-compat unix - unordered-containers vector xhtml - ]; - homepage = "https://github.com/RyanGlScott/text-show-instances"; - description = "Additional instances for text-show"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "text-show-instances_3_5" = callPackage ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring , containers, directory, generic-deriving, ghc-boot-th, ghc-prim , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty @@ -177492,8 +170864,8 @@ self: { }: mkDerivation { pname = "tibetan-utils"; - version = "0.1.0.4"; - sha256 = "64fe33564b370cb906fa877d5f130c25618800351c12bc6fb6fed77edd3af1ae"; + version = "0.1.1.0"; + sha256 = "008b976ca9b9bbd5ebe620e64bddccde31e0eed95ddcda20378cac96d3ca8115"; libraryHaskellDepends = [ base composition either megaparsec text text-show ]; @@ -177697,8 +171069,8 @@ self: { }: mkDerivation { pname = "tighttp"; - version = "0.0.0.9"; - sha256 = "8b73c5ae1f631621b3e67f9665e5b1dc886c60b16f608f3f929653c21dae1b96"; + version = "0.0.0.10"; + sha256 = "bf75164be06ef3de8c3b8bd8b915864b940ac8511ff0860fd5868553ed390160"; libraryHaskellDepends = [ base bytestring handle-like monads-tf old-locale papillon simple-pipe time @@ -179650,12 +173022,15 @@ self: { }) {}; "transformers-eff" = callPackage - ({ mkDerivation, base, free, mmorph, pipes, transformers }: + ({ mkDerivation, base, free, list-transformer, mmorph, transformers + }: mkDerivation { pname = "transformers-eff"; - version = "0.1.0.0"; - sha256 = "577f7ce07459239b1039d9f8c2935c02cc55bc585a5a4d21f5a81ac758f20037"; - libraryHaskellDepends = [ base free mmorph pipes transformers ]; + version = "0.2.0.0"; + sha256 = "16be6a4fcb355a9295b62853106c947ae690221eee140f779faee905d77e48d9"; + libraryHaskellDepends = [ + base free list-transformer mmorph transformers + ]; homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; @@ -179898,17 +173273,6 @@ self: { }) {}; "tree-view" = callPackage - ({ mkDerivation, base, containers, mtl }: - mkDerivation { - pname = "tree-view"; - version = "0.4"; - sha256 = "f64de6b9461d125fa4755fc98b6921a7a53cb4f096f88692fe86dd68cde5fe57"; - libraryHaskellDepends = [ base containers mtl ]; - description = "Render trees as foldable HTML and Unicode art"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "tree-view_0_5" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { pname = "tree-view"; @@ -179919,7 +173283,6 @@ self: { libraryHaskellDepends = [ base containers mtl ]; description = "Render trees as foldable HTML and Unicode art"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "treemap" = callPackage @@ -180411,30 +173774,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.6.1.2"; - sha256 = "8f5f05c91ea4f50e43924618090f7806e0649dc83edd8c1af0e05d9032098384"; - 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_1" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec @@ -180456,7 +173795,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 @@ -180711,26 +174049,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, async, base, clock, directory, doctest, foldl - , hostname, managed, optional-args, optparse-applicative, process - , stm, system-fileio, system-filepath, temporary, text, time - , transformers, unix - }: - mkDerivation { - pname = "turtle"; - version = "1.2.8"; - sha256 = "798e4047773877323eb35e610e709db70880d2913ff652ff676a97902a6fbb01"; - libraryHaskellDepends = [ - async base clock directory foldl hostname managed optional-args - optparse-applicative process stm system-fileio system-filepath - temporary text time transformers unix - ]; - testHaskellDepends = [ base doctest ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_3_1" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , directory, doctest, foldl, hostname, managed, optional-args , optparse-applicative, process, stm, system-fileio @@ -180750,7 +174068,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -181828,19 +175145,6 @@ self: { }) {}; "type-spec" = callPackage - ({ mkDerivation, base, pretty, show-type }: - mkDerivation { - pname = "type-spec"; - version = "0.2.0.0"; - sha256 = "8203f98c53d9d533da9e20e6e3c74ed5d144fad2ee21f58d8b3addd78cd172fa"; - libraryHaskellDepends = [ base pretty show-type ]; - testHaskellDepends = [ base ]; - homepage = "https://github.com/sheyll/type-spec#readme"; - description = "Type Level Specification by Example"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "type-spec_0_3_0_1" = callPackage ({ mkDerivation, base, pretty }: mkDerivation { pname = "type-spec"; @@ -181851,7 +175155,6 @@ self: { homepage = "https://github.com/sheyll/type-spec#readme"; description = "Type Level Specification by Example"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-spine" = callPackage @@ -182818,21 +176121,6 @@ self: { }) {}; "unfoldable" = callPackage - ({ mkDerivation, base, ghc-prim, QuickCheck, random, transformers - }: - mkDerivation { - pname = "unfoldable"; - version = "0.8.4"; - sha256 = "af86e863625d4ae45820d1942a49de00559e4d4ee25db20610859d0a19cc1683"; - libraryHaskellDepends = [ - base ghc-prim QuickCheck random transformers - ]; - homepage = "https://github.com/sjoerdvisscher/unfoldable"; - description = "Class of data structures that can be unfolded"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unfoldable_0_9_2" = callPackage ({ mkDerivation, base, containers, ghc-prim, one-liner, QuickCheck , random, transformers }: @@ -182846,7 +176134,6 @@ self: { homepage = "https://github.com/sjoerdvisscher/unfoldable"; description = "Class of data structures that can be unfolded"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unfoldable-restricted" = callPackage @@ -183080,19 +176367,6 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bytestring, split, text }: - mkDerivation { - pname = "unicode-transforms"; - version = "0.1.0.1"; - sha256 = "5fe607ec91e1cf25db1842e7409d4ed0e1bb6829409e846e010db25b2c75cb0b"; - libraryHaskellDepends = [ base bytestring text ]; - testHaskellDepends = [ base split text ]; - homepage = "http://github.com/harendra-kumar/unicode-transforms"; - description = "Unicode transforms (normalization NFC/NFD/NFKC/NFKD)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode-transforms_0_2_1" = callPackage ({ mkDerivation, base, bitarray, bytestring, deepseq , getopt-generics, QuickCheck, split, text }: @@ -183107,7 +176381,6 @@ self: { homepage = "http://github.com/harendra-kumar/unicode-transforms"; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicoder" = callPackage @@ -183251,6 +176524,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uniq-deep" = callPackage + ({ mkDerivation, base, bytestring, containers }: + mkDerivation { + pname = "uniq-deep"; + version = "1.1.0.0"; + sha256 = "f8953f91cbf90c5073ca90d4e9235dbe0a399ff811709d051b037a8a7db0d38e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base bytestring containers ]; + homepage = "https://github.com/ncaq/uniq-deep"; + description = "uniq-deep"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "unique" = callPackage ({ mkDerivation, base, ghc-prim, hashable }: mkDerivation { @@ -183423,6 +176710,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "unitym" = callPackage + ({ mkDerivation, base, text, transformers }: + mkDerivation { + pname = "unitym"; + version = "0.1.0.2"; + sha256 = "5a22f2e26ba053af73d9c92d37fa41bae147f59ac49a4c412fb725e5c5d93b9b"; + libraryHaskellDepends = [ base text transformers ]; + homepage = "https://github.com/bhurt/unitym#readme"; + description = "A monad type class shared between web services"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "unitym-servant" = callPackage + ({ mkDerivation, base, mtl, servant-server, text, transformers + , unitym + }: + mkDerivation { + pname = "unitym-servant"; + version = "0.1.0.0"; + sha256 = "3394f5c1568116c3ad3283cece89e2c2ece74b93c3a644e4b2ba481ceeb0acf0"; + libraryHaskellDepends = [ + base mtl servant-server text transformers unitym + ]; + homepage = "https://github.com/bhurt/unitym#readme"; + description = "Implementaation of unitym for Servant servers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "unitym-yesod" = callPackage + ({ mkDerivation, base, unitym, yesod }: + mkDerivation { + pname = "unitym-yesod"; + version = "0.1.0.2"; + sha256 = "dc0fef13cc5142c8bf9df62916f3284ab34dcc1dcca56efc9f05fbc1398ee0e1"; + libraryHaskellDepends = [ base unitym yesod ]; + homepage = "https://github.com/bhurt/unitym#readme"; + description = "Implementation of the unity monad for the Yesod framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "universal-binary" = callPackage ({ mkDerivation, base, binary, bytestring }: mkDerivation { @@ -184068,6 +177395,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "update-repos" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , monad-parallel, process, QuickCheck, split, text + }: + mkDerivation { + pname = "update-repos"; + version = "0.0.1"; + sha256 = "5bdba9fecbeb9aee916fdb38a6c8586d9a389544700c50515e243ad51a7ab47b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring directory filepath monad-parallel process split + text + ]; + executableHaskellDepends = [ + base directory filepath monad-parallel split + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/pedrovgs/update-repos"; + description = "Update all your git repositories with just one command"; + license = stdenv.lib.licenses.asl20; + }) {}; + "uploadcare" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cryptohash , hex, http-conduit, http-types, old-locale, time @@ -185445,22 +178795,6 @@ self: { }) {}; "varying" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: - mkDerivation { - pname = "varying"; - version = "0.5.0.3"; - sha256 = "a1eff74bb76c4a6b6af64f4490621f3c8a24deec7d44032dfb90e02fc2c73039"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base transformers ]; - executableHaskellDepends = [ base time transformers ]; - testHaskellDepends = [ base hspec QuickCheck time transformers ]; - homepage = "https://github.com/schell/varying"; - description = "FRP through value streams and monadic splines"; - license = stdenv.lib.licenses.mit; - }) {}; - - "varying_0_7_0_3" = callPackage ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: mkDerivation { pname = "varying"; @@ -185474,7 +178808,6 @@ self: { homepage = "https://github.com/schell/varying"; description = "FRP through value streams and monadic splines"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault" = callPackage @@ -185990,22 +179323,6 @@ self: { }) {}; "vector-instances" = callPackage - ({ mkDerivation, base, comonad, keys, pointed, semigroupoids - , semigroups, vector - }: - mkDerivation { - pname = "vector-instances"; - version = "3.3.1"; - sha256 = "68c7f154fe4ad53e29433e150c8718b0e74b4cf4c45a79af89940fff83868c59"; - libraryHaskellDepends = [ - base comonad keys pointed semigroupoids semigroups vector - ]; - homepage = "http://github.com/ekmett/vector-instances"; - description = "Orphan Instances for 'Data.Vector'"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-instances_3_4" = callPackage ({ mkDerivation, base, comonad, hashable, keys, pointed , semigroupoids, semigroups, vector }: @@ -186019,7 +179336,6 @@ self: { homepage = "http://github.com/ekmett/vector-instances"; description = "Orphan Instances for 'Data.Vector'"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-instances-collections" = callPackage @@ -186912,42 +180228,6 @@ self: { }) {inherit (pkgs.gnome2) vte;}; "vty" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , data-default, deepseq, directory, filepath, hashable, HUnit - , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec - , QuickCheck, quickcheck-assertions, random, smallcheck, stm - , string-qq, terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.11.3"; - sha256 = "0ee3fc39e8e5219b551bfc26ee38e9342e38b028480dacc2e6ac87fab5380232"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers data-default deepseq - directory filepath hashable microlens microlens-mtl microlens-th - mtl parallel parsec stm terminfo text transformers unix utf8-string - vector - ]; - executableHaskellDepends = [ - base containers data-default microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers data-default deepseq - HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions - random smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vty_5_15" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers , deepseq, directory, filepath, hashable, HUnit, microlens , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck @@ -186980,7 +180260,6 @@ self: { homepage = "https://github.com/jtdaugherty/vty"; description = "A simple terminal UI library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vty-examples" = callPackage @@ -187818,36 +181097,6 @@ self: { }) {}; "wai-middleware-content-type" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, exceptions, hashable, hspec, hspec-wai, http-media - , http-types, lucid, mmorph, monad-control, monad-logger, mtl - , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec - , text, transformers, transformers-base, unordered-containers - , urlpath, wai, wai-transformers, warp - }: - mkDerivation { - pname = "wai-middleware-content-type"; - version = "0.4.1"; - sha256 = "99dcd8ae5da77650d31a1cd91d43d93c1a18687cd8947a3ea32cb1424229743e"; - libraryHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable http-media http-types lucid mmorph monad-control - monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base unordered-containers urlpath wai wai-transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable hspec hspec-wai http-media http-types lucid mmorph - monad-control monad-logger mtl pandoc pandoc-types resourcet - shakespeare tasty tasty-hspec text transformers transformers-base - unordered-containers urlpath wai wai-transformers warp - ]; - description = "Route to different middlewares based on the incoming Accept header"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "wai-middleware-content-type_0_5_0_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring , clay, exceptions, hashable, hspec, hspec-wai, http-media , http-types, lucid, mmorph, monad-control, monad-logger, mtl @@ -188834,6 +182083,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wavefront_0_7_0_3" = callPackage + ({ mkDerivation, attoparsec, base, dlist, filepath, mtl, text + , transformers, vector + }: + mkDerivation { + pname = "wavefront"; + version = "0.7.0.3"; + sha256 = "7e6ee21fa04410c4c01f0b86fa0acdc3d4d64d3167614e2cb58ce7528bbd0d65"; + libraryHaskellDepends = [ + attoparsec base dlist filepath mtl text transformers vector + ]; + homepage = "https://github.com/phaazon/wavefront"; + description = "Wavefront OBJ loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wavefront-obj" = callPackage ({ mkDerivation, attoparsec, base, containers, hspec, linear, text , transformers @@ -189653,32 +182919,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers, entropy - , HUnit, network, QuickCheck, random, SHA, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.9.8.2"; - sha256 = "09ec17dfbf9f07da27575ce7853b0c80d87ad959c2b271f27be4c4e54615eca2"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA test-framework test-framework-hunit test-framework-quickcheck2 - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_10_0_0" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy , HUnit, network, QuickCheck, random, SHA, test-framework @@ -189702,7 +182942,6 @@ self: { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-snap" = callPackage @@ -189792,6 +183031,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weighted" = callPackage + ({ mkDerivation, base, mtl, semiring-num, transformers }: + mkDerivation { + pname = "weighted"; + version = "0.3.0.0"; + sha256 = "6d30cf0d4a833f82ed2e44e22c81658e55744f53308a25a895eaf7bc940131cb"; + libraryHaskellDepends = [ base mtl semiring-num transformers ]; + homepage = "https://github.com/oisdk/weighted"; + description = "Writer monad which uses semiring constraint"; + license = stdenv.lib.licenses.mit; + }) {}; + "weighted-regexp" = callPackage ({ mkDerivation, array, base, happy }: mkDerivation { @@ -190033,12 +183284,14 @@ self: { }) {}; "wide-word" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, hspec, QuickCheck }: + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec + , QuickCheck + }: mkDerivation { pname = "wide-word"; - version = "0.1.0.1"; - sha256 = "d822ae64cf7edae19d7893d6b57e1d3fe6acf28a5c077e00b47bb865058df4cb"; - libraryHaskellDepends = [ base ghc-prim ]; + version = "0.1.0.2"; + sha256 = "c5fa2df76b8391b34f5671c6280bedecd56ee6600db260bd4942bc91cacb41fb"; + libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ]; homepage = "https://github.com/erikd/wide-word"; description = "Data types for large but fixed width signed and unsigned integers"; @@ -190060,23 +183313,6 @@ self: { }) {}; "wikicfp-scraper" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec - , scalpel, text, time - }: - mkDerivation { - pname = "wikicfp-scraper"; - version = "0.1.0.7"; - sha256 = "1e76ab2361c54b4f68dbe9c099f1e36144b405927abd69e6ee09c2292f65c582"; - libraryHaskellDepends = [ - attoparsec base bytestring scalpel text time - ]; - testHaskellDepends = [ base bytestring filepath hspec time ]; - homepage = "https://github.com/debug-ito/wikicfp-scraper"; - description = "Scrape WikiCFP web site"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "wikicfp-scraper_0_1_0_8" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec , scalpel-core, text, time }: @@ -190091,7 +183327,6 @@ self: { homepage = "https://github.com/debug-ito/wikicfp-scraper"; description = "Scrape WikiCFP web site"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wikipedia4epub" = callPackage @@ -190171,8 +183406,8 @@ self: { }: mkDerivation { pname = "wild-bind-x11"; - version = "0.1.0.5"; - sha256 = "655f263a134e26a45b1001f7ea861743dbdbd30e69ea4808050c5d3178d557e1"; + version = "0.1.0.6"; + sha256 = "1e144b2833acee00da55cab3b28b57bc5347186f761cb1d7375532cfca38e4b4"; libraryHaskellDepends = [ base containers fold-debounce stm text transformers wild-bind X11 ]; @@ -192170,34 +185405,6 @@ self: { }) {}; "xlsx" = callPackage - ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, Diff, errors, extra, filepath - , groom, lens, mtl, mtl-compat, network-uri, old-locale - , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit - , tasty-smallcheck, text, time, transformers, vector, xml-conduit - , zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; - version = "0.2.4"; - sha256 = "e0b424417fb04d885b78eccde94d10bd28be59184b0bbbedf321fc15a2f23d40"; - libraryHaskellDepends = [ - base base64-bytestring binary-search bytestring conduit containers - data-default errors extra filepath lens mtl mtl-compat network-uri - old-locale safe text time transformers vector xml-conduit - zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck time vector - xml-conduit - ]; - homepage = "https://github.com/qrilka/xlsx"; - description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; - }) {}; - - "xlsx_0_4_2" = callPackage ({ mkDerivation, base, base64-bytestring, binary-search, bytestring , conduit, containers, data-default, Diff, errors, extra, filepath , groom, lens, mtl, mtl-compat, network-uri, old-locale @@ -192223,27 +185430,9 @@ self: { homepage = "https://github.com/qrilka/xlsx"; description = "Simple and incomplete Excel file parser/writer"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsx-tabular" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, data-default - , lens, text, xlsx - }: - mkDerivation { - pname = "xlsx-tabular"; - version = "0.1.0.1"; - sha256 = "29efb942a99bd0afe4ffda1856a51354b9ffa44253574b307f51bb2f05cf539a"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default lens text xlsx - ]; - testHaskellDepends = [ base ]; - homepage = "http://github.com/kkazuo/xlsx-tabular#readme"; - description = "Xlsx table decode utility"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "xlsx-tabular_0_2_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx }: @@ -192258,7 +185447,6 @@ self: { homepage = "https://github.com/kkazuo/xlsx-tabular"; description = "Xlsx table cell value extraction utility"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xlsx-templater" = callPackage @@ -192328,30 +185516,6 @@ self: { }) {}; "xml-conduit" = 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.3.5"; - sha256 = "25635a066b6a17a0d6c038ddf974a48b6d455d8fa14989f99341703da344dc83"; - 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; - }) {}; - - "xml-conduit_1_4_0_3" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, conduit, conduit-extra, containers , data-default, deepseq, hspec, HUnit, monad-control, resourcet @@ -192373,7 +185537,6 @@ self: { 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 @@ -192542,6 +185705,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "xml-html-qq" = callPackage + ({ mkDerivation, base, blaze-markup, conduit, data-default, doctest + , from-sum, Glob, heterocephalus, html-conduit, resourcet, tasty + , tasty-hunit, template-haskell, text, th-lift, th-lift-instances + , xml-conduit + }: + mkDerivation { + pname = "xml-html-qq"; + version = "0.1.0.1"; + sha256 = "1a2ebb1f4ca58a4f442c470db6d3271e6b1069d41860f8683b5da9082329235a"; + libraryHaskellDepends = [ + base blaze-markup conduit data-default from-sum heterocephalus + html-conduit resourcet template-haskell text th-lift + th-lift-instances xml-conduit + ]; + testHaskellDepends = [ + base doctest Glob tasty tasty-hunit text xml-conduit + ]; + homepage = "https://github.com/cdepillabout/xml-html-qq"; + description = "Quasi-quoters for XML and HTML Documents"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "xml-isogen" = callPackage ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck , semigroups, template-haskell, text, xml-conduit-writer @@ -193008,8 +186194,8 @@ self: { }: mkDerivation { pname = "xmonad"; - version = "0.12"; - sha256 = "e8f649dbd4a8d5f75fdac9ceb5ee38b64fd351910ade81c188f5dd7bc21dfdd7"; + version = "0.13"; + sha256 = "f9f81b63569f18c777a939741024ec3ae34e4ec84015e5cc50f6622034a303ca"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193051,19 +186237,17 @@ self: { }) {}; "xmonad-contrib" = callPackage - ({ mkDerivation, base, containers, directory, extensible-exceptions - , filepath, mtl, old-locale, old-time, process, random, unix - , utf8-string, X11, X11-xft, xmonad + ({ mkDerivation, base, bytestring, containers, directory + , extensible-exceptions, filepath, mtl, old-locale, old-time + , process, random, unix, utf8-string, X11, X11-xft, xmonad }: mkDerivation { pname = "xmonad-contrib"; - version = "0.12"; - sha256 = "131d31c471ac02ece9c7e920497b4839a45df786a2096f56adb1f2de1221f311"; - revision = "2"; - editedCabalFile = "8a17b7fe46dc9d7435538a0db3997bcb2a125e71923ecd401024d84081a41807"; + version = "0.13"; + sha256 = "a760827fe5b1f99d783f52ccbb72b272d02d53daa26757363cde3ceba014476e"; libraryHaskellDepends = [ - base containers directory extensible-exceptions filepath mtl - old-locale old-time process random unix utf8-string X11 X11-xft + base bytestring containers directory extensible-exceptions filepath + mtl old-locale old-time process random unix utf8-string X11 X11-xft xmonad ]; homepage = "http://xmonad.org/"; @@ -193601,25 +186785,6 @@ self: { }) {}; "yahoo-finance-api" = callPackage - ({ mkDerivation, aeson, base, doctest, Glob, http-api-data - , http-client, lens, lens-aeson, mtl, servant, servant-client, text - , time, transformers - }: - mkDerivation { - pname = "yahoo-finance-api"; - version = "0.1.0.0"; - sha256 = "d7e8f52d8549fc2084698a520dcb17681e1917c2ca5ca63d3bda67522fdc5182"; - libraryHaskellDepends = [ - aeson base http-api-data http-client lens lens-aeson mtl servant - servant-client text time transformers - ]; - testHaskellDepends = [ base doctest Glob ]; - homepage = "https://github.com/cdepillabout/yahoo-finance-api"; - description = "Read quotes from Yahoo Finance API"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yahoo-finance-api_0_2_0_1" = callPackage ({ mkDerivation, aeson, base, doctest, either, Glob, hspec , http-api-data, http-client, http-client-tls, mtl, safe, servant , servant-client, text, time, transformers, vector @@ -193639,7 +186804,6 @@ self: { homepage = "https://github.com/cdepillabout/yahoo-finance-api"; description = "Read quotes from Yahoo Finance API"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-finance-conduit" = callPackage @@ -194409,32 +187573,6 @@ self: { }) {}; "yesod-auth-hashdb" = callPackage - ({ mkDerivation, base, basic-prelude, bytestring, containers - , cryptohash, hspec, http-conduit, http-types, monad-logger - , network-uri, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-hashdb"; - version = "1.5.1.3"; - sha256 = "ea455c6cb2c60de6254860ed1b8d29f8e73154c24db3e2edbfc0090f728b051a"; - libraryHaskellDepends = [ - base bytestring cryptohash persistent pwstore-fast text yesod-auth - yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base basic-prelude bytestring containers hspec http-conduit - http-types monad-logger network-uri persistent-sqlite resourcet - text wai-extra yesod yesod-auth yesod-core yesod-test - ]; - homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; - description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "yesod-auth-hashdb_1_6_0_1" = callPackage ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers , hspec, http-conduit, http-types, monad-logger, network-uri , persistent, persistent-sqlite, pwstore-fast, resourcet, text @@ -194693,12 +187831,16 @@ self: { }) {}; "yesod-colonnade" = callPackage - ({ mkDerivation, base, colonnade, text, yesod-core }: + ({ mkDerivation, base, blaze-html, blaze-markup, colonnade, text + , yesod-core + }: mkDerivation { pname = "yesod-colonnade"; - version = "0.2"; - sha256 = "92a36ab103779aa8a541910456899fae8e8df6f4da27524200b54134c4b26a21"; - libraryHaskellDepends = [ base colonnade text yesod-core ]; + version = "0.4"; + sha256 = "3cdb1f10dee36cdf4adebc5799fb108e4112065659051aed025ef4359b3509d7"; + libraryHaskellDepends = [ + base blaze-html blaze-markup colonnade text yesod-core + ]; homepage = "https://github.com/andrewthad/colonnade#readme"; description = "Helper functions for using yesod with colonnade"; license = stdenv.lib.licenses.bsd3; @@ -196055,42 +189197,6 @@ self: { }) {}; "yi" = callPackage - ({ mkDerivation, array, base, binary, bytestring, Cabal, containers - , data-default, directory, dlist, dynamic-state, dyre, exceptions - , filepath, glib, gtk, hashable, Hclip, hint, HUnit, lens, mtl - , old-locale, oo-prototypes, pango, parsec, pointedlist, process - , QuickCheck, random, safe, semigroups, split, stm, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, text-icu - , time, transformers-base, unix, unix-compat, unordered-containers - , vty, word-trie, xdg-basedir, yi-language, yi-rope - }: - mkDerivation { - pname = "yi"; - version = "0.12.6"; - sha256 = "886bbac8634a251d9872fbcc47350df3e84cf881e42cb7408d1a1e92614205d8"; - configureFlags = [ "-fpango" "-fvty" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring Cabal containers data-default - directory dlist dynamic-state dyre exceptions filepath glib gtk - hashable Hclip hint lens mtl old-locale oo-prototypes pango parsec - pointedlist process QuickCheck random safe semigroups split stm - template-haskell text text-icu time transformers-base unix - unix-compat unordered-containers vty word-trie xdg-basedir - yi-language yi-rope - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base directory filepath HUnit lens QuickCheck semigroups tasty - tasty-hunit tasty-quickcheck text yi-language yi-rope - ]; - homepage = "https://yi-editor.github.io"; - description = "The Haskell-Scriptable Editor"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi_0_13_5" = callPackage ({ mkDerivation, base, microlens-platform, mtl , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell @@ -196111,7 +189217,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Yi editor"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-contrib" = callPackage @@ -196220,24 +189325,6 @@ self: { }) {}; "yi-fuzzy-open" = callPackage - ({ mkDerivation, base, binary, containers, data-default, directory - , filepath, mtl, text, transformers-base, vector, yi, yi-language - , yi-rope - }: - mkDerivation { - pname = "yi-fuzzy-open"; - version = "0.1.0.1"; - sha256 = "92eda3ac60f57509716f8473c840d6a46b1be52f3713b27c1a5d0aa70978b02a"; - libraryHaskellDepends = [ - base binary containers data-default directory filepath mtl text - transformers-base vector yi yi-language yi-rope - ]; - homepage = "https://github.com/yi-editor/yi-fuzzy-open"; - description = "Fuzzy open plugin for Yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-fuzzy-open_0_13_5" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi-core , yi-language, yi-rope @@ -196253,7 +189340,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Fuzzy open plugin for yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-gtk" = callPackage @@ -196352,32 +189438,6 @@ self: { }) {}; "yi-language" = callPackage - ({ mkDerivation, alex, array, base, binary, containers - , data-default, filepath, hashable, hspec, microlens-platform - , oo-prototypes, pointedlist, QuickCheck, regex-base, regex-tdfa - , template-haskell, transformers-base, unordered-containers - }: - mkDerivation { - pname = "yi-language"; - version = "0.2.1"; - sha256 = "58153110fa9fad0c873a8376e73bb21b9ebdbb32357d23b29e1bd6d901cffacd"; - libraryHaskellDepends = [ - array base binary containers data-default hashable - microlens-platform oo-prototypes pointedlist regex-base regex-tdfa - template-haskell transformers-base unordered-containers - ]; - libraryToolDepends = [ alex ]; - testHaskellDepends = [ - array base binary containers data-default filepath hashable hspec - microlens-platform pointedlist QuickCheck regex-base regex-tdfa - template-haskell transformers-base unordered-containers - ]; - homepage = "https://github.com/yi-editor/yi-language"; - description = "Collection of language-related Yi libraries"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-language_0_13_5" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, hashable, microlens-platform, oo-prototypes , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec @@ -196403,7 +189463,6 @@ self: { homepage = "https://github.com/yi-editor/yi#readme"; description = "Collection of language-related Yi libraries"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-misc-modes" = callPackage @@ -196487,26 +189546,6 @@ self: { }) {}; "yi-rope" = callPackage - ({ mkDerivation, base, binary, bytestring, charsetdetect-ae - , data-default, deepseq, fingertree, hspec, QuickCheck - , quickcheck-instances, text, text-icu - }: - mkDerivation { - pname = "yi-rope"; - version = "0.7.0.2"; - sha256 = "e05df2d905460723c62dba6f5201964504bf8214b3db9db11c1378dc0f08ca9d"; - libraryHaskellDepends = [ - base binary bytestring charsetdetect-ae data-default deepseq - fingertree text text-icu - ]; - testHaskellDepends = [ - base hspec QuickCheck quickcheck-instances text - ]; - description = "A rope data structure used by Yi"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "yi-rope_0_8" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae , data-default, deepseq, fingertree, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -196524,7 +189563,6 @@ self: { ]; description = "A rope data structure used by Yi"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-snippet" = callPackage @@ -197231,8 +190269,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "0.1.5"; - sha256 = "92ea1f4b28f89f77e065046095f0d7c1fedadef402ccd4f04ee09bac68556974"; + version = "0.1.7"; + sha256 = "8b7e4f597e926db852397bb2cbad04d05c718a222702076fbbdfcccb62679c9e"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath mtl path @@ -197663,6 +190701,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "zstd" = callPackage + ({ mkDerivation, base, bytestring, deepseq, ghc-prim, QuickCheck + , test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "zstd"; + version = "0.1.0.0"; + sha256 = "0875840799d987cf8f8dd5e0a7686978084b3088c07123e66f6f88561f474bff"; + libraryHaskellDepends = [ base bytestring deepseq ghc-prim ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + homepage = "https://github.com/facebookexperimental/hs-zstd"; + description = "Haskell bindings to the Zstandard compression algorithm"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ztail" = callPackage ({ mkDerivation, array, base, bytestring, filepath, hinotify , process, regex-posix, time, unix, unordered-containers diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0bd5f1e490d..02fca8d0d1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5067,7 +5067,7 @@ with pkgs; haskell = callPackage ./haskell-packages.nix { }; - haskellPackages = haskell.packages.ghc801.override { + haskellPackages = haskell.packages.ghc802.override { overrides = config.haskellPackageOverrides or (self: super: {}); }; From 958b1008274847f6b4297204f84bb12641ca493e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 13:29:28 +0100 Subject: [PATCH 102/138] haskell-common: drop overrides that have become obsolete with LTS 8.x --- .../haskell-modules/configuration-common.nix | 82 ++----------------- 1 file changed, 8 insertions(+), 74 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 81eff1d4250..31410f58e21 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -392,7 +392,6 @@ self: super: { # https://ghc.haskell.org/trac/ghc/ticket/9625 vty = dontCheck super.vty; - vty_5_15 = dontCheck super.vty_5_15; # https://github.com/vincenthz/hs-crypto-pubkey/issues/20 crypto-pubkey = dontCheck super.crypto-pubkey; @@ -472,11 +471,6 @@ self: super: { preConfigure = "sed -i -e 's,time .* < 1.6,time >= 1.5,' -e 's,haddock-library >= 1.1 && < 1.3,haddock-library >= 1.1,' pandoc.cabal"; }); - # Requires bower-json >= 1.0.0.1 && < 1.1 - purescript_0_10_5 = super.purescript_0_10_5.overrideScope (self: super: { - bower-json = self.bower-json_1_0_0_1; - }); - # https://github.com/tych0/xcffib/issues/37 xcffib = dontCheck super.xcffib; @@ -497,41 +491,6 @@ self: super: { # https://github.com/anton-k/csound-expression-dynamic/issues/1 csound-expression-dynamic = dontHaddock super.csound-expression-dynamic; - # Packages of the diagrams ecosystem that require: - # diagrams-core ==1.4.* - # diagrams-lib ==1.4.* - # optparse-applicative ==0.13.* - diagrams_1_4 = super.diagrams_1_4.overrideScope (self: super: { - diagrams-contrib = self.diagrams-contrib_1_4_0_1; - diagrams-core = self.diagrams-core_1_4; - diagrams-lib = self.diagrams-lib_1_4_0_1; - diagrams-svg = self.diagrams-svg_1_4_1; - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); - diagrams-contrib_1_4_0_1 = super.diagrams-contrib_1_4_0_1.overrideScope (self: super: { - diagrams-core = self.diagrams-core_1_4; - diagrams-lib = self.diagrams-lib_1_4_0_1; - }); - diagrams-lib_1_4_0_1 = super.diagrams-lib_1_4_0_1.overrideScope (self: super: { - diagrams-core = self.diagrams-core_1_4; - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); - diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: { - diagrams-core = self.diagrams-core_1_4; - diagrams-lib = self.diagrams-lib_1_4_0_1; - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); - diagrams-rasterific_1_4 = super.diagrams-rasterific_1_4.overrideScope (self: super: { - diagrams-core = self.diagrams-core_1_4; - diagrams-lib = self.diagrams-lib_1_4_0_1; - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); - diagrams-svg_1_4_1 = super.diagrams-svg_1_4_1.overrideScope (self: super: { - diagrams-core = self.diagrams-core_1_4; - diagrams-lib = self.diagrams-lib_1_4_0_1; - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); - # Test suite won't compile against tasty-hunit 0.9.x. zlib = dontCheck super.zlib; @@ -744,15 +703,14 @@ self: super: { }); # The most current version needs some packages to build that are not in LTS 7.x. - stack = super.stack.overrideScope (self: super: { - http-client = self.http-client_0_5_5; - http-client-tls = self.http-client-tls_0_3_3_1; - http-conduit = self.http-conduit_2_2_3; - optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; - criterion = super.criterion.override { inherit (super) optparse-applicative; }; - aeson = self.aeson_1_0_2_1; - hpack = self.hpack_0_15_0; - }); + # stack = super.stack.overrideScope (self: super: { + # http-client = self.http-client_0_5_5; + # http-client-tls = self.http-client-tls_0_3_3_1; + # http-conduit = self.http-conduit_2_2_3; + # criterion = super.criterion.override { inherit (super) optparse-applicative; }; + # aeson = self.aeson_1_0_2_1; + # hpack = self.hpack_0_15_0; + # }); # The latest Hoogle needs versions not yet in LTS Haskell 7.x. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; @@ -776,9 +734,6 @@ self: super: { # Needs new version. haskell-src-exts-simple = super.haskell-src-exts-simple.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; - # Test suite fails a QuickCheck property. - optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; - # https://github.com/Philonous/hs-stun/pull/1 # Remove if a version > 0.1.0.1 ever gets released. stunclient = overrideCabal super.stunclient (drv: { @@ -800,10 +755,6 @@ self: super: { # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; - # http-api-data_0.3.x requires QuickCheck > 2.9, but overriding that version - # is hard because of transitive dependencies, so we just disable tests. - http-api-data_0_3_5 = dontCheck super.http-api-data_0_3_5; - # Fix build for latest versions of servant and servant-client. servant_0_10 = super.servant_0_10.overrideScope (self: super: { http-api-data = self.http-api-data_0_3_5; @@ -842,16 +793,9 @@ self: super: { # https://github.com/plow-technologies/servant-auth/issues/20 servant-auth = dontCheck super.servant-auth; - servant-auth-server = super.servant-auth-server.overrideScope (self: super: { - jose = super.jose_0_5_0_2; - }); - # https://github.com/pontarius/pontarius-xmpp/issues/105 pontarius-xmpp = dontCheck super.pontarius-xmpp; - # Use proper store-core version. - store_0_3 = super.store_0_3.overrideScope (self: super: { store-core = self.store-core_0_3; }); - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = doJailbreak super.applicative-quoters; @@ -885,21 +829,11 @@ self: super: { # https://github.com/josefs/STMonadTrans/issues/4 STMonadTrans = dontCheck super.STMonadTrans; - socket_0_7_0_0 = super.socket_0_7_0_0.overrideScope (self: super: { QuickCheck = self.QuickCheck_2_9_2; }); - - # requires most recent vty - brick = super.brick.overrideScope (self: super: { vty = self.vty_5_15; }); - - turtle_1_3_1 = super.turtle_1_3_1.overrideScope (self: super: { - optparse-applicative = self.optparse-applicative_0_13_0_0; - }); - # No upstream issue tracker hspec-expectations-pretty-diff = dontCheck super.hspec-expectations-pretty-diff; lentil = super.lentil.overrideScope (self: super: { pipes = self.pipes_4_3_2; - optparse-applicative = self.optparse-applicative_0_13_0_0; # https://github.com/roelvandijk/terminal-progress-bar/issues/14 terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1; }); From 29a1db9a97872f7eb791aa7ffe26b2098835dc5e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 13:48:58 +0100 Subject: [PATCH 103/138] haskell-lifted-base: jailbreak to work around https://github.com/basvandijk/lifted-base/issues/34 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 31410f58e21..da305345b5a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -837,4 +837,8 @@ self: super: { # https://github.com/roelvandijk/terminal-progress-bar/issues/14 terminal-progress-bar = doJailbreak self.terminal-progress-bar_0_1_1; }); + + # https://github.com/basvandijk/lifted-base/issues/34 + lifted-base = doJailbreak super.lifted-base; + } From 7b96859cab5302cab206ff1825495900cac5a814 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 13:51:33 +0100 Subject: [PATCH 104/138] haskell-parsec: jailbreak to work around https://github.com/aslatter/parsec/issues/68 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index da305345b5a..5b548550bf0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -841,4 +841,7 @@ self: super: { # https://github.com/basvandijk/lifted-base/issues/34 lifted-base = doJailbreak super.lifted-base; + # https://github.com/aslatter/parsec/issues/68 + parsec = doJailbreak super.parsec; + } From 0583ffb7c275d82eb447fab91c80c80a225240c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 13:59:12 +0100 Subject: [PATCH 105/138] haskell-system-filepath: disable test suite to remove dependency on chell-quickcheck chell-quickcheck does not support recent versions of QuickCheck and therefore does not compile in LTS 8.x. --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5b548550bf0..87645b5abf0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -844,4 +844,8 @@ self: super: { # https://github.com/aslatter/parsec/issues/68 parsec = doJailbreak super.parsec; + # Don't depend on chell-quickcheck, which doesn't compile due to restricting + # QuickCheck to versions ">=2.3 && <2.9". + system-filepath = dontCheck super.system-filepath; + } From 8968bff4614899fa0b851d33d72b5df8f97d2931 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 14:08:26 +0100 Subject: [PATCH 106/138] haskell-case-insensitive: jailbreak to work around https://github.com/basvandijk/case-insensitive/issues/24 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 87645b5abf0..0733a2ff31b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -848,4 +848,7 @@ self: super: { # QuickCheck to versions ">=2.3 && <2.9". system-filepath = dontCheck super.system-filepath; + # https://github.com/basvandijk/case-insensitive/issues/24 + case-insensitive = doJailbreak super.case-insensitive; + } From 30b762a9776282333628d5d708783dd11a880f5a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 14:13:53 +0100 Subject: [PATCH 107/138] haskell-vector: disable the test suite to work around https://github.com/haskell/vector/issues/138 --- pkgs/development/haskell-modules/configuration-common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 0733a2ff31b..9c9a7379725 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -139,9 +139,9 @@ self: super: { # https://github.com/techtangents/ablist/issues/1 ABList = dontCheck super.ABList; - # https://github.com/haskell/vector/issues/47 - # https://github.com/haskell/vector/issues/138 - vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); + # sse2 flag due to https://github.com/haskell/vector/issues/47. + # dontCheck due to https://github.com/haskell/vector/issues/138 + vector = dontCheck (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); # Fix Darwin build. halive = if pkgs.stdenv.isDarwin From 7a6648f20ef5e0125fa2d1fa9cb45c0976f8ab20 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 14:39:00 +0100 Subject: [PATCH 108/138] haskell-uuid{,-types}: jailbreak to work around https://github.com/hvr/uuid/issues/28 --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9c9a7379725..5a508e9137a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -851,4 +851,8 @@ self: super: { # https://github.com/basvandijk/case-insensitive/issues/24 case-insensitive = doJailbreak super.case-insensitive; + # https://github.com/hvr/uuid/issues/28 + uuid-types = doJailbreak super.uuid-types; + uuid = doJailbreak super.uuid; + } From c37e51fa681f24be68629eb63a637a44119ab83c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 15:27:40 +0100 Subject: [PATCH 109/138] haskell-stack: jailbreak to work around https://github.com/commercialhaskell/stack/issues/3001 --- .../haskell-modules/configuration-common.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5a508e9137a..89a248cb717 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -702,15 +702,8 @@ self: super: { ''; }); - # The most current version needs some packages to build that are not in LTS 7.x. - # stack = super.stack.overrideScope (self: super: { - # http-client = self.http-client_0_5_5; - # http-client-tls = self.http-client-tls_0_3_3_1; - # http-conduit = self.http-conduit_2_2_3; - # criterion = super.criterion.override { inherit (super) optparse-applicative; }; - # aeson = self.aeson_1_0_2_1; - # hpack = self.hpack_0_15_0; - # }); + # https://github.com/commercialhaskell/stack/issues/3001 + stack = doJailbreak super.stack; # The latest Hoogle needs versions not yet in LTS Haskell 7.x. hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_19_1; }; From e60992354b27fb54ef688fef7ca0230cdf17f67c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 15:35:08 +0100 Subject: [PATCH 110/138] haskell-hspec-contrib: disable test suite due to https://github.com/hspec/hspec/issues/307 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 89a248cb717..ce6e97d5cc2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -848,4 +848,7 @@ self: super: { uuid-types = doJailbreak super.uuid-types; uuid = doJailbreak super.uuid; + # https://github.com/hspec/hspec/issues/307 + hspec-contrib = dontCheck super.hspec-contrib; + } From 216d277095869c2013b87db81b466f41c8bee0e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 17:27:04 +0100 Subject: [PATCH 111/138] haskell-servant: update hash for the documentation download --- 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 ce6e97d5cc2..20668d229f3 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -768,7 +768,7 @@ self: super: { owner = "haskell-servant"; repo = "servant"; rev = "v${ver}"; - sha256 = "0fynv77m7rk79pdp535c2a2bd44csgr32zb4wqavbalr7grpxg4q"; + sha256 = "09kjinnarf9q9l8irs46gcrai8bprq39n8pj43bmdv47hl38csa0"; }}/doc"; buildInputs = with pkgs.pythonPackages; [ sphinx recommonmark sphinx_rtd_theme ]; makeFlags = "html"; From 8821b3899ec2d1dc89d3a8347c5af8173ab90c81 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 12 Feb 2017 18:04:17 +0100 Subject: [PATCH 112/138] haskell-lens: disable doctest suite to work around https://github.com/ekmett/lens/issues/713 --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20668d229f3..2dbcbdff4c7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -851,4 +851,7 @@ self: super: { # https://github.com/hspec/hspec/issues/307 hspec-contrib = dontCheck super.hspec-contrib; + # https://github.com/ekmett/lens/issues/713 + lens = disableCabalFlag super.lens "test-doctests"; + } From b2fcf9fec58086a97a7740921369d1bc2a83f932 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 13 Feb 2017 12:49:08 +0100 Subject: [PATCH 113/138] love_0_10: 0.10.1 -> 0.10.2 --- pkgs/development/interpreters/love/0.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index ed5aa1e60de..04b574d4559 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -5,7 +5,7 @@ let pname = "love"; - version = "0.10.1"; + version = "0.10.2"; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "rude"; repo = "love"; rev = "${version}"; - sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj"; + sha256 = "19yfmlcx6w8yi4ndm5lni8lrsvnn77bxw5py0dc293nzzlaqa9ym"; }; buildInputs = [ From b4cd251c54e8a07cfcb8cb46c53083f2f6c7a573 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 13 Feb 2017 11:44:22 +0000 Subject: [PATCH 114/138] Manual: document users.users..hashedPassword --- nixos/doc/manual/configuration/user-mgmt.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml index 829e5b9ea84..2bd9cca5622 100644 --- a/nixos/doc/manual/configuration/user-mgmt.xml +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -36,7 +36,10 @@ to set a password, which is retained across invocations of and /etc/group will be congruent to your NixOS configuration. For instance, if you remove a user from users.extraUsers and run nixos-rebuild, the user account will cease to exist. Also, imperative commands for managing users -and groups, such as useradd, are no longer available. +and groups, such as useradd, are no longer available. Passwords may still be +assigned by setting the user's hashedPassword option. A +hashed password can be generated using mkpasswd -m sha-512 +after installing the mkpasswd package. A user ID (uid) is assigned automatically. You can also specify a uid manually by adding From b7d65f8af0fa6422b1f6fae492ed02aeca633825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 13 Feb 2017 00:53:20 +0100 Subject: [PATCH 115/138] vim.vam: fix filetype detection According to https://github.com/MarcWeber/vim-addon-manager/blob/master/doc/vim-addon-manager-additional-documentation.txt#L1310 `filetype on` must be called after all VAM plugins are initialized. Otherwise vim set `conf` filetype for some files containing hash tags. --- pkgs/misc/vim-plugins/vim-utils.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index 3ce88320ddf..d714b290a90 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -65,8 +65,8 @@ See vimHelpTags sample code below. CONTRIBUTING AND CUSTOMIZING ============================ -The example file pkgs/misc/vim-plugins/default.nix provides both: -* manually mantained plugins +The example file pkgs/misc/vim-plugins/default.nix provides both: +* manually mantained plugins * plugins created by VAM's nix#ExportPluginsForNix implementation I highly recommend to lookup vim plugin attribute names at the [vim-pi] project @@ -105,7 +105,7 @@ Then ":source %" it. nix#ExportPluginsForNix is provided by ./vim2nix -A buffer will open containing the plugin derivation lines as well list +A buffer will open containing the plugin derivation lines as well list fitting the vimrcConfig.vam.pluginDictionaries option. Thus the most simple usage would be: @@ -125,7 +125,7 @@ Thus the most simple usage would be: vimrcConfig.vam.knownPlugins = vimPlugins; vimrcConfig.vam.pluginDictionaries = [ # the plugin list form ~/.vim-scripts turned into nix format added to - # the buffer created by the nix#ExportPluginsForNix + # the buffer created by the nix#ExportPluginsForNix ]; } @@ -262,13 +262,14 @@ let in writeText "vimrc" '' " minimal setup, generated by NIX set nocompatible - filetype indent plugin on | syn on ${vamImpl} ${pathogenImpl} ${vundleImpl} ${neobundleImpl} + filetype indent plugin on | syn on + ${customRC} ''; From b059f63c6e10d864c641ebcc43cbd850b62d0f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Feb 2017 14:02:00 +0100 Subject: [PATCH 116/138] pythonPackages.libasyncns: init at 0.7.1 --- .../development/python-modules/libasyncns.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/libasyncns.nix diff --git a/pkgs/development/python-modules/libasyncns.nix b/pkgs/development/python-modules/libasyncns.nix new file mode 100644 index 00000000000..de0d6ea610d --- /dev/null +++ b/pkgs/development/python-modules/libasyncns.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchurl +, libasyncns, pkgconfig }: + +buildPythonPackage rec { + name = "libasyncns-python-${version}"; + version = "0.7.1"; + + src = fetchurl { + url = "https://launchpad.net/libasyncns-python/trunk/${version}/+download/libasyncns-python-${version}.tar.bz2"; + sha256 = "1q4l71b2h9q756x4pjynp6kczr2d8c1jvbdp982hf7xzv7w5gxqg"; + }; + + buildInputs = [ libasyncns ]; + nativeBuildInputs = [ pkgconfig ]; + doCheck = false; # requires network access + + meta = with stdenv.lib; { + description = "libasyncns-python is a python binding for the asynchronous name service query library"; + license = licenses.lgpl21; + maintainers = [ maintainers.mic92 ]; + homepage = https://launchpad.net/libasyncns-python; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40201bc6047..92f5ccc2070 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28092,6 +28092,10 @@ EOF buildInputs = with self; [ pytest pkgs.glibcLocales ]; }; + libasyncns = callPackage ../development/python-modules/libasyncns.nix { + inherit (pkgs) libasyncns pkgconfig; + }; + pybrowserid = buildPythonPackage rec { name = "PyBrowserID-${version}"; version = "0.9.2"; From 8ed1d3f8d8264aab302f5f0e6fe8cd00f801bffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Feb 2017 14:02:47 +0100 Subject: [PATCH 117/138] gajim: use libasyncns as resolver --- .../instant-messengers/gajim/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index f0652bf4a1e..d78bd759ea6 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -2,7 +2,7 @@ , ldns, pythonPackages # Test requirements -, xvfb_run, dnsutils +, xvfb_run , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null @@ -63,9 +63,8 @@ stdenv.mkDerivation rec { }$GST_PLUGIN_PATH"'" }' scripts/gajim.in - sed -i -e 's/return helpers.is_in_path('"'"'drill.*/return True/' \ - src/features_window.py - sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py + # requires network access + echo "" > test/integration/test_resolver.py # We want to run tests in installCheckPhase rather than checkPhase to test # whether the *installed* version of Gajim works rather than just whether it @@ -83,19 +82,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pythonPackages.wrapPython intltool pkgconfig # Test dependencies - xvfb_run dnsutils + xvfb_run ]; autoreconfPhase = '' sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash ''; - propagatedBuildInputs = [ - pythonPackages.pygobject2 pythonPackages.pyGtkGlade - pythonPackages.pyasn1 - pythonPackages.pyxdg - pythonPackages.nbxmpp - pythonPackages.pyopenssl pythonPackages.dbus-python + propagatedBuildInputs = with pythonPackages; [ + libasyncns + pygobject2 pyGtkGlade + pyasn1 + pyxdg + nbxmpp + pyopenssl dbus-python ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils ++ optional enableNotifications pythonPackages.notify From c71a893334ddecb0c29470e1ad3b906dfbec574b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 13 Feb 2017 14:37:30 +0100 Subject: [PATCH 118/138] Revert "Use looser 9pfs caching in VM tests/builds" This reverts commit bbd03e236a58e9344c91861513699e070186a3c5. --- pkgs/os-specific/linux/kernel/patches.nix | 9 --------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 10 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 1f528f9412b..7e1ec3b9941 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -175,13 +175,4 @@ rec { }; }; - p9_caching_4_4 = rec - { name = "9p-caching.patch"; - patch = fetchpatch { - inherit name; - url = https://github.com/edolstra/linux/commit/d522582553368b9564e2d88a8d7b1d469bf98c65.patch; - sha256 = "01h7461pdgavd6ghd6w9wg136hkaca0mrmmzhy6s3phksksimbc2"; - }; - }; - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02fca8d0d1e..a6bd01b2467 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11282,7 +11282,6 @@ with pkgs; kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.cpu-cgroup-v2."4.4" - kernelPatches.p9_caching_4_4 ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu From d5c4737c2dd87384c4e548b5e9c8dce40101997c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 12 Feb 2017 12:01:35 +0100 Subject: [PATCH 119/138] pythonPackages.aws_shell: cleanup --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4ad21ffb5f..b3ec73f251c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1600,10 +1600,10 @@ in { sha256 = "1pw9lrdjl24n6lrs6lnqpyiyic8bdxgvhyqvb2rx6kkbjrfhhgv5"; url = "mirror://pypi/a/aws-shell/aws-shell-${version}.tar.gz"; }; + # Why does it propagate packages that are used for testing? propagatedBuildInputs = with self; [ - configobj prompt_toolkit awscli boto3 pygments mock pytest - pytestcov unittest2 tox + awscli prompt_toolkit boto3 configobj pygments ]; #Checks are failing due to missing TTY, which won't exist. From 6891c9291d41058451b05a96bb5f6eded966b0f4 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 12 Feb 2017 12:28:48 +0100 Subject: [PATCH 120/138] pythonPackages.unittest2: no need to depend on argparse --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b3ec73f251c..243fe400ce9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26328,14 +26328,17 @@ in { # # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; - patchPhase = '' + postPatch = '' + # argparse is needed for python < 2.7, which we do not support anymore. + substituteInPlace setup.py --replace "argparse" + # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py # https://github.com/pypa/packaging/pull/36 sed -i 's/version=VERSION/version=str(VERSION)/' setup.py ''; - propagatedBuildInputs = with self; [ six argparse traceback2 ]; + propagatedBuildInputs = with self; [ six traceback2 ]; meta = { description = "A backport of the new features added to the unittest testing framework"; From c2e2a4d2c5bdf4937c8a08e4e374b471fa44b0f9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 12 Feb 2017 12:32:49 +0100 Subject: [PATCH 121/138] Python: remove 2.6 --- .../python/cpython/2.6/default.nix | 228 ------------------ .../python/cpython/2.6/nix-store-mtime.patch | 12 - .../2.6/python2.6-fix-parallel-make.patch | 37 --- .../python/cpython/2.6/search-path.patch | 27 --- .../python/cpython/2.6/setup-hook.sh | 15 -- .../python/cpython/docs/2.6-html.nix | 18 -- .../python/cpython/docs/2.6-pdf-a4.nix | 18 -- .../python/cpython/docs/2.6-pdf-letter.nix | 18 -- .../python/cpython/docs/2.6-text.nix | 18 -- .../python/cpython/docs/default.nix | 12 - pkgs/top-level/all-packages.nix | 11 +- 11 files changed, 1 insertion(+), 413 deletions(-) delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/default.nix delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/search-path.patch delete mode 100644 pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-html.nix delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix delete mode 100644 pkgs/development/interpreters/python/cpython/docs/2.6-text.nix diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix deleted file mode 100644 index 9a4c2d5b398..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ /dev/null @@ -1,228 +0,0 @@ -{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false -, sqlite, tcl, tk, xlibsWrapper, openssl, readline, db, ncurses, gdbm, self, callPackage -# For the Python package set -, pkgs, packageOverrides ? (self: super: {}) -}: - -assert zlibSupport -> zlib != null; - -with stdenv.lib; - -let - majorVersion = "2.6"; - minorVersion = "9"; - minorVersionSuffix = ""; - pythonVersion = majorVersion; - version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; - libPrefix = "python${majorVersion}"; - - src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; - sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya"; - }; - - patches = - [ # Look in C_INCLUDE_PATH and LIBRARY_PATH for stuff. - ./search-path.patch - - # Python recompiles a Python if the mtime stored *in* the - # pyc/pyo file differs from the mtime of the source file. This - # doesn't work in Nix because Nix changes the mtime of files in - # the Nix store to 1. So treat that as a special case. - ./nix-store-mtime.patch - - # http://bugs.python.org/issue10013 - ./python2.6-fix-parallel-make.patch - ]; - - preConfigure = '' - # Purity. - for i in /usr /sw /opt /pkg; do - substituteInPlace ./setup.py --replace $i /no-such-path - done - '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) '' - for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ - done - '' + optionalString stdenv.isCygwin '' - # On Cygwin, `make install' tries to read this Makefile. - mkdir -p $out/lib/python${majorVersion}/config - touch $out/lib/python${majorVersion}/config/Makefile - mkdir -p $out/include/python${majorVersion} - touch $out/include/python${majorVersion}/pyconfig.h - ''; - - configureFlags = "--enable-shared --with-threads --enable-unicode=ucs4"; - - buildInputs = - optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline xlibsWrapper tcl tk sqlite ] - ++ optional zlibSupport zlib; - - mkPaths = paths: { - C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths; - LIBRARY_PATH = makeLibraryPath paths; - }; - - # Build the basic Python interpreter without modules that have - # external dependencies. - python = stdenv.mkDerivation { - name = "python${if includeModules then "" else "-minimal"}-${version}"; - pythonVersion = majorVersion; - - inherit majorVersion version src patches buildInputs preConfigure - configureFlags; - - inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - - NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"; - - setupHook = ./setup-hook.sh; - - postInstall = - '' - # needed for some packages, especially packages that backport - # functionality to 2.x from 3.x - for item in $out/lib/python${majorVersion}/test/*; do - if [[ "$item" != */test_support.py* ]]; then - rm -rf "$item" - fi - done - touch $out/lib/python${majorVersion}/test/__init__.py - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb - ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion} - mv $out/share/man/man1/{python.1,python2.6.1} - ln -s $out/share/man/man1/{python2.6.1,python.1} - - paxmark E $out/bin/python${majorVersion} - - # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 - echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py - - ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} - ''; - - passthru = let - pythonPackages = callPackage ../../../../../top-level/python-packages.nix {python=self; overrides=packageOverrides;}; - in rec { - inherit libPrefix; - inherit zlibSupport; - isPy2 = true; - isPy26 = true; - buildEnv = callPackage ../../wrapper.nix { python = self; }; - withPackages = import ../../with-packages.nix { inherit buildEnv pythonPackages;}; - pkgs = pythonPackages; - executable = libPrefix; - sitePackages = "lib/${libPrefix}/site-packages"; - interpreter = "${self}/bin/${executable}"; - }; - - enableParallelBuilding = true; - - meta = { - homepage = "http://python.org"; - description = "A high-level dynamically-typed programming language"; - longDescription = '' - Python is a remarkably powerful dynamic programming language that - is used in a wide variety of application domains. Some of its key - distinguishing features include: clear, readable syntax; strong - introspection capabilities; intuitive object orientation; natural - expression of procedural code; full modularity, supporting - hierarchical packages; exception-based error handling; and very - high level dynamic data types. - ''; - license = stdenv.lib.licenses.psfl; - platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ chaoflow domenkozar ]; - # If you want to use Python 2.6, remove "broken = true;" at your own - # risk. Python 2.6 has known security vulnerabilities is not receiving - # security updates as of October 2013. - broken = true; - }; - }; - - - # This function builds a Python module included in the main Python - # distribution in a separate derivation. - buildInternalPythonModule = - { moduleName - , internalName ? "_" + moduleName - , deps - }: - if includeModules then null else stdenv.mkDerivation rec { - name = "python-${moduleName}-${python.version}"; - - inherit src patches preConfigure configureFlags; - - buildInputs = [ python ] ++ deps; - - inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH; - - buildPhase = - '' - substituteInPlace setup.py --replace 'self.extensions = extensions' \ - 'self.extensions = [ext for ext in self.extensions if ext.name in ["${internalName}"]]' - - python ./setup.py build_ext - [ -z "$(find build -name '*_failed.so' -print)" ] - ''; - - installPhase = - '' - dest=$out/lib/${python.libPrefix}/site-packages - mkdir -p $dest - cp -p $(find . -name "*.${if stdenv.isCygwin then "dll" else "so"}") $dest/ - ''; - }; - - - # The Python modules included in the main Python distribution, built - # as separate derivations. - modules = { - - bsddb = buildInternalPythonModule { - moduleName = "bsddb"; - deps = [ db ]; - }; - - crypt = buildInternalPythonModule { - moduleName = "crypt"; - internalName = "crypt"; - deps = optional (stdenv ? glibc) stdenv.glibc; - }; - - curses = buildInternalPythonModule { - moduleName = "curses"; - deps = [ ncurses ]; - }; - - curses_panel = buildInternalPythonModule { - moduleName = "curses_panel"; - deps = [ ncurses modules.curses ]; - }; - - gdbm = buildInternalPythonModule { - moduleName = "gdbm"; - internalName = "gdbm"; - deps = [ gdbm ]; - }; - - sqlite3 = buildInternalPythonModule { - moduleName = "sqlite3"; - deps = [ sqlite ]; - }; - - tkinter = buildInternalPythonModule { - moduleName = "tkinter"; - deps = [ tcl tk xlibsWrapper ]; - }; - - readline = buildInternalPythonModule { - moduleName = "readline"; - internalName = "readline"; - deps = [ readline ]; - }; - - }; - -in python // { inherit modules; } diff --git a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch b/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch deleted file mode 100644 index 83f3fea1931..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/nix-store-mtime.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' Python-2.7.1-orig/Python/import.c Python-2.7.1/Python/import.c ---- Python-2.7.1-orig/Python/import.c 2010-05-20 20:37:55.000000000 +0200 -+++ Python-2.7.1/Python/import.c 2011-01-04 15:55:11.000000000 +0100 -@@ -751,7 +751,7 @@ - return NULL; - } - pyc_mtime = PyMarshal_ReadLongFromFile(fp); -- if (pyc_mtime != mtime) { -+ if (pyc_mtime != mtime && mtime != 1) { - if (Py_VerboseFlag) - PySys_WriteStderr("# %s has bad mtime\n", cpathname); - fclose(fp); diff --git a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch b/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch deleted file mode 100644 index c43e141f9af..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/python2.6-fix-parallel-make.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up Python-2.7/Makefile.pre.in.fix-parallel-make Python-2.7/Makefile.pre.in ---- Python-2.7/Makefile.pre.in.fix-parallel-make 2010-07-22 15:01:39.567996932 -0400 -+++ Python-2.7/Makefile.pre.in 2010-07-22 15:47:02.437998509 -0400 -@@ -207,6 +207,7 @@ SIGNAL_OBJS= @SIGNAL_OBJS@ - - ########################################################################## - # Grammar -+GRAMMAR_STAMP= $(srcdir)/grammar-stamp - GRAMMAR_H= $(srcdir)/Include/graminit.h - GRAMMAR_C= $(srcdir)/Python/graminit.c - GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar -@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get - Modules/python.o: $(srcdir)/Modules/python.c - $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c - -+# GNU "make" interprets rules with two dependents as two copies of the rule. -+# -+# In a parallel build this can lead to pgen being run twice, once for each of -+# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler -+# reads a partially-overwritten copy of one of these files, leading to syntax -+# errors (or linker errors if the fragment happens to be syntactically valid C) -+# -+# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html -+# for more information -+# -+# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid -+# this: -+$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP) - --$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) -+$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT) - -@$(INSTALL) -d Include - -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) -+ touch $(GRAMMAR_STAMP) - - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) diff --git a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch b/pkgs/development/interpreters/python/cpython/2.6/search-path.patch deleted file mode 100644 index 2e7b7526c0c..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/search-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rc Python-2.4.4-orig/setup.py Python-2.4.4/setup.py -*** Python-2.4.4-orig/setup.py 2006-10-08 19:41:25.000000000 +0200 ---- Python-2.4.4/setup.py 2007-05-27 16:04:54.000000000 +0200 -*************** -*** 279,288 **** - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] -- lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) - inc_dirs += ['/system/include', '/atheos/autolnk/include'] -- inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) - - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] ---- 279,289 ---- - # Check for AtheOS which has libraries in non-standard locations - if platform == 'atheos': - lib_dirs += ['/system/libs', '/atheos/autolnk/lib'] - inc_dirs += ['/system/include', '/atheos/autolnk/include'] - -+ lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep) -+ inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep) -+ - # OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb) - if platform in ['osf1', 'unixware7', 'openunix8']: - lib_dirs += ['/usr/ccs/lib'] diff --git a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh b/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh deleted file mode 100644 index 4caff9c9d84..00000000000 --- a/pkgs/development/interpreters/python/cpython/2.6/setup-hook.sh +++ /dev/null @@ -1,15 +0,0 @@ -addPythonPath() { - addToSearchPathWithCustomDelimiter : PYTHONPATH $1/lib/python2.6/site-packages -} - -toPythonPath() { - local paths="$1" - local result= - for i in $paths; do - p="$i/lib/python2.6/site-packages" - result="${result}${result:+:}$p" - done - echo $result -} - -envHooks+=(addPythonPath) diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix deleted file mode 100644 index 2b41f122fa9..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-html.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-html-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-html.tar.bz2; - sha256 = "09kznik9ahmnrqw9gkr7mjv3b3zr258f2fm27n12hrrwwsaszkni"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/html - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix deleted file mode 100644 index ec031821a03..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-a4.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-pdf-a4-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-a4.tar.bz2; - sha256 = "07k8n9zhd59s1yn8ahsizkaqnv969p0f2c2acxgxrxhhyy842pp8"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/pdf-a4 - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix deleted file mode 100644 index 7cacf777834..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-pdf-letter.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-pdf-letter-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-pdf-letter.tar.bz2; - sha256 = "01r87m8hb7f9ql4j9zcjcrr9150nsk23sj8cy02vygr83sc1ldmq"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/pdf-letter - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix b/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix deleted file mode 100644 index eb394a3f3e2..00000000000 --- a/pkgs/development/interpreters/python/cpython/docs/2.6-text.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was generated and will be overwritten by ./generate.sh - -{ stdenv, fetchurl, lib }: - -stdenv.mkDerivation rec { - name = "python26-docs-text-2.6.8"; - src = fetchurl { - url = http://docs.python.org/ftp/python/doc/2.6.8/python-2.6.8-docs-text.tar.bz2; - sha256 = "05wsdh6ilgkclgak09fq7fsx5kflkmqq8dyxi2rpydx289cw3a8c"; - }; - installPhase = '' - mkdir -p $out/share/doc/python26 - cp -R ./ $out/share/doc/python26/text - ''; - meta = { - maintainers = [ lib.maintainers.chaoflow ]; - }; -} diff --git a/pkgs/development/interpreters/python/cpython/docs/default.nix b/pkgs/development/interpreters/python/cpython/docs/default.nix index 8f5fc810fb7..89e60f961f6 100644 --- a/pkgs/development/interpreters/python/cpython/docs/default.nix +++ b/pkgs/development/interpreters/python/cpython/docs/default.nix @@ -10,9 +10,6 @@ pythonDocs = { python27 = import ./2.7-html.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-html.nix { - inherit stdenv fetchurl lib; - }; }; pdf_a4 = { recurseForDerivations = true; @@ -22,9 +19,6 @@ pythonDocs = { python27 = import ./2.7-pdf-a4.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-pdf-a4.nix { - inherit stdenv fetchurl lib; - }; }; pdf_letter = { recurseForDerivations = true; @@ -34,9 +28,6 @@ pythonDocs = { python27 = import ./2.7-pdf-letter.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-pdf-letter.nix { - inherit stdenv fetchurl lib; - }; }; text = { recurseForDerivations = true; @@ -46,8 +37,5 @@ pythonDocs = { python27 = import ./2.7-text.nix { inherit stdenv fetchurl lib; }; - python26 = import ./2.6-text.nix { - inherit stdenv fetchurl lib; - }; }; }; in pythonDocs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a6bd01b2467..59b8e4e0f75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5845,7 +5845,6 @@ with pkgs; # These are for compatibility and should not be used inside Nixpkgs. pythonFull = python.override{x11Support=true;}; python2Full = python2.override{x11Support=true;}; - python26Full = python26.override{includeModules=true;self=python26Full;}; python27Full = python27.override{x11Support=true;}; python3Full = python3.override{x11Support=true;}; python33Full = python33.override{x11Support=true;}; @@ -5858,10 +5857,6 @@ with pkgs; python2Packages = python27Packages; python3Packages = python35Packages; - python26 = callPackage ../development/interpreters/python/cpython/2.6 { - db = db4; - self = python26; - }; python27 = callPackage ../development/interpreters/python/cpython/2.7 { self = python27; inherit (darwin) CF configd; @@ -10165,11 +10160,7 @@ with pkgs; ### DEVELOPMENT / PYTHON MODULES - # `nix-env -i python-nose` installs for 2.7, the default python. - # Therefore we do not recurse into attributes here, in contrast to - # python27Packages. `nix-env -iA python26Packages.nose` works - # regardless. - python26Packages = python26.pkgs; + # Python package sets. python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs); From ccf4d5e3d514eb8706b8aa89a3710c07a21b3483 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 12 Feb 2017 12:34:11 +0100 Subject: [PATCH 122/138] cudatoolkit5: remove this ancient version --- pkgs/development/compilers/cudatoolkit/default.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index f74815a3b95..927a1bcdf0b 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python26, python27, zlib +{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python27, zlib , xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc }: @@ -85,13 +85,6 @@ let in { - cudatoolkit5 = common { - version = "5.5.22"; - url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run; - sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4"; - python = python26; - }; - cudatoolkit6 = common { version = "6.0.37"; url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run; From 5d00edcf4f018d80dbed9e55e431d2054faf7078 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 13 Feb 2017 14:45:18 +0100 Subject: [PATCH 123/138] cudatoolkit5 fixup, fixes eval --- pkgs/top-level/all-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 59b8e4e0f75..7f5e8abeb4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1309,7 +1309,6 @@ with pkgs; cron = callPackage ../tools/system/cron { }; inherit (callPackages ../development/compilers/cudatoolkit { }) - cudatoolkit5 cudatoolkit6 cudatoolkit65 cudatoolkit7 From 0b87efacb14425f65e75c489e26b21952ece805c Mon Sep 17 00:00:00 2001 From: symphorien Date: Mon, 13 Feb 2017 14:53:15 +0100 Subject: [PATCH 124/138] grub: add grub.useOSProber option (#22558) --- nixos/modules/system/boot/loader/grub/grub.nix | 14 ++++++++++++-- .../system/boot/loader/grub/install-grub.pl | 9 ++++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 294fc1988e9..23b970186a3 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -53,12 +53,14 @@ let inherit (args) devices; inherit (efi) canTouchEfiVariables; inherit (cfg) - version extraConfig extraPerEntryConfig extraEntries forceInstall + version extraConfig extraPerEntryConfig extraEntries forceInstall useOSProber extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs - pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) + pkgs.utillinux ] + ++ (optional (cfg.efiSupport && (cfg.version == 2)) pkgs.efibootmgr) + ++ (optionals cfg.useOSProber [pkgs.busybox pkgs.os-prober]) )) + ":" + (makeSearchPathOutput "bin" "sbin" [ pkgs.mdadm pkgs.utillinux ]); @@ -265,6 +267,14 @@ in ''; }; + useOSProber = mkOption { + default = false; + type = types.bool; + description = '' + If set to true, append entries for other OSs detected by os-prober. + ''; + }; + splashImage = mkOption { type = types.nullOr types.path; example = literalExample "./my-background.png"; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index f92b17720f6..74eb32d1fc1 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -424,10 +424,17 @@ if ($extraPrepareConfig ne "") { system((get("shell"), "-c", $extraPrepareConfig)); } -# Atomically update the GRUB config. +# write the GRUB config. my $confFile = $grubVersion == 1 ? "$bootPath/grub/menu.lst" : "$bootPath/grub/grub.cfg"; my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); + +# Append entries detected by os-prober +if (get("useOsprober") eq "true") { + system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile"); +} + +# Atomically switch to the new config rename $tmpFile, $confFile or die "cannot rename $tmpFile to $confFile\n"; From 1b02439b61f23b3c2b8f9da4c549dc28c84bab5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 13 Feb 2017 14:54:30 +0100 Subject: [PATCH 125/138] servant-server: disable testsuite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2dbcbdff4c7..8e00386267b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -748,6 +748,9 @@ self: super: { # https://github.com/bos/math-functions/issues/25 math-functions = dontCheck super.math-functions; + # broken test suite + servant-server = dontCheck super.servant-server; + # Fix build for latest versions of servant and servant-client. servant_0_10 = super.servant_0_10.overrideScope (self: super: { http-api-data = self.http-api-data_0_3_5; From af9f44dd575bdf6390e14b34b7a652f766b39db0 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Feb 2017 14:54:30 +0100 Subject: [PATCH 126/138] grub: fix capitalisation Missed this occurence while renaming the option --- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 74eb32d1fc1..c9a51288747 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -430,7 +430,7 @@ my $tmpFile = $confFile . ".tmp"; writeFile($tmpFile, $conf); # Append entries detected by os-prober -if (get("useOsprober") eq "true") { +if (get("useOSProber") eq "true") { system(get("shell"), "-c", "pkgdatadir=$grub/share/grub $grub/etc/grub.d/30_os-prober >> $tmpFile"); } From 99fdc8b65162da56c4d90f4a937f9f0cfdc89b69 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Mon, 13 Feb 2017 14:03:59 +0000 Subject: [PATCH 127/138] pythonPackages.matplotlib: re-add Cocoa as buildInput on darwin (#22741) --- pkgs/development/python-modules/matplotlib/default.nix | 4 +++- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 9f85cb06d97..b917575e239 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -7,6 +7,7 @@ , enableTk ? false, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableQt ? false, pyqt4 , libcxx +, Cocoa }: assert enableGhostscript -> ghostscript != null; @@ -32,7 +33,8 @@ buildPythonPackage rec { XDG_RUNTIME_DIR = "/tmp"; buildInputs = [ python which sphinx stdenv ] - ++ stdenv.lib.optional enableGhostscript ghostscript; + ++ stdenv.lib.optional enableGhostscript ghostscript + ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil nose numpy pyparsing tornado freetype diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 243fe400ce9..e7592ce69a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14281,6 +14281,7 @@ in { matplotlib = callPackage ../development/python-modules/matplotlib/default.nix { stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; enableGhostscript = true; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; }; From 2e648bdacf5db569bc93a44eb7e5ae18adbbb1ec Mon Sep 17 00:00:00 2001 From: lufia Date: Mon, 13 Feb 2017 21:43:19 +0900 Subject: [PATCH 128/138] google-cloud-sdk: support x86_64-darwin --- pkgs/tools/admin/google-cloud-sdk/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix index dd8aada62fe..acc440b34ed 100644 --- a/pkgs/tools/admin/google-cloud-sdk/default.nix +++ b/pkgs/tools/admin/google-cloud-sdk/default.nix @@ -3,7 +3,7 @@ with python27Packages; # other systems not supported yet -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; +assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin"; stdenv.mkDerivation rec { name = "google-cloud-sdk-${version}"; @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86.tar.gz"; sha256 = "1z2v4bg743qkdlmyyy0z2j5s0g10vbc1643gxrhyz491sk6sp616"; } + else if stdenv.system == "x86_64-darwin" then + fetchurl { + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-darwin-x86_64.tar.gz"; + sha256 = "efbe2074da5a544c09b6bf87a8ca045dc429ac38dfcd5380561987769491d5ba"; + } else fetchurl { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/${name}-linux-x86_64.tar.gz"; @@ -58,6 +63,6 @@ stdenv.mkDerivation rec { license = licenses.free; homepage = "https://cloud.google.com/sdk/"; maintainers = with maintainers; [stephenmw zimbatm]; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } From 909a1dd569b214660769f75a79827d9267786fd5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 13 Feb 2017 15:24:29 +0100 Subject: [PATCH 129/138] tigervnc: 1.7.1 -> 1.8.0pre20170211 This allows to build with X.org server 1.19.1 --- pkgs/tools/admin/tigervnc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 71c4ebd10a4..60d2b2bcd11 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -7,14 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "1.7.1"; + version = "1.8.0pre20170211"; name = "tigervnc-${version}"; src = fetchFromGitHub { owner = "TigerVNC"; repo = "tigervnc"; - sha256 = "0s2v1h24cl5ypnr35hima580xvvsh0cdqi501mvyvi7wz9cp33rj"; - rev = "v1.7.1"; + sha256 = "10bs6394ya953gmak8g2d3n133vyfrryq9zq6dc27g8s6lw0mrbh"; + rev = "b6c46a1a99a402d5d17b1afafc4784ce0958d6ec"; }; inherit fontDirectories; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { dontUseCmakeBuildDir = true; postBuild = '' - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error=int-to-pointer-cast -Wno-error=pointer-to-int-cast" export CXXFLAGS="$CXXFLAGS -fpermissive" # Build Xvnc tar xf ${xorg.xorgserver.src} From 1a55974cef94fb53f68cdcaf305405a8790af78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 13 Feb 2017 15:47:08 +0100 Subject: [PATCH 130/138] lmdb: split outputs and add lmdb.pc lmdb.a is removed, until someone needs it. --- pkgs/development/libraries/lmdb/default.nix | 24 ++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/lmdb/default.nix b/pkgs/development/libraries/lmdb/default.nix index a73a95000d6..6b3070a39aa 100644 --- a/pkgs/development/libraries/lmdb/default.nix +++ b/pkgs/development/libraries/lmdb/default.nix @@ -14,14 +14,28 @@ in stdenv.mkDerivation rec { postUnpack = "sourceRoot=\${sourceRoot}/libraries/liblmdb"; - makeFlags = ["prefix=$(out)"] - ++ optional stdenv.cc.isClang "CC=clang"; + outputs = [ "bin" "out" "dev" ]; + + makeFlags = [ "prefix=$(out)" "CC=cc" ]; doCheck = true; checkPhase = "make test"; - preInstall = '' - mkdir -p $out/{bin,lib,include} + postInstall = '' + moveToOutput bin "$bin" + moveToOutput "lib/*.a" REMOVE # until someone needs it + '' + # add lmdb.pc (dynamic only) + + '' + mkdir -p "$dev/lib/pkgconfig" + cat > "$dev/lib/pkgconfig/lmdb.pc" < Date: Mon, 13 Feb 2017 16:37:52 +0100 Subject: [PATCH 131/138] knot-dns: use shared lmdb --- pkgs/servers/dns/knot-dns/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index cba21fbeb8e..af7d4d4c48c 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -16,15 +16,17 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - gnutls jansson liburcu libidn + gnutls jansson liburcu libidn lmdb nettle libedit libiconv # without sphinx &al. for developer documentation ] # Use embedded lmdb there for now, as detection is broken on Darwin somehow. - ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd lmdb ] + ++ stdenv.lib.optionals stdenv.isLinux [ libcap_ng systemd ] ++ stdenv.lib.optional stdenv.isDarwin zlib; # perhaps due to gnutls + configureFlags = [ "--with-lmdb=${stdenv.lib.getLib lmdb}"/*not perfect*/ ]; + enableParallelBuilding = true; CFLAGS = [ "-O2" "-DNDEBUG" ]; From 935ede8a595aea3dfb875859dfa75de2d94d5094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 13 Feb 2017 16:56:54 +0100 Subject: [PATCH 132/138] knot-resovler: use shared lmdb now --- pkgs/servers/dns/knot-resolver/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index b74f50beb61..10181de159f 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -23,8 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig which makeWrapper hexdump ]; - buildInputs = [ knot-dns luajit libuv gnutls ] - # TODO: lmdb needs lmdb.pc; embedded for now + buildInputs = [ knot-dns lmdb luajit libuv gnutls ] ## optional dependencies ++ optional doInstallCheck cmocka ++ optional stdenv.isLinux systemd # socket activation From 7a0f1f44629d601ed201ae4e4441184398b14b85 Mon Sep 17 00:00:00 2001 From: Rahul Gopinath Date: Sat, 11 Feb 2017 15:45:21 -0800 Subject: [PATCH 133/138] pytimeparse: 1.1.5 -> 1.1.6 --- pkgs/top-level/python-packages.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ee8ad5ebd5..14aa08e182b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -331,8 +331,9 @@ in { pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; pytimeparse = buildPythonPackage rec { - name = "pytimeparse-1.1.5"; - disabled = isPy3k; + pname = "pytimeparse"; + version = "1.1.6"; + name = "${pname}-${version}"; meta = { description = "A small Python library to parse various kinds of time expressions"; @@ -343,9 +344,9 @@ in { propagatedBuildInputs = with self; [ nose ]; - src = pkgs.fetchurl { - url = "mirror://pypi/p/pytimeparse/${name}.tar.gz"; - sha256 = "01xj31m5brydm4gvc6lwx26r74903wvm1jx3g05633k3mqlvvpcs"; + src = fetchPypi { + inherit pname version; + sha256 = "0imbb68i5n5fm704gv47if1blpxd4f8g16qmp5ar07cavgh2mibl"; }; }; From 5af946bd2cd1bb3285b973f31c969f776069a2c7 Mon Sep 17 00:00:00 2001 From: George Whewell Date: Mon, 13 Feb 2017 16:36:40 +0000 Subject: [PATCH 134/138] skip failing tests on darwin --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ee8ad5ebd5..c0908484325 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9447,8 +9447,8 @@ in { buildInputs = with self; [ nose sphinx numpydoc ]; - # Failing test on Python 3.x - postPatch = '''' + optionalString isPy3k '' + # Failing test on Python 3.x and Darwin + postPatch = '''' + optionalString (isPy3k || stdenv.isDarwin) '' sed -i -e '70,84d' joblib/test/test_format_stack.py # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. # Not sure why but it's nix-specific. Try removing for new joblib releases. From 982520d771c398129ef74b542105693f0234d2c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Mon, 13 Feb 2017 21:16:07 +0100 Subject: [PATCH 135/138] pythonPackages.awesome-slugify: fix test runner --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6667ae2f99d..f93bc71109b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1544,6 +1544,10 @@ in { propagatedBuildInputs = with self; [ unidecode regex ]; + checkPhase = '' + ${python.interpreter} -m unittest discover + ''; + meta = with stdenv.lib; { homepage = "https://github.com/dimka665/awesome-slugify"; description = "Python flexible slugify function"; From 9298467923f129480cdd3beebcab4f08ad3229c8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 13 Feb 2017 21:42:26 +0100 Subject: [PATCH 136/138] svtplay-dl: 1.9.1 -> 1.9.2 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index eb7c89a382b..1713977d20a 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests2 mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "1xnafj87rp12b7mikvyi3b77vrrhnkjav9gn20fj9yi5p070vkf1"; + sha256 = "1ajbflywfc3nfjqp95izbnxrbqjm4v56gx0am2mj0z0ypds2dvm5"; }; pythonPaths = [ pycrypto requests2 ]; From a2d2649a8fe84c00cc14df24611c9e2c907873ba Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 13 Feb 2017 21:44:59 +0100 Subject: [PATCH 137/138] perl-MooseX-Types: 0.46 -> 0.50 --- pkgs/top-level/perl-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f50d5dfe38d..6b3e7d99a98 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -9136,13 +9136,13 @@ let self = _self // overrides; _self = with self; { }; MooseXTypes = buildPerlPackage rec { - name = "MooseX-Types-0.46"; + name = "MooseX-Types-0.50"; src = fetchurl { url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz"; - sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a"; + sha256 = "9cd87b3492cbf0be9d2df9317b2adf9fc30663770e69906654bea3f41b17cb08"; }; - buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires ]; - propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ]; + buildInputs = [ ModuleBuildTiny TestFatal TestRequires self."if" ]; + propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubExporterForMethods SubInstall SubName namespaceautoclean ]; meta = { homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; From 4882e431c7523f7298bebfde5d494aceeb1529b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 13 Feb 2017 21:55:54 +0100 Subject: [PATCH 138/138] Revert "pythonPackages.unittest2: no need to depend on argparse" This reverts commit 6891c9291d41058451b05a96bb5f6eded966b0f4. Moving the mass rebuild to staging. --- pkgs/top-level/python-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f93bc71109b..e7ee93e21fe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -26334,17 +26334,14 @@ in { # # 1.0.0 and up create a circle dependency with traceback2/pbr doCheck = false; - postPatch = '' - # argparse is needed for python < 2.7, which we do not support anymore. - substituteInPlace setup.py --replace "argparse" - + patchPhase = '' # # fixes a transient error when collecting tests, see https://bugs.launchpad.net/python-neutronclient/+bug/1508547 sed -i '510i\ return None, False' unittest2/loader.py # https://github.com/pypa/packaging/pull/36 sed -i 's/version=VERSION/version=str(VERSION)/' setup.py ''; - propagatedBuildInputs = with self; [ six traceback2 ]; + propagatedBuildInputs = with self; [ six argparse traceback2 ]; meta = { description = "A backport of the new features added to the unittest testing framework";