From f3cba4f6bb613654b74c63be4ef49a8ba675647a Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Tue, 17 Oct 2017 19:51:41 -0400 Subject: [PATCH 01/54] netdata service: fix permissions for apps.plugin apps.plugin requires capabilities for full process monitoring. with 1.9.0, netdata allows multiple directories to search for plugins and the setuid directory can be specified here. the module is backwards compatible with older configs. a test is included that verifies data gathering for the elevated privileges. one additional attribute is added to make configuration more generic than including configuration in string form. --- nixos/modules/services/monitoring/netdata.nix | 54 +++++++++++++++---- nixos/release.nix | 1 + nixos/tests/netdata.nix | 31 +++++++++++ 3 files changed, 76 insertions(+), 10 deletions(-) create mode 100644 nixos/tests/netdata.nix diff --git a/nixos/modules/services/monitoring/netdata.nix b/nixos/modules/services/monitoring/netdata.nix index e1fde4fc950..d23b329eeb2 100644 --- a/nixos/modules/services/monitoring/netdata.nix +++ b/nixos/modules/services/monitoring/netdata.nix @@ -5,18 +5,25 @@ with lib; let cfg = config.services.netdata; - configFile = pkgs.writeText "netdata.conf" cfg.configText; + wrappedPlugins = pkgs.runCommand "wrapped-plugins" {} '' + mkdir -p $out/libexec/netdata/plugins.d + ln -s /run/wrappers/bin/apps.plugin $out/libexec/netdata/plugins.d/apps.plugin + ''; + + localConfig = { + global = { + "plugins directory" = "${wrappedPlugins}/libexec/netdata/plugins.d ${pkgs.netdata}/libexec/netdata/plugins.d"; + }; + }; + mkConfig = generators.toINI {} (recursiveUpdate localConfig cfg.config); + configFile = pkgs.writeText "netdata.conf" (if cfg.configText != null then cfg.configText else mkConfig); defaultUser = "netdata"; in { options = { services.netdata = { - enable = mkOption { - default = false; - type = types.bool; - description = "Whether to enable netdata monitoring."; - }; + enable = mkEnableOption "netdata"; user = mkOption { type = types.str; @@ -31,9 +38,9 @@ in { }; configText = mkOption { - type = types.lines; - default = ""; - description = "netdata.conf configuration."; + type = types.nullOr types.lines; + description = "Verbatim netdata.conf, cannot be combined with config."; + default = null; example = '' [global] debug log = syslog @@ -42,11 +49,29 @@ in { ''; }; + config = mkOption { + type = types.attrsOf types.attrs; + default = {}; + description = "netdata.conf configuration as nix attributes. cannot be combined with configText."; + example = literalExample '' + global = { + "debug log" = "syslog"; + "access log" = "syslog"; + "error log" = "syslog"; + }; + ''; + }; + }; }; - }; config = mkIf cfg.enable { + assertions = + [ { assertion = cfg.config != {} -> cfg.configText == null ; + message = "Cannot specify both config and configText"; + } + ]; systemd.services.netdata = { + path = with pkgs; [ gawk curl ]; description = "Real time performance monitoring"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; @@ -66,6 +91,15 @@ in { }; }; + security.wrappers."apps.plugin" = { + source = "${pkgs.netdata}/libexec/netdata/plugins.d/apps.plugin"; + capabilities = "cap_dac_read_search,cap_sys_ptrace+ep"; + owner = cfg.user; + group = cfg.group; + permissions = "u+rx,g+rx,o-rwx"; + }; + + users.extraUsers = optional (cfg.user == defaultUser) { name = defaultUser; }; diff --git a/nixos/release.nix b/nixos/release.nix index cf3fe6abd48..e5f9a3aeff3 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -312,6 +312,7 @@ in rec { tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; }; tests.nat.firewall-conntrack = callTest tests/nat.nix { withFirewall = true; withConntrackHelpers = true; }; tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; }; + tests.netdata = callTest tests/netdata.nix { }; tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; }; tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; }; # TODO: put in networking.nix after the test becomes more complete diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix new file mode 100644 index 00000000000..58733c1b337 --- /dev/null +++ b/nixos/tests/netdata.nix @@ -0,0 +1,31 @@ +# This test runs netdata and checks for data via apps.plugin + +import ./make-test.nix ({ pkgs, ...} : { + name = "netdata"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ cransom ]; + }; + + nodes = { + netdata = + { config, pkgs, ... }: + { + environment.systemPackages = with pkgs; [ curl jq ]; + services.netdata.enable = true; + }; + }; + + testScript = '' + startAll; + + $netdata->waitForUnit("netdata.service"); + # check if netdata can read disk ops for root owned processes. + # if > 0, successful. verifies both netdata working and + # apps.plugin has elevated capabilities. + my $cmd = <<'CMD'; + curl -s http://localhost:19999/api/v1/data\?chart=users.pwrites | \ + jq -e '[.data[range(10)][.labels | indices("root")[0]]] | add | . > 0' + CMD + $netdata->waitUntilSucceeds($cmd); + ''; +}) From 60c8c1bd2da7f5580cdd50328690d237b8b951c8 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 8 Jan 2018 09:46:40 -0600 Subject: [PATCH 02/54] pythonPackages.structlog: patch to fix tests, build --- pkgs/development/python-modules/structlog/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix index 2aab5b16aef..4dc9c3c79bc 100644 --- a/pkgs/development/python-modules/structlog/default.nix +++ b/pkgs/development/python-modules/structlog/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, fetchpatch , pytest , pretend , freezegun @@ -16,6 +17,14 @@ buildPythonPackage rec { sha256 = "6980001045abd235fa12582222627c19b89109e58b85eb77d5a5abc778df6e20"; }; + patches = [ + # Fix tests for pytest 3.3 + (fetchpatch { + url = "https://github.com/hynek/structlog/commit/22f0ae50607a0cb024361599f84610ce290deb99.patch"; + sha256 = "03622i13ammkpyrdk48kimbz94gbkpcmdpy0kj2z09m1kp6q2ljv"; + }) + ]; + checkInputs = [ pytest pretend freezegun ]; propagatedBuildInputs = [ simplejson ]; @@ -29,4 +38,4 @@ buildPythonPackage rec { homepage = http://www.structlog.org/; license = lib.licenses.asl20; }; -} \ No newline at end of file +} From 665a0d28361507ead24998d0b17edbc7ecc828cb Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 2 Sep 2017 02:59:29 +0200 Subject: [PATCH 03/54] =?UTF-8?q?chrome-gnome-shell:=207d99523=20=E2=86=92?= =?UTF-8?q?=209?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extensions/chrome-gnome-shell/default.nix | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index bda356cf4c3..ffdf58ec5f5 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -1,31 +1,33 @@ -{stdenv, lib, python, dbus, fetchgit, cmake, coreutils, jq, gobjectIntrospection, python27Packages, makeWrapper, gnome3, wrapGAppsHook}: +{stdenv, fetchurl, cmake, ninja, jq, python3, gnome3, wrapGAppsHook}: -stdenv.mkDerivation rec { -name="chrome-gnome-shell"; - src = fetchgit { - url = "git://git.gnome.org/chrome-gnome-shell"; - rev = "7d99523e90805cb65027cc2f5f1191a957dcf276"; - sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc"; +let + version = "9"; + + inherit (python3.pkgs) python pygobject3 requests; +in stdenv.mkDerivation rec { + name = "chrome-gnome-shell-${version}"; + + src = fetchurl { + url = "mirror://gnome/sources/chrome-gnome-shell/${version}/${name}.tar.xz"; + sha256 = "0j6lzlp3jvkpnkk8s99y3m14xiq94rjwjzy2pbfqgv084ahzmz8i"; }; - buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection - python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook]; - - preConfigure = '' - mkdir build usr etc - cd build - ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../ - substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc" - ''; - - postInstall = '' - rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json - rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json - wrapProgram $out/usr/bin/chrome-gnome-shell \ - --prefix PATH : '"${dbus}/bin"' \ - --prefix PATH : '"${gnome3.gnome_shell}/bin"' \ - --prefix PYTHONPATH : "$PYTHONPATH" + nativeBuildInputs = [ cmake ninja jq wrapGAppsHook ]; + buildInputs = [ gnome3.gnome_shell python pygobject3 requests ]; + preConfigure = '' + substituteInPlace CMakeLists.txt --replace "/etc" "$out/etc" ''; + # cmake setup hook changes /etc/opt into /var/empty + dontFixCmake = true; + cmakeFlags = [ "-DBUILD_EXTENSION=OFF" ]; + wrapPrefixVariables = [ "PYTHONPATH" ]; + + meta = with stdenv.lib; { + description = "GNOME Shell integration for Chrome"; + license = licenses.gpl3; + maintainers = gnome3.maintainers; + platforms = platforms.linux; + }; } From 38b6d7b60ea32c7a6ea6234e72c1ad3249fc70a0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 13 Jan 2018 15:18:47 +0100 Subject: [PATCH 04/54] nixos/chrome-gnome-shell: init --- nixos/modules/module-list.nix | 1 + .../desktops/gnome3/chrome-gnome-shell.nix | 27 +++++++++++++++++++ .../extensions/chrome-gnome-shell/default.nix | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 8d329b5b4b2..8cd557ea202 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -200,6 +200,7 @@ ./services/desktops/dleyna-server.nix ./services/desktops/geoclue2.nix ./services/desktops/gnome3/at-spi2-core.nix + ./services/desktops/gnome3/chrome-gnome-shell.nix ./services/desktops/gnome3/evolution-data-server.nix ./services/desktops/gnome3/gnome-disks.nix ./services/desktops/gnome3/gnome-documents.nix diff --git a/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix new file mode 100644 index 00000000000..2740a22c7ca --- /dev/null +++ b/nixos/modules/services/desktops/gnome3/chrome-gnome-shell.nix @@ -0,0 +1,27 @@ +# Chrome GNOME Shell native host connector. +{ config, lib, pkgs, ... }: + +with lib; + +{ + ###### interface + options = { + services.gnome3.chrome-gnome-shell.enable = mkEnableOption '' + Chrome GNOME Shell native host connector, a DBus service + allowing to install GNOME Shell extensions from a web browser. + ''; + }; + + + ###### implementation + config = mkIf config.services.gnome3.chrome-gnome-shell.enable { + environment.etc = { + "chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/chromium/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + "opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json".source = "${pkgs.chrome-gnome-shell}/etc/opt/chrome/native-messaging-hosts/org.gnome.chrome_gnome_shell.json"; + }; + + environment.systemPackages = [ pkgs.chrome-gnome-shell ]; + + services.dbus.packages = [ pkgs.chrome-gnome-shell ]; + }; +} diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index ffdf58ec5f5..9fc635b2190 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -26,6 +26,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME Shell integration for Chrome"; + longDescription = '' + To use the integration, install the browser extension, and then set to true. + ''; license = licenses.gpl3; maintainers = gnome3.maintainers; platforms = platforms.linux; From 062cafab8cffa984f6e8b1a287d6a66c83238801 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rostislav=20Bene=C5=A1?= Date: Sat, 13 Jan 2018 15:20:01 +0100 Subject: [PATCH 05/54] firefox: add option for chrome-gnome-shell native messaging host --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++- .../desktops/gnome-3/extensions/chrome-gnome-shell/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index dd4cb439c1f..010f60881b5 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,7 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ , esteidfirefoxplugin , vlc_npapi -, browserpass +, browserpass, chrome-gnome-shell , libudev , kerberos }: @@ -63,6 +63,7 @@ let nativeMessagingHosts = ([ ] ++ lib.optional (cfg.enableBrowserpass or false) browserpass + ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ extraNativeMessagingHosts ); libs = (if ffmpegSupport then [ ffmpeg ] else with gst_all; [ gstreamer gst-plugins-base ]) diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index 9fc635b2190..11d891b6743 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GNOME Shell integration for Chrome"; longDescription = '' - To use the integration, install the browser extension, and then set to true. + To use the integration, install the browser extension, and then set to true. For Firefox based browsers, you will also need to build the wrappers with set to true. ''; license = licenses.gpl3; maintainers = gnome3.maintainers; From 4340ee75fecf54fba0a6facffffd53eff1fa6e8b Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Sun, 14 Jan 2018 14:05:08 +0000 Subject: [PATCH 06/54] yajl: small clean up - ruby dependency is no longer needed - cmake belongs in nativeBuildInputs --- pkgs/development/libraries/yajl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/yajl/default.nix b/pkgs/development/libraries/yajl/default.nix index c6ab03df10a..02e1e96cabd 100644 --- a/pkgs/development/libraries/yajl/default.nix +++ b/pkgs/development/libraries/yajl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ruby }: +{ stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { name = "yajl-2.1.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0f6yrjc05aa26wfi7lqn2gslm19m6rm81b30ksllpkappvh162ji"; }; - buildInputs = [ cmake ruby ]; + nativeBuildInputs = [ cmake ]; meta = { description = "Yet Another JSON Library"; From 9af5be98af98f52b9a0739c3d84202d3f7c7e999 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Jan 2018 13:17:45 -0600 Subject: [PATCH 07/54] debian-patches.sh: patch-tracker is long-since dead, fix to use sources? --- maintainers/scripts/debian-patches.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/maintainers/scripts/debian-patches.sh b/maintainers/scripts/debian-patches.sh index 78678473a49..b4923fb537e 100755 --- a/maintainers/scripts/debian-patches.sh +++ b/maintainers/scripts/debian-patches.sh @@ -4,11 +4,13 @@ # Usage $0 debian-patches.txt debian-patches.nix # An example input and output files can be found in applications/graphics/xara/ -DEB_URL=http://patch-tracker.debian.org/patch/series/dl +DEB_URL=https://sources.debian.org/data/main declare -a deb_patches mapfile -t deb_patches < $1 -prefix="${DEB_URL}/${deb_patches[0]}" +# First letter +deb_prefix="${deb_patches[0]:0:1}" +prefix="${DEB_URL}/${deb_prefix}/${deb_patches[0]}/debian/patches" if [[ -n "$2" ]]; then exec 1> $2 From ea51cd255d5e144d881f26a005027587bd5fb38d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Jan 2018 13:22:34 -0600 Subject: [PATCH 08/54] gamin: fix debian-patches to use live URL Also apparently 0.1.10-4 is gone, so "fixed" to 0.1.10-4.1 --- pkgs/development/libraries/gamin/debian-patches.nix | 2 +- pkgs/development/libraries/gamin/debian-patches.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix index f784b8ccfee..a8f334fb3c3 100644 --- a/pkgs/development/libraries/gamin/debian-patches.nix +++ b/pkgs/development/libraries/gamin/debian-patches.nix @@ -1,6 +1,6 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4.1"; + prefix = "https://sources.debian.org/data/main/g/gamin/0.1.10-4.1/debian/patches"; in [ { diff --git a/pkgs/development/libraries/gamin/debian-patches.txt b/pkgs/development/libraries/gamin/debian-patches.txt index 4faad71d44d..46d2420b21e 100644 --- a/pkgs/development/libraries/gamin/debian-patches.txt +++ b/pkgs/development/libraries/gamin/debian-patches.txt @@ -1,2 +1,2 @@ -gamin/0.1.10-4 +gamin/0.1.10-4.1 17_deprecated_const_return.patch From fca39a3814f27674770cc11b202763e85f843576 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 17 Jan 2018 13:25:18 -0600 Subject: [PATCH 09/54] plotutils: regenerate debian patch url's, apply few more don't include the format-security patch, because it breaks a test: https://bugs.gentoo.org/618708 --- .../graphics/plotutils/debian-patches.nix | 30 ++++++++++++++++++- .../graphics/plotutils/debian-patches.txt | 9 +++++- pkgs/tools/graphics/plotutils/default.nix | 12 +++----- 3 files changed, 41 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix index 0615d1f52e1..d7c60a11eb6 100644 --- a/pkgs/tools/graphics/plotutils/debian-patches.nix +++ b/pkgs/tools/graphics/plotutils/debian-patches.nix @@ -1,14 +1,42 @@ # Generated by debian-patches.sh from debian-patches.txt let - prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-3"; + prefix = "https://sources.debian.org/data/main/p/plotutils/2.6-9/debian/patches"; in [ + { + url = "${prefix}/01_AC_PROG_CXX.diff"; + sha256 = "0r7xgwbk2yqs7b29gwhr8pnbqvy3a3x698j17s4yg501ragw1gqv"; + } { url = "${prefix}/10_repair_postscript"; sha256 = "01v4a8mdhgsjxbf9a2xppx2lb05lp818v8afp5x2njv64wpgla8p"; } + { + url = "${prefix}/11_manpages_sb_macro"; + sha256 = "01vvhznw5z7lb7afwgw53cwg8w676s4v30kychlrl8kn5yks94qs"; + } + { + url = "${prefix}/14_manpage_spline"; + sha256 = "1xp3cx9y9njp5wp40dkp7rwd2flkiik2gb08nh4516vkm73avfrd"; + } + { + url = "${prefix}/20_svg_attribute_syntax"; + sha256 = "0vy089w00x2zh87igv3dcqq7kggqxpc4javb694pa5xl5bvddnqk"; + } + { + url = "${prefix}/21_plot2svg_test.diff"; + sha256 = "0lv8hj9fiqj6z72pnaw3imk3164n1kcy5ym0j9jl2pn3a19p1jmb"; + } { url = "${prefix}/25_libpng15"; sha256 = "0l640rcsgc2mwpk7iqm0cf3b0gfcdgcn9wg4x88gaqxzx9rriph0"; } + { + url = "${prefix}/30_hershey_glyphs"; + sha256 = "0n7rn6ln9ikzq2dialif58ag5pch7q7zqd5zcsxxdyyasx4s5gm2"; + } + { + url = "${prefix}/35_spline.test.error.diff"; + sha256 = "1kqj1n8myk8xmglj6qcybj34zm4kpn6aw320jbpqhblkgp7m0fb1"; + } ] diff --git a/pkgs/tools/graphics/plotutils/debian-patches.txt b/pkgs/tools/graphics/plotutils/debian-patches.txt index 8694be8edd7..c28d96fdd5b 100644 --- a/pkgs/tools/graphics/plotutils/debian-patches.txt +++ b/pkgs/tools/graphics/plotutils/debian-patches.txt @@ -1,3 +1,10 @@ -plotutils/2.6-2 +plotutils/2.6-9 +01_AC_PROG_CXX.diff 10_repair_postscript +11_manpages_sb_macro +14_manpage_spline +20_svg_attribute_syntax +21_plot2svg_test.diff 25_libpng15 +30_hershey_glyphs +35_spline.test.error.diff diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index 219bfdf8c14..85685e0b048 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libpng }: +{ fetchurl, stdenv, libpng, autoreconfHook }: # debian splits this package into plotutils and libplot2c2 @@ -13,14 +13,8 @@ stdenv.mkDerivation rec { sha256 = "1arkyizn5wbgvbh53aziv3s6lmd3wm9lqzkhxb3hijlp1y124hjg"; }; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ libpng ]; - - # disable failing test on i686 - # https://lists.gnu.org/archive/html/bug-plotutils/2016-04/msg00002.html - prePatch = stdenv.lib.optionalString stdenv.isi686 '' - substituteInPlace test/Makefile.in --replace 'spline.test' ' ' - ''; - patches = map fetchurl (import ./debian-patches.nix); configureFlags = "--enable-libplotter"; # required for pstoedit @@ -29,6 +23,8 @@ stdenv.mkDerivation rec { doCheck = true; + enableParallelBuilding = true; + meta = { description = "Powerful C/C++ library for exporting 2D vector graphics"; From 9798c74313625906e2d830d053a86608f5ca03fc Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Jan 2018 10:24:06 -0600 Subject: [PATCH 10/54] perf-tools: 20160418 -> 20171219 --- pkgs/os-specific/linux/perf-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/perf-tools/default.nix b/pkgs/os-specific/linux/perf-tools/default.nix index 873cb7b2b7d..31f86965ee8 100644 --- a/pkgs/os-specific/linux/perf-tools/default.nix +++ b/pkgs/os-specific/linux/perf-tools/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchFromGitHub, perl }: stdenv.mkDerivation { - name = "perf-tools-20160418"; + name = "perf-tools-20171219"; src = fetchFromGitHub { owner = "brendangregg"; repo = "perf-tools"; - rev = "5a511f5f775cfbc0569e6039435361cecd22dd86"; - sha256 = "1ab735idi0h62yvhzd7822jj3555vygixv4xjrfrdvi8d2hhz6qn"; + rev = "98d42a2a1493d2d1c651a5c396e015d4f082eb20"; + sha256 = "09qnss9pd4kr6qadvp62m2g8sfrj86fksi1rr8m8w4314pzfb93c"; }; buildInputs = [ perl ]; From fc4535b6e8383604046f182431f70b1863ceb066 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Jan 2018 10:40:18 -0600 Subject: [PATCH 11/54] Revert "perf: inherit makeFlags from kernel" https://github.com/NixOS/nixpkgs/issues/34013 This reverts commit 92083c3f404620b1e0260946f3330848fdbc1e6b. --- pkgs/os-specific/linux/kernel/perf.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 1936f6578b6..0194099742f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -11,7 +11,7 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src makeFlags; + inherit (kernel) src; preConfigure = '' cd tools/perf @@ -39,6 +39,10 @@ stdenv.mkDerivation { "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" ]; + makeFlags = if stdenv.hostPlatform == stdenv.buildPlatform + then null + else "CROSS_COMPILE=${stdenv.cc.prefix}"; + installFlags = "install install-man ASCIIDOC8=1"; preFixup = '' From 4ca9b43f124efcce2c76d9a5a8cffeec0d821d87 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Jan 2018 10:46:46 -0600 Subject: [PATCH 12/54] perf: fix cross evaluation --- pkgs/os-specific/linux/kernel/perf.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 0194099742f..e3dbba0e76e 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { makeFlags = if stdenv.hostPlatform == stdenv.buildPlatform then null - else "CROSS_COMPILE=${stdenv.cc.prefix}"; + else "CROSS_COMPILE=${stdenv.cc.targetPrefix}"; installFlags = "install install-man ASCIIDOC8=1"; From c278dd0b9dd893d0a03a22286280847b38a1ee06 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 18 Jan 2018 22:12:56 +0100 Subject: [PATCH 13/54] bustle: re-enable hgettext support hgettext 0.1.31.0 builds again --- pkgs/development/haskell-modules/configuration-common.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b65bc23cfa4..f1d0b302b92 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -543,11 +543,8 @@ self: super: { # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; - # Install icons and metadata, remove broken hgettext dependency. - # https://github.com/vasylp/hgettext/issues/10 + # Install icons, metadata and cli program. bustle = overrideCabal super.bustle (drv: { - configureFlags = drv.configureFlags or [] ++ ["-f-hgettext"]; - executableHaskellDepends = pkgs.lib.remove self.hgettext drv.executableHaskellDepends; buildDepends = [ pkgs.libpcap ]; buildTools = with pkgs; [ gettext perl help2man intltool ]; doCheck = false; # https://github.com/wjt/bustle/issues/6 From ef07118a809f08d59d3f93c62b03ffbc7614aeba Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 13 Sep 2017 08:34:03 +0200 Subject: [PATCH 14/54] containerd: 0.2.9 -> 1.0.1 Update containerd to its latest release ! Signed-off-by: Vincent Demeester --- .../virtualization/containerd/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 3316633e437..86b6535e539 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -1,23 +1,38 @@ { stdenv, lib, fetchFromGitHub, removeReferencesTo -, go, libapparmor, apparmor-parser, libseccomp }: +, go, libapparmor, apparmor-parser, libseccomp, btrfs-progs }: with lib; stdenv.mkDerivation rec { name = "containerd-${version}"; - version = "0.2.9"; + version = "1.0.1"; src = fetchFromGitHub { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "0rix0mv203fn3rcxmpqdpb54l1a0paqplg2xgldpd943qi1rm552"; + sha256 = "0kfafqi66yp4qy738pl11f050hfrx9m4kc670qpx7fmf9ii7q6p2"; }; - buildInputs = [ removeReferencesTo go ]; + hardeningDisable = [ "fortify" ]; + + buildInputs = [ removeReferencesTo go btrfs-progs ]; + buildFlags = "VERSION=v${version}"; + + BUILDTAGS = [] + ++ optional (btrfs-progs == null) "no_btrfs"; + + preConfigure = '' + # Extract the source + cd "$NIX_BUILD_TOP" + mkdir -p "go/src/github.com/containerd" + mv "$sourceRoot" "go/src/github.com/containerd/containerd" + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH +''; preBuild = '' - ln -s $(pwd) vendor/src/github.com/containerd/containerd + cd go/src/github.com/containerd/containerd + patchShebangs . ''; installPhase = '' From 9047a7dd33030654d83f48fbb131dae984fcead3 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 18 Jan 2018 16:37:47 -0500 Subject: [PATCH 15/54] Move packageSourceOverrides to haskellLib --- pkgs/development/haskell-modules/lib.nix | 12 ++++++++++++ .../haskell-modules/make-package-set.nix | 14 ++------------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index bb2cf8b36f0..af1c4d5b0e8 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -40,6 +40,18 @@ rec { overrideScope = scope: overrideCabal (drv.overrideScope scope) f; }; + # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet + # Given a set whose values are either paths or version strings, produces + # a package override set (i.e. (self: super: { etc. })) that sets + # the packages named in the input set to the corresponding versions + packageSourceOverrides = + overrides: self: super: pkgs.lib.mapAttrs (name: src: + let isPath = x: builtins.substring 0 1 (toString x) == "/"; + generateExprs = if isPath src + then self.callCabal2nix + else self.callHackage; + in generateExprs name src {}) overrides; + /* doCoverage modifies a haskell package to enable the generation and installation of a coverage report. diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index b91d73c9748..dc4d3f82bde 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -139,6 +139,8 @@ in package-set { inherit pkgs stdenv callPackage; } self // { inherit mkDerivation callPackage haskellSrc2nix hackage2nix; + inherit (haskellLib) packageSourceOverrides; + callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. @@ -155,18 +157,6 @@ in package-set { inherit pkgs stdenv callPackage; } self // { }; }) args) (_: { inherit src; }); - # : Map Name (Either Path VersionNumber) -> HaskellPackageOverrideSet - # Given a set whose values are either paths or version strings, produces - # a package override set (i.e. (self: super: { etc. })) that sets - # the packages named in the input set to the corresponding versions - packageSourceOverrides = - overrides: self: super: pkgs.lib.mapAttrs (name: src: - let isPath = x: builtins.substring 0 1 (toString x) == "/"; - generateExprs = if isPath src - then self.callCabal2nix - else self.callHackage; - in generateExprs name src {}) overrides; - # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) # , overrides : Defaulted (HaskellPackageOverrideSet) From 11e91c61efa46e298d9a9b1d5fe132d9f28b2024 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 18 Jan 2018 22:55:56 +0100 Subject: [PATCH 16/54] minio: 2018-01-02T23-07-00Z -> 2018-01-18T20-33-21Z Critical security fix that fixes an issue that allows bypassing authentication. See: https://blog.minio.io/minio-release-jan-18-2018-security-advisory-4c64ca87721b --- pkgs/servers/minio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index a1ea5edaa6d..b553a202286 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { name = "minio-${version}"; - version = "2018-01-02T23-07-00Z"; + version = "2018-01-18T20-33-21Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "1bpiy6q9782mxs5f5lzw6c7zx83s2i68rf5f65xa9z7cyl19si74"; + sha256 = "102rilh1kjf9y6g6y83ikk42w7g1sbld11md3wm54hynyh956xrs"; }; goPackagePath = "github.com/minio/minio"; From 1dade8665a6d38fbab757f336aea1010ce1c811f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 18 Jan 2018 23:58:28 +0200 Subject: [PATCH 17/54] hdparm: 9.52 -> 9.53 --- pkgs/os-specific/linux/hdparm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/hdparm/default.nix b/pkgs/os-specific/linux/hdparm/default.nix index 0f0eab1fa20..0f794c315e5 100644 --- a/pkgs/os-specific/linux/hdparm/default.nix +++ b/pkgs/os-specific/linux/hdparm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hdparm-9.52"; + name = "hdparm-9.53"; src = fetchurl { url = "mirror://sourceforge/hdparm/${name}.tar.gz"; - sha256 = "1djgxhfadd865dcrl6dp7dvjxpaisy7mk17mbdbglwg24ga9qhn3"; + sha256 = "1rb5086gp4l1h1fn2nk10ziqxjxigsd0c1zczahwc5k9vy8zawr6"; }; From bfd5b6fb7936daa86a61cdd127646cf452c648ed Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Thu, 18 Jan 2018 14:56:50 -0800 Subject: [PATCH 18/54] gdbgui: 0.9.1.0 -> 0.10.1.0 --- .../development/tools/misc/gdbgui/default.nix | 4 +- .../tools/misc/gdbgui/requirements.nix | 92 +++---------------- 2 files changed, 14 insertions(+), 82 deletions(-) diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/development/tools/misc/gdbgui/default.nix index 3562af7a6b8..64b87300cbe 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/development/tools/misc/gdbgui/default.nix @@ -5,14 +5,14 @@ in python27Packages.buildPythonApplication rec { name = "${pname}-${version}"; pname = "gdbgui"; - version = "0.9.1.0"; + version = "0.10.1.0"; buildInputs = [ gdb ]; propagatedBuildInputs = builtins.attrValues deps.packages; src = python27Packages.fetchPypi { inherit pname version; - sha256 = "0ybgkk4h9zwhbx5d0j0fmfzxxgg8f6apm8v7djavm0ldpr6f5z26"; + sha256 = "1585vjbrc8r0a7069aism66c0kkj91yklpdblb9c34570zbpabvs"; }; postPatch = '' diff --git a/pkgs/development/tools/misc/gdbgui/requirements.nix b/pkgs/development/tools/misc/gdbgui/requirements.nix index d3c7f31eaeb..13978645c29 100644 --- a/pkgs/development/tools/misc/gdbgui/requirements.nix +++ b/pkgs/development/tools/misc/gdbgui/requirements.nix @@ -113,13 +113,12 @@ let "Flask-SocketIO" = python.mkDerivation { - name = "Flask-SocketIO-2.9.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/e7/e0/c50a1b47498897b228764667cd006ca7d45374b79a8e5e2fa3e03ba4717c/Flask-SocketIO-2.9.2.tar.gz"; sha256 = "0fb686f9d85f4f34dc6609f62fa96fe15176a6ea7e6179149d319fabc54c543b"; }; + name = "Flask-SocketIO-2.9.3"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/a0/ac/4024b73e071d5a000a998d6f26ba0a090011d5abdc7aa41f2774173c3276/Flask-SocketIO-2.9.3.tar.gz"; sha256 = "df23f790db8529c543bd0b54165215c342cf6955a4a1f605650e759197a46d59"; }; doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ self."Flask" - self."python-engineio" self."python-socketio" ]; meta = with pkgs.stdenv.lib; { @@ -179,15 +178,15 @@ let "Werkzeug" = python.mkDerivation { - name = "Werkzeug-0.12.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/56/41/c095a77eb2dd69bf278dd664a97d3416af04e9ba1a00b8c138f772741d31/Werkzeug-0.12.2.tar.gz"; sha256 = "903a7b87b74635244548b30d30db4c8947fe64c5198f58899ddcd3a13c23bb26"; }; + name = "Werkzeug-0.14.1"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/9f/08/a3bb1c045ec602dc680906fc0261c267bed6b3bb4609430aff92c3888ec8/Werkzeug-0.14.1.tar.gz"; sha256 = "c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c"; }; doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ ]; meta = with pkgs.stdenv.lib; { - homepage = "http://werkzeug.pocoo.org/"; + homepage = "https://www.palletsprojects.org/p/werkzeug/"; license = licenses.bsdOriginal; - description = "The Swiss Army knife of Python web development"; + description = "The comprehensive WSGI web application library."; }; }; @@ -208,56 +207,6 @@ let - "enum-compat" = python.mkDerivation { - name = "enum-compat-0.0.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/95/6e/26bdcba28b66126f66cf3e4cd03bcd63f7ae330d29ee68b1f6b623550bfa/enum-compat-0.0.2.tar.gz"; sha256 = "939ceff18186a5762ae4db9fa7bfe017edbd03b66526b798dd8245394c8a4192"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."enum34" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://github.com/jstasiak/enum-compat"; - license = licenses.mit; - description = "enum/enum34 compatibility package"; - }; - }; - - - - "enum34" = python.mkDerivation { - name = "enum34-1.1.6"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/bf/3e/31d502c25302814a7c2f1d3959d2a3b3f78e509002ba91aea64993936876/enum34-1.1.6.tar.gz"; sha256 = "8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ ]; - meta = with pkgs.stdenv.lib; { - homepage = "https://bitbucket.org/stoneleaf/enum34"; - license = licenses.bsdOriginal; - description = "Python 3.4 Enum backported to 3.3, 3.2, 3.1, 2.7, 2.6, 2.5, and 2.4"; - }; - }; - - - - "eventlet" = python.mkDerivation { - name = "eventlet-0.21.0"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/cb/ec/eae487c106a7e38f86ac4cadafb3eec77d29996f64ca0c7015067538069b/eventlet-0.21.0.tar.gz"; sha256 = "08faffab88c1b08bd53ea28bf084a572c89f7e7648bd9d71e6116ac17a51a15d"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."enum-compat" - self."greenlet" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://eventlet.net"; - license = licenses.mit; - description = "Highly concurrent networking library"; - }; - }; - - - "gevent" = python.mkDerivation { name = "gevent-1.2.2"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/1b/92/b111f76e54d2be11375b47b213b56687214f258fd9dae703546d30b837be/gevent-1.2.2.tar.gz"; sha256 = "4791c8ae9c57d6f153354736e1ccab1e2baf6c8d9ae5a77a9ac90f41e2966b2d"; }; @@ -306,8 +255,8 @@ let "pygdbmi" = python.mkDerivation { - name = "pygdbmi-0.7.4.4"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/bb/1c/8c8cbd0bb5cf513a905e3ca461cfad578e708a74417182f2a00943136f83/pygdbmi-0.7.4.4.tar.gz"; sha256 = "34cd00925ca98aed87decb6a0451fa094cf31386dc457b47a62bcbf8d905a3d3"; }; + name = "pygdbmi-0.8.2.0"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/4e/34/a8c86d85e0d3d8df2c289657a55c19408dbdbf0b1468859e7f1a745ae8ff/pygdbmi-0.8.2.0.tar.gz"; sha256 = "47cece65808ca42edf6966ac48e2aedca7ae1c675c4d2f0d001c7f3a7fa245fe"; }; doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ ]; @@ -320,26 +269,9 @@ let - "pypugjs" = python.mkDerivation { - name = "pypugjs-4.2.2"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/21/bb/d541110bd5a5c1ecd9dab2778dc9a39ca5a5e9962845e9d3e598962ee3ca/pypugjs-4.2.2.tar.gz"; sha256 = "c99a72a78766d9462d94379a6b489f9864ecdeeeeaf8d0f34b2ce04963f6ec8c"; }; - doCheck = commonDoCheck; - buildInputs = commonBuildInputs; - propagatedBuildInputs = [ - self."six" - ]; - meta = with pkgs.stdenv.lib; { - homepage = "http://github.com/matannoam/pypugjs"; - license = licenses.mit; - description = "PugJS syntax template adapter for Django, Jinja2, Mako and Tornado templates - copy of PyJade with the name changed"; - }; - }; - - - "python-engineio" = python.mkDerivation { - name = "python-engineio-2.0.1"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/ae/61/199d5693cb077d12fb82baa9505215e0654e50e3cd4d5f3331029312b55f/python-engineio-2.0.1.tar.gz"; sha256 = "266fca0c4ed4576c873458ef06fdc7ae20942210f5e9c5f9bd039debcc672c30"; }; + name = "python-engineio-2.0.2"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/e5/91/f6fd80298e68b4ca22a1a9cc3091116e2fef22fd8fb017ad9e5c6ec6ddcc/python-engineio-2.0.2.tar.gz"; sha256 = "46c710a72c3b2a8511b0d7963c46e200010f8ea3eb0721ce15603d0f23e993c4"; }; doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ @@ -355,8 +287,8 @@ let "python-socketio" = python.mkDerivation { - name = "python-socketio-1.8.3"; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/39/23/b0955fe05bed6d6621754d3b5043e5478cf57646e1e4c1cf55a6fc3f2acb/python-socketio-1.8.3.tar.gz"; sha256 = "822433bcda86924367bccfc64083bae60bd64c89c8fc07f79530458ce5a6dcea"; }; + name = "python-socketio-1.8.4"; + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/58/a9/52af6a7ad0805977afc838ed394f8d26d078ef61e8c1bdd632801c58ef3a/python-socketio-1.8.4.tar.gz"; sha256 = "13807ce17e85371d15b31295a43b1fac1c0dba1eb5fc233353a3efd53aa122cc"; }; doCheck = commonDoCheck; buildInputs = commonBuildInputs; propagatedBuildInputs = [ From 287415ad526c9c5e10950c5ddac12db93a86e6e2 Mon Sep 17 00:00:00 2001 From: Lengyel Balazs Date: Thu, 18 Jan 2018 22:49:49 +0100 Subject: [PATCH 19/54] wine-stable: 2.0.3 -> 3.0 --- pkgs/misc/emulators/wine/sources.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index cb0561f7655..b4f3d37c7a5 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -13,9 +13,9 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "2.0.3"; - url = "https://dl.winehq.org/wine/source/2.0/wine-${version}.tar.xz"; - sha256 = "0mmyc94r5drffir8zr8jx6iawhgfzjk96fj494aa18vhz1jcc4d8"; + version = "3.0"; + url = "https://dl.winehq.org/wine/source/3.0/wine-${version}.tar.xz"; + sha256 = "1v7vq9iinkscbq6wg85fb0d2137660fg2nk5iabxkl2wr850asil"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { From 7eb4844cf22b6b2e111481110b1771ffaa035c5c Mon Sep 17 00:00:00 2001 From: Alexander Oloo Date: Fri, 12 Jan 2018 07:03:25 +0200 Subject: [PATCH 20/54] pixie: name binary `pixie` and allow macOS build - Pixie supports macOS. Nix package should too. - Updated executable name as discussed in pixie-lang/pixie/issues/455. closes #33771 --- pkgs/development/interpreters/pixie/default.nix | 8 ++++---- pkgs/development/interpreters/pixie/dust.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index b196af8e3ae..9915b012d2a 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -63,15 +63,15 @@ let mkdir -p $out/share $out/bin cp pixie-src/pixie-vm $out/share/pixie-vm cp -R pixie-src/pixie $out/share/pixie - makeWrapper $out/share/pixie-vm $out/bin/pixie-vm \ + makeWrapper $out/share/pixie-vm $out/bin/pixie \ --prefix LD_LIBRARY_PATH : ${library-path} \ --prefix C_INCLUDE_PATH : ${include-path} \ --prefix LIBRARY_PATH : ${library-path} \ --prefix PATH : ${bin-path} cat > $out/bin/pxi <&2 echo "[\$\$] WARNING: 'pxi' is a deprecated alias for 'pixie-vm', please update your scripts." - exec $out/bin/pixie-vm "\$@" + >&2 echo "[\$\$] WARNING: 'pxi' and 'pixie-vm' are deprecated aliases for 'pixie', please update your scripts." + exec $out/bin/pixie "\$@" EOF chmod +x $out/bin/pxi ''; @@ -79,7 +79,7 @@ let description = "A clojure-like lisp, built with the pypy vm toolkit"; homepage = https://github.com/pixie-lang/pixie; license = stdenv.lib.licenses.lgpl3; - platforms = ["x86_64-linux" "i686-linux"]; + platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; }; }; in build (builtins.getAttr variant variants) diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix index 34b47113193..4a7f3423def 100644 --- a/pkgs/development/interpreters/pixie/dust.nix +++ b/pkgs/development/interpreters/pixie/dust.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { description = "Provides tooling around pixie, e.g. a nicer repl, running tests and fetching dependencies"; homepage = src.meta.homepage; license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; }; } From 25182f4b1c6dccae340b1a10fa090b7011c78c4b Mon Sep 17 00:00:00 2001 From: Herwig Hochleitner Date: Sun, 29 Oct 2017 02:05:07 +0200 Subject: [PATCH 21/54] pixie: add maintainer --- pkgs/development/interpreters/pixie/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix index 9915b012d2a..d41977b4f5c 100644 --- a/pkgs/development/interpreters/pixie/default.nix +++ b/pkgs/development/interpreters/pixie/default.nix @@ -80,6 +80,7 @@ let homepage = https://github.com/pixie-lang/pixie; license = stdenv.lib.licenses.lgpl3; platforms = ["x86_64-linux" "i686-linux" "x86_64-darwin"]; + maintainers = with stdenv.lib.maintainers; [ bendlas ]; }; }; in build (builtins.getAttr variant variants) From 424fc54243ce5d4a4fbf14f175616bb4a3bddfaf Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 11 Jan 2018 18:46:49 +0200 Subject: [PATCH 22/54] nixos/release.nix: Clean some syntax --- nixos/release.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index e69a7f6d6f8..2f77013ac52 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -90,13 +90,13 @@ let makeNetboot = config: let - config_evaled = import lib/eval-config.nix config; - build = config_evaled.config.system.build; - kernelTarget = config_evaled.pkgs.stdenv.platform.kernelTarget; + configEvaled = import lib/eval-config.nix config; + build = configEvaled.config.system.build; + kernelTarget = configEvaled.pkgs.stdenv.platform.kernelTarget; in pkgs.symlinkJoin { - name="netboot"; - paths=[ + name = "netboot"; + paths = [ build.netbootRamdisk build.kernel build.netbootIpxeScript From eb57d6d08997a41b59fe97b5815baf60d92e063a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 11 Jan 2018 18:47:23 +0200 Subject: [PATCH 23/54] nixos/release.nix: Add preferLocalBuild to makeNetboot result --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index 2f77013ac52..521bf8f5943 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -107,6 +107,7 @@ let echo "file initrd $out/initrd" >> $out/nix-support/hydra-build-products echo "file ipxe $out/netboot.ipxe" >> $out/nix-support/hydra-build-products ''; + preferLocalBuild = true; }; From 4fd0a3a43d6a4be050e786706e258707049d76d9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Thu, 11 Jan 2018 18:16:17 +0200 Subject: [PATCH 24/54] nixos/release.nix: More refactoring for multi-arch Currently, even if you pass supportedSystems = [ "aarch64-linux" ] you end up with e.g. `nixos.tests.docker` which actually silently runs on x86_64-linux. Using the new callTestOnTheseSystems fixes that. As a side-effect, this also causes a rename of `nixos.tests.docker` -> `nixos.tests.docker.x86_64-linux`, which is IMHO a good thing since it's makes them consistent with the rest of the tests. --- nixos/release-combined.nix | 2 +- nixos/release.nix | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 34a413f1ac3..6583b13b844 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -80,7 +80,7 @@ in rec { (all nixos.tests.boot.uefiUsb) (all nixos.tests.boot-stage1) (all nixos.tests.hibernate) - nixos.tests.docker + nixos.tests.docker.x86_64-linux (all nixos.tests.ecryptfs) (all nixos.tests.env) (all nixos.tests.ipv6) diff --git a/nixos/release.nix b/nixos/release.nix index 521bf8f5943..ad333780038 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -16,7 +16,8 @@ let inherit system; } // args); - callTest = fn: args: forAllSystems (system: hydraJob (importTest fn args system)); + callTestOnTheseSystems = systems: fn: args: forTheseSystems systems (system: hydraJob (importTest fn args system)); + callTest = callTestOnTheseSystems supportedSystems; callSubTests = fn: args: let discover = attrs: let @@ -228,7 +229,7 @@ in rec { tests.blivet = callTest tests/blivet.nix {}; tests.boot = callSubTests tests/boot.nix {}; tests.boot-stage1 = callTest tests/boot-stage1.nix {}; - tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); + tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; tests.chromium = (callSubTests tests/chromium.nix { system = "x86_64-linux"; }).stable; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; @@ -243,12 +244,12 @@ in rec { tests.containers-hosts = callTest tests/containers-hosts.nix {}; tests.containers-macvlans = callTest tests/containers-macvlans.nix {}; tests.couchdb = callTest tests/couchdb.nix {}; - tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); - tests.docker-edge = hydraJob (import tests/docker-edge.nix { system = "x86_64-linux"; }); + tests.docker = callTestOnTheseSystems ["x86_64-linux"] tests/docker.nix {}; + tests.docker-edge = callTestOnTheseSystems ["x86_64-linux"] tests/docker-edge.nix {}; tests.dovecot = callTest tests/dovecot.nix {}; - tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; + tests.dnscrypt-proxy = callTestOnTheseSystems ["x86_64-linux"] tests/dnscrypt-proxy.nix {}; tests.ecryptfs = callTest tests/ecryptfs.nix {}; - tests.etcd = hydraJob (import tests/etcd.nix { system = "x86_64-linux"; }); + tests.etcd = callTestOnTheseSystems ["x86_64-linux"] tests/etcd.nix {}; tests.ec2-nixops = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-nixops; tests.ec2-config = hydraJob (import tests/ec2.nix { system = "x86_64-linux"; }).boot-ec2-config; tests.elk = callSubTests tests/elk.nix { system = "x86_64-linux"; }; @@ -256,7 +257,7 @@ in rec { tests.ferm = callTest tests/ferm.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; - tests.fleet = hydraJob (import tests/fleet.nix { system = "x86_64-linux"; }); + tests.fleet = callTestOnTheseSystems ["x86_64-linux"] tests/fleet.nix {}; #tests.gitlab = callTest tests/gitlab.nix {}; tests.gitolite = callTest tests/gitolite.nix {}; tests.gocd-agent = callTest tests/gocd-agent.nix {}; @@ -316,7 +317,7 @@ in rec { tests.openssh = callTest tests/openssh.nix {}; tests.owncloud = callTest tests/owncloud.nix {}; tests.pam-oath-login = callTest tests/pam-oath-login.nix {}; - #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); + #tests.panamax = callTestOnTheseSystems ["x86_64-linux"] tests/panamax.nix {}; tests.peerflix = callTest tests/peerflix.nix {}; tests.php-pcre = callTest tests/php-pcre.nix {}; tests.postgresql = callSubTests tests/postgresql.nix {}; From d533cec2606790d6d99da948da4394e8dbcd2211 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Fri, 19 Jan 2018 10:00:03 +0100 Subject: [PATCH 25/54] akonadi: Fixes build --- pkgs/applications/kde/akonadi/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index bb7dac1b62a..da7cd2e8d79 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -19,13 +19,13 @@ mkDerivation { ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; - NIX_CFLAGS_COMPILE = [ - ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"'' - ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"'' - ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB="${lib.getBin mysql}/bin/mysql_install_db"'' - ''-DNIXPKGS_MYSQL_MYSQLCHECK="${lib.getBin mysql}/bin/mysqlcheck"'' - ''-DNIXPKGS_POSTGRES_PG_CTL=""'' - ''-DNIXPKGS_POSTGRES_INITDB=""'' + CXXFLAGS = [ + ''-DNIXPKGS_MYSQL_MYSQLD=\"${lib.getBin mysql}/bin/mysqld\"'' + ''-DNIXPKGS_MYSQL_MYSQLADMIN=\"${lib.getBin mysql}/bin/mysqladmin\"'' + ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB=\"${lib.getBin mysql}/bin/mysql_install_db\"'' + ''-DNIXPKGS_MYSQL_MYSQLCHECK=\"${lib.getBin mysql}/bin/mysqlcheck\"'' + ''-DNIXPKGS_POSTGRES_PG_CTL=\"\"'' + ''-DNIXPKGS_POSTGRES_INITDB=\"\"'' ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\"" From 25337209768d3126ffb4d42e3699181e0ab79e64 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Fri, 19 Jan 2018 17:40:46 +0900 Subject: [PATCH 26/54] rPackages.data_table: OpenMP support on Darwin --- pkgs/development/r-modules/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index b7b411a7dec..4510308d3e5 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -246,6 +246,7 @@ let ChemmineOB = [ pkgs.openbabel pkgs.pkgconfig ]; cit = [ pkgs.gsl_1 ]; curl = [ pkgs.curl.dev ]; + data_table = lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; diversitree = [ pkgs.gsl_1 pkgs.fftw ]; EMCluster = [ pkgs.liblapack ]; @@ -744,6 +745,11 @@ let patchPhase = "patchShebangs configure"; }); + data_table = old.data_table.overrideDerivation (attrs: { + NIX_CFLAGS_COMPILE = attrs.NIX_CFLAGS_COMPILE + + lib.optionalString stdenv.isDarwin " -fopenmp"; + }); + rpf = old.rpf.overrideDerivation (attrs: { patchPhase = "patchShebangs configure"; }); From 3b54c5f483f594c5cac7ae40e5dac6565dd3ea8d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 10 Jan 2018 02:31:21 +0100 Subject: [PATCH 27/54] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.8-3-g1ab3260 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/6aedac1525ffafaa26c6ba22081d32090879a83e. --- .../haskell-modules/hackage-packages.nix | 4583 ++++++++++++++--- 1 file changed, 3986 insertions(+), 597 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 744fed2f1b4..87066df86dc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1821,21 +1821,19 @@ self: { , containers, data-default, directory, filepath, HaXml, haxr , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc , pandoc-citeproc, pandoc-types, parsec, process, split, strict - , tagsoup, temporary, transformers + , tagsoup, temporary, text, transformers }: mkDerivation { pname = "BlogLiterately"; - version = "0.8.4.3"; - sha256 = "088pfqgp1m1qv7qdi7h4vvflhlsnay40zg6vnsa3nykyvkm9sy2n"; - revision = "1"; - editedCabalFile = "01fpw6xqfdrhm26frf1mm05spk2zp6f3swl48mk4pz3zbffaskps"; + version = "0.8.5"; + sha256 = "0xcliysj78z51vapjbndwdh39gn3vcwqxnylqb3501i15rmsfm63"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base blaze-html bool-extras bytestring cmdargs containers data-default directory filepath HaXml haxr highlighting-kate hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec - process split strict tagsoup temporary transformers + process split strict tagsoup temporary text transformers ]; executableHaskellDepends = [ base cmdargs ]; homepage = "http://byorgey.wordpress.com/blogliterately/"; @@ -6553,6 +6551,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Get" = callPackage + ({ mkDerivation, base, constraints, singletons }: + mkDerivation { + pname = "Get"; + version = "0.2018.1.10"; + sha256 = "18i6ags8acgi651453g7axw7isiqivjhb4s0nh3lyl87ynqsch6l"; + libraryHaskellDepends = [ base constraints singletons ]; + testHaskellDepends = [ base constraints singletons ]; + homepage = "https://github.com/MarisaKirisame/Get#readme"; + description = "get stuff out of stuff"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "GiST" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -7419,8 +7430,8 @@ self: { ({ mkDerivation, base, bytestring, fuse, unix }: mkDerivation { pname = "HFuse"; - version = "0.2.4.5"; - sha256 = "1894dk7flfdblyyrx0d1acznrdbjw41dnal45cqvrxz5vy4hd3p2"; + version = "0.2.5.0"; + sha256 = "1sv7w1jn0p2dgdcqy7pnmwgp1dghh4jqz21m7ixvidks0nlfkq02"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring unix ]; @@ -10748,6 +10759,8 @@ self: { pname = "JuicyPixels-extra"; version = "0.2.2"; sha256 = "1f0ysxwd73s04mrqzqj9rfp6dd5441ckc96x2a4zkc1hixgkfzld"; + revision = "1"; + editedCabalFile = "1h88x4bp9jvxx8laz69izna82a9d3bapr7nfpa9gpbvqpmi7d3vd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base JuicyPixels ]; testHaskellDepends = [ base hspec JuicyPixels ]; @@ -11593,6 +11606,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_6" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, semigroups, text + , utf8-string, vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.6"; + sha256 = "16jsj979mzjrgmpa20pls9ganym3wsps49paks1sb1gmlmwyrkf1"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist semigroups + text utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random semigroups text utf8-string vector + ]; + homepage = "http://github.com/JohnLato/listlike"; + description = "Generic support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -14140,6 +14176,98 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Parallel-Arrows-BaseSpec" = callPackage + ({ mkDerivation, base, deepseq, hspec, Parallel-Arrows-Definition + , split + }: + mkDerivation { + pname = "Parallel-Arrows-BaseSpec"; + version = "0.1.1.0"; + sha256 = "014fy1sv1b82wxd3wpsxvnv3jn07d24r4ph3bi7p6i8aykx2a9f4"; + libraryHaskellDepends = [ + base deepseq hspec Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base hspec Parallel-Arrows-Definition split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "BaseSpecs used for @Parallel-Arrows-Definition@ and Co"; + license = stdenv.lib.licenses.mit; + }) {}; + + "Parallel-Arrows-Definition" = callPackage + ({ mkDerivation, base, deepseq, split }: + mkDerivation { + pname = "Parallel-Arrows-Definition"; + version = "0.1.1.0"; + sha256 = "1zdsvg0nx2vnvgx9vcwq8l1kanfp056mmiscs3716lswkrvhdlbf"; + libraryHaskellDepends = [ base deepseq split ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "Multithreaded evaluation using Arrows"; + license = stdenv.lib.licenses.mit; + }) {}; + + "Parallel-Arrows-Eden" = callPackage + ({ mkDerivation, base, deepseq, edenmodules, hspec, parallel + , Parallel-Arrows-BaseSpec, Parallel-Arrows-Definition, QuickCheck + , split + }: + mkDerivation { + pname = "Parallel-Arrows-Eden"; + version = "0.1.1.0"; + sha256 = "1iihlxghr2f70zbw3kkilckzfw24sjax6ck0g42272kj61gk2zy7"; + libraryHaskellDepends = [ + base deepseq edenmodules parallel Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base deepseq edenmodules hspec parallel Parallel-Arrows-BaseSpec + Parallel-Arrows-Definition QuickCheck split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "Eden based backend for @Parallel-Arrows-Definition@"; + license = stdenv.lib.licenses.mit; + }) {}; + + "Parallel-Arrows-Multicore" = callPackage + ({ mkDerivation, base, deepseq, hspec, parallel + , Parallel-Arrows-BaseSpec, Parallel-Arrows-Definition, split + }: + mkDerivation { + pname = "Parallel-Arrows-Multicore"; + version = "0.1.1.0"; + sha256 = "0g9ag9lk8mvnbfgzay27sq517an6cmv02fapxsn2lmr5vs7k63ar"; + libraryHaskellDepends = [ + base deepseq parallel Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base deepseq hspec parallel Parallel-Arrows-BaseSpec + Parallel-Arrows-Definition split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "GpH based backend for @Parallel-Arrows-Definition@ in a multicore variant"; + license = stdenv.lib.licenses.mit; + }) {}; + + "Parallel-Arrows-ParMonad" = callPackage + ({ mkDerivation, base, deepseq, hspec, monad-par + , Parallel-Arrows-BaseSpec, Parallel-Arrows-Definition, split + }: + mkDerivation { + pname = "Parallel-Arrows-ParMonad"; + version = "0.1.1.0"; + sha256 = "193794v158wfblriklp2jgxa3hk86p4kxbp8sj1hh16dwb0qa9cr"; + libraryHaskellDepends = [ + base deepseq monad-par Parallel-Arrows-Definition split + ]; + testHaskellDepends = [ + base deepseq hspec monad-par Parallel-Arrows-BaseSpec + Parallel-Arrows-Definition split + ]; + homepage = "https://github.com/s4ke/Parrows#readme"; + description = "Par Monad (@monad-par@) based backend for @Parallel-Arrows-Definition@"; + license = stdenv.lib.licenses.mit; + }) {}; + "Parry" = callPackage ({ mkDerivation, base, binary, bytestring, containers, directory , ghc-prim, network, old-locale, process, random, RSA @@ -14869,6 +14997,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "QuickCheck_2_11_3" = callPackage + ({ mkDerivation, base, containers, deepseq, random + , template-haskell, tf-random, transformers + }: + mkDerivation { + pname = "QuickCheck"; + version = "2.11.3"; + sha256 = "0xhqk35fkzlbjcqbabg6962jkv8d688nzmz7ng4bm84x2d95d328"; + libraryHaskellDepends = [ + base containers deepseq random template-haskell tf-random + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/nick8325/quickcheck"; + description = "Automatic testing of Haskell programs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "QuickCheck-GenT" = callPackage ({ mkDerivation, base, mtl, QuickCheck, random }: mkDerivation { @@ -17153,8 +17300,8 @@ self: { }: mkDerivation { pname = "StockholmAlignment"; - version = "1.1.1"; - sha256 = "085kw1rw4dkyivjpm7l5alj0x9cgzd8c2ai4f2k1kkcwjkhbpllv"; + version = "1.1.2"; + sha256 = "1x41m0xcmz9j4gypbl4pi6a6v53j6v37ndl8g5rq60fqfl18hizb"; libraryHaskellDepends = [ base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools SVGFonts text vector @@ -18240,6 +18387,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Unique_0_4_7_2" = callPackage + ({ mkDerivation, base, containers, extra, hashable, hspec + , QuickCheck, unordered-containers + }: + mkDerivation { + pname = "Unique"; + version = "0.4.7.2"; + sha256 = "0ssvg5sjhvadsfym02y0l712viv9xk2sfvrfs1q7260p7025aqdm"; + libraryHaskellDepends = [ + base containers extra hashable unordered-containers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "It provides the functionality like unix \"uniq\" utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Unixutils" = callPackage ({ mkDerivation, base, bytestring, directory, exceptions, filepath , mtl, process, process-extras, pureMD5, regex-tdfa, unix, zlib @@ -18497,13 +18661,13 @@ self: { "Villefort" = callPackage ({ mkDerivation, base, bytestring, directory, filepath, HDBC - , HDBC-sqlite3, MissingH, mtl, process, random, scotty, split - , strict, text, time, transformers, unix + , HDBC-sqlite3, hspec, MissingH, mtl, process, QuickCheck, random + , scotty, split, strict, text, time, transformers, unix, webdriver }: mkDerivation { pname = "Villefort"; - version = "0.1.2.5"; - sha256 = "1d4yq1bzjqk3w0rsjmb7y50jg0gyjbjckgbfhw9np0qbzbv2vpy3"; + version = "0.1.2.9"; + sha256 = "1mnh2snr1pwv5nwv4g7scwmclh2nm871kqb5py0v5sx4ff04kgbi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18514,7 +18678,9 @@ self: { executableHaskellDepends = [ base HDBC HDBC-sqlite3 random scotty split text time ]; - testHaskellDepends = [ base HDBC HDBC-sqlite3 ]; + testHaskellDepends = [ + base HDBC HDBC-sqlite3 hspec mtl QuickCheck webdriver + ]; homepage = "https://github.com/Chrisr850/Villefort#readme"; description = "Villefort is a task manager and time tracker written in haskell"; license = stdenv.lib.licenses.bsd3; @@ -19145,7 +19311,7 @@ self: { "X11" = callPackage ({ mkDerivation, base, data-default, libX11, libXext, libXinerama - , libXrandr, libXrender + , libXrandr, libXrender, libXScrnSaver }: mkDerivation { pname = "X11"; @@ -19153,14 +19319,14 @@ self: { sha256 = "13lxq36856fzp61y4api78vssykyh8fm2aplr0nsj18ymdm1c6sl"; libraryHaskellDepends = [ base data-default ]; librarySystemDepends = [ - libX11 libXext libXinerama libXrandr libXrender + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver ]; homepage = "https://github.com/xmonad/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;}; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: @@ -20206,6 +20372,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "accelerate-fourier_1_0_0_3" = callPackage + ({ mkDerivation, accelerate, accelerate-arithmetic + , accelerate-llvm-native, accelerate-utility, base, containers + , criterion, QuickCheck, transformers, utility-ht + }: + mkDerivation { + pname = "accelerate-fourier"; + version = "1.0.0.3"; + sha256 = "1xh6anashsvj5mfkwbl3as9gjgwl69q0qz3js0xbii8vdmhbbbnb"; + libraryHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-utility base containers + QuickCheck transformers utility-ht + ]; + testHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-utility base QuickCheck + utility-ht + ]; + benchmarkHaskellDepends = [ + accelerate accelerate-arithmetic accelerate-llvm-native + accelerate-utility base criterion utility-ht + ]; + homepage = "http://hub.darcs.net/thielema/accelerate-fourier/"; + description = "Fast Fourier transform and convolution using the Accelerate framework"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "accelerate-fourier-benchmark" = callPackage ({ mkDerivation, accelerate, accelerate-cuda, accelerate-cufft , accelerate-fftw, accelerate-fourier, base, criterion @@ -21180,6 +21373,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ad_4_3_5" = callPackage + ({ mkDerivation, array, base, Cabal, cabal-doctest, comonad + , containers, criterion, data-reify, directory, doctest, erf + , filepath, free, nats, reflection, semigroups, transformers + }: + mkDerivation { + pname = "ad"; + version = "4.3.5"; + sha256 = "0q4dvi02k21jq8xf0ywgmcs5mph4hpx5s3y3pj839y0g3x5paplw"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array base comonad containers data-reify erf free nats reflection + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + benchmarkHaskellDepends = [ base criterion erf ]; + homepage = "http://github.com/ekmett/ad"; + description = "Automatic Differentiation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "adaptive-containers" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -25201,8 +25416,8 @@ self: { }: mkDerivation { pname = "amazonka-s3-streaming"; - version = "0.2.0.3"; - sha256 = "1pndy65mk3kjl51jr75k1dk182wsbzfd2q9zsvcxpalfs0nsaf30"; + version = "0.2.0.4"; + sha256 = "1lz9a4ra6mjk19spm4i014n076f9x557ax6dsjdg8kn868hqcj56"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -26163,22 +26378,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ansi-terminal_0_6_3_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "ansi-terminal"; - version = "0.6.3.1"; - sha256 = "15c0c0vb66y3mr11kcvgjf4h0f7dqg7k1xq7zzq9fy11r7h9i3s5"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/feuerbach/ansi-terminal"; - description = "Simple ANSI terminal support, with Windows compatibility"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ansi-terminal" = callPackage ({ mkDerivation, base, colour }: mkDerivation { @@ -26227,6 +26426,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ansi-wl-pprint_0_6_8_2" = callPackage + ({ mkDerivation, ansi-terminal, base }: + mkDerivation { + pname = "ansi-wl-pprint"; + version = "0.6.8.2"; + sha256 = "0gnb4mkqryv08vncxnj0bzwcnd749613yw3cxfzw6y3nsldp4c56"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base ]; + homepage = "http://github.com/ekmett/ansi-wl-pprint"; + description = "The Wadler/Leijen Pretty Printer for colored ANSI terminal output"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ansigraph" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { @@ -26536,8 +26750,8 @@ self: { }: mkDerivation { pname = "api-builder"; - version = "0.12.0.0"; - sha256 = "16abl6yph5a0kc9rn46ab0564d4xbsvlml45zryhvdswl4jr3jni"; + version = "0.14.0.0"; + sha256 = "12pr670c4zw8dhmj5vgsqr44mw2jz5kqdqn3alfqhmkmb13kzc4v"; libraryHaskellDepends = [ aeson base bifunctors bytestring HTTP http-client http-client-tls http-types text tls transformers @@ -27786,6 +28000,8 @@ self: { pname = "arithmoi"; version = "0.6.0.1"; sha256 = "0dhr55r5vi10d9wqr054fy8rxp7h9z0kfpwvckaly0j90d6gvkqm"; + revision = "2"; + editedCabalFile = "1z16qjjz7qy0jribxzxn394f78b71lddv2sg199s2k8r8ndzkp0c"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers exact-pi ghc-prim integer-gmp @@ -29019,6 +29235,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "atomic-file-ops" = callPackage + ({ mkDerivation, base, directory, filelock, filepath + , io-string-like + }: + mkDerivation { + pname = "atomic-file-ops"; + version = "0.3.0.0"; + sha256 = "15gg5g9wnypj3hk5lhrqln2xcf86g84ivm8c8aflhmal26x86x44"; + libraryHaskellDepends = [ + base directory filelock filepath io-string-like + ]; + homepage = "https://github.com/clintonmead/atomic-file-ops#readme"; + description = "Functions to atomically write to files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "atomic-modify" = callPackage ({ mkDerivation, base, stm }: mkDerivation { @@ -29156,24 +29388,23 @@ self: { "ats-format" = callPackage ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base - , Cabal, composition-prelude, criterion, deepseq, directory - , file-embed, happy, hspec, hspec-dirstream, htoml-megaparsec, lens - , megaparsec, optparse-applicative, process, recursion-schemes - , system-filepath, text, unordered-containers + , Cabal, cli-setup, composition-prelude, criterion, deepseq + , directory, file-embed, happy, hspec, hspec-dirstream + , htoml-megaparsec, lens, optparse-applicative, process + , recursion-schemes, system-filepath, text, unordered-containers }: mkDerivation { pname = "ats-format"; - version = "0.1.0.20"; - sha256 = "116awkzdld7z1vw77pm1v4ldk2iapzarzh4vg02awxwlaj20mpk4"; + version = "0.1.3.1"; + sha256 = "1ysclgzacbbyykiwi3dng4qnkrl764ij479x78pldkpsb4sw8w8f"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal directory lens process ]; + setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-terminal ansi-wl-pprint array base composition-prelude deepseq - directory file-embed htoml-megaparsec lens megaparsec - optparse-applicative process recursion-schemes text - unordered-containers + directory file-embed htoml-megaparsec lens optparse-applicative + process recursion-schemes text unordered-containers ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; @@ -29293,6 +29524,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "attoparsec_0_13_2_2" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, criterion, deepseq, directory, filepath, ghc-prim + , http-types, parsec, QuickCheck, quickcheck-unicode, scientific + , tasty, tasty-quickcheck, text, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "attoparsec"; + version = "0.13.2.2"; + sha256 = "0j6qcwd146yzlkc9mcvzvnixsyl65n2a68l28322q5v9p4g4g4yx"; + libraryHaskellDepends = [ + array base bytestring containers deepseq scientific text + transformers + ]; + testHaskellDepends = [ + array base bytestring deepseq QuickCheck quickcheck-unicode + scientific tasty tasty-quickcheck text transformers vector + ]; + benchmarkHaskellDepends = [ + array base bytestring case-insensitive containers criterion deepseq + directory filepath ghc-prim http-types parsec scientific text + transformers unordered-containers vector + ]; + homepage = "https://github.com/bos/attoparsec"; + description = "Fast combinator parsing for bytestrings and text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "attoparsec-arff" = callPackage ({ mkDerivation, attoparsec, base, bytestring }: mkDerivation { @@ -31803,6 +32064,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "basement_0_0_5" = callPackage + ({ mkDerivation, base, ghc-prim }: + mkDerivation { + pname = "basement"; + version = "0.0.5"; + sha256 = "1i2n300q7b1bm1kbkmfwzjvkrm00iw8qiv3m8rgqhmyr3q2k9pmd"; + libraryHaskellDepends = [ base ghc-prim ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Foundation scrap box of array & string"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "basex-client" = callPackage ({ mkDerivation, base, network, pureMD5, utf8-string }: mkDerivation { @@ -32089,8 +32363,8 @@ self: { }: mkDerivation { pname = "bdcs"; - version = "0.1.0"; - sha256 = "1z9wfyay1l6d1l86izh31nldg0yidqyzvj3l11k4wrqr5yn07hfs"; + version = "0.1.1"; + sha256 = "1sxksvn852glnq181cj8y2pw2gkfg7afvhxx4rshvkxb7y58v8w9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -34627,6 +34901,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bishbosh" = callPackage + ({ mkDerivation, array, base, Cabal, containers, data-default + , deepseq, directory, extra, factory, filepath, HUnit, hxt + , hxt-relaxng, mtl, parallel, polyparse, QuickCheck, random, time + , toolshed, unix + }: + mkDerivation { + pname = "bishbosh"; + version = "0.0.0.1"; + sha256 = "1yfp8rb0m1c2iph07221q45ma9hxnslpj49w7fsp2ddcrr3vzk12"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base Cabal containers data-default deepseq extra factory + filepath hxt mtl parallel polyparse random time toolshed + ]; + executableHaskellDepends = [ + array base Cabal containers data-default deepseq directory extra + factory filepath hxt hxt-relaxng mtl parallel polyparse random time + toolshed unix + ]; + testHaskellDepends = [ + array base Cabal containers data-default extra filepath HUnit hxt + mtl polyparse QuickCheck random toolshed + ]; + homepage = "http://functionalley.eu"; + description = "Plays chess"; + license = "GPL"; + }) {}; + "bit-array" = callPackage ({ mkDerivation, base, directory, doctest, filepath, numeric-qq }: mkDerivation { @@ -35512,6 +35817,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "blank-canvas_0_6_2" = callPackage + ({ mkDerivation, aeson, base, base-compat, base64-bytestring + , bytestring, colour, containers, data-default-class, directory + , http-types, kansas-comet, mime-types, process, scotty, semigroups + , shake, stm, text, text-show, time, transformers, unix, vector + , wai, wai-extra, warp + }: + mkDerivation { + pname = "blank-canvas"; + version = "0.6.2"; + sha256 = "1qhdvxia8wlnv0ss9dsrxdfw3qsf376ypnpsijz7vxkj9dmzyq84"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring colour + containers data-default-class http-types kansas-comet mime-types + scotty semigroups stm text text-show transformers vector wai + wai-extra warp + ]; + testHaskellDepends = [ + base containers directory process shake stm text time unix vector + ]; + homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; + description = "HTML5 Canvas Graphics Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blas" = callPackage ({ mkDerivation, base, ieee, QuickCheck, storable-complex }: mkDerivation { @@ -35824,14 +36156,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blaze-markup_0_8_1_0" = callPackage + "blaze-markup_0_8_2_0" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: mkDerivation { pname = "blaze-markup"; - version = "0.8.1.0"; - sha256 = "1isb328dh642nxfj7izlmw3amygh94jn1pdycga7wla1v993psx6"; + version = "0.8.2.0"; + sha256 = "0m3h3ryxj5r74mv5g5dnfq5jbbwmvkl7ray18vi20d5vd93sydj4"; libraryHaskellDepends = [ base blaze-builder bytestring text ]; testHaskellDepends = [ base blaze-builder bytestring containers HUnit QuickCheck tasty @@ -36637,8 +36969,8 @@ self: { }: mkDerivation { pname = "bookkeeping-jp"; - version = "0.1.1.0"; - sha256 = "1hmh8q041p0f4v58ywpwd833v7k0jg900r1la3wh4x1h08bxmbxm"; + version = "0.1.1.1"; + sha256 = "1mnjwfdzhp1kbd02g7vdc1x2rrm10hzi96j6ljin17vynh06dmm0"; libraryHaskellDepends = [ base bookkeeping mono-traversable text time ]; @@ -37289,7 +37621,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "brick_0_32_1" = callPackage + "brick_0_33" = callPackage ({ mkDerivation, base, config-ini, containers, contravariant , data-clist, deepseq, dlist, microlens, microlens-mtl , microlens-th, stm, template-haskell, text, text-zipper @@ -37297,8 +37629,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.32.1"; - sha256 = "09lyl9zz8hl6p7w5d34kpwsac66w3pqr4f6k97yb9chpcpfiqmb6"; + version = "0.33"; + sha256 = "0052hdwvqrprf5911axikxpigbc1iv3h4kq3zhrnvpy038wjbis1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -38092,6 +38424,8 @@ self: { pname = "butcher"; version = "1.2.1.0"; sha256 = "0vam5lqbp2k8r56d997bcp63lnsc4bbs7yd4lzjvibimr38g032w"; + revision = "3"; + editedCabalFile = "1faax0pipbywayjn961id2bc19y109bq0ny2hl1p9mh209iccnza"; libraryHaskellDepends = [ base bifunctors containers deque either extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -39829,8 +40163,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.7.2"; - sha256 = "1376a97pmhpxf78lhl4b6glraajjwhk99cvvrz4p7nmdc1qq9zhy"; + version = "2.8"; + sha256 = "1s7nsrknn7i5j0wwz89m6x5qab9f6bz3ix82vp7w948xh8dsb0nf"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -39841,11 +40175,9 @@ self: { time transformers yaml ]; executableHaskellDepends = [ - aeson ansi-wl-pprint base bytestring Cabal containers deepseq - directory distribution-nixpkgs filepath hackage-db hopenssl hpack - language-nix lens monad-par monad-par-extras mtl - optparse-applicative pretty process split text time transformers - utf8-string yaml + aeson base bytestring Cabal containers directory + distribution-nixpkgs filepath hopenssl language-nix lens monad-par + monad-par-extras mtl optparse-applicative pretty utf8-string ]; testHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers deepseq @@ -40711,8 +41043,8 @@ self: { }: mkDerivation { pname = "capataz"; - version = "0.0.0.1"; - sha256 = "0bfwciidmp0ijgaq7zbyqw35m702xs9lm382072jwws8y353n29s"; + version = "0.0.0.2"; + sha256 = "0d6k13qqm30rcs27qr6q8p0a4wlqw75qyfmk9x2s6zhydl4cwb85"; libraryHaskellDepends = [ async base bytestring data-default protolude safe-exceptions stm teardown text time unordered-containers uuid vector @@ -41092,6 +41424,8 @@ self: { pname = "case-insensitive"; version = "1.2.0.10"; sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6"; + revision = "1"; + editedCabalFile = "153x2i7gw7lyhydlf0924vfxmkk53r65c40104bbha2bhp1vj7fi"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -41478,6 +41812,8 @@ self: { pname = "cassava-megaparsec"; version = "1.0.0"; sha256 = "14d1idyw4pm8gq41383sy6cid6v1dr9zc7wviy4vd786406j2n28"; + revision = "1"; + editedCabalFile = "0dk6bxyvlg0iq83m81cbyysiydcj3dsvhlishjc119hzpy8g8xd6"; libraryHaskellDepends = [ base bytestring cassava containers megaparsec unordered-containers vector @@ -43431,6 +43767,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "chunked-data_0_3_1" = callPackage + ({ mkDerivation, base, bytestring, containers, semigroups, text + , transformers, vector + }: + mkDerivation { + pname = "chunked-data"; + version = "0.3.1"; + sha256 = "16m7y7fwrirbjbqqcsfmr4yxa9qvfax6r7pw0zl9ky71ms0wa47p"; + libraryHaskellDepends = [ + base bytestring containers semigroups text transformers vector + ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "Typeclasses for dealing with various chunked data representations"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chunks" = callPackage ({ mkDerivation, base, haskell98, parsec, template-haskell }: mkDerivation { @@ -44828,6 +45181,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "cli-setup" = callPackage + ({ mkDerivation, base, bytestring, directory, process }: + mkDerivation { + pname = "cli-setup"; + version = "0.1.0.3"; + sha256 = "1w41pdprifdgp7h2z08m78jg058i49530pfvgmr53lmch5dkk4vf"; + libraryHaskellDepends = [ base bytestring directory process ]; + homepage = "https://github.com/vmchale/cli-setup#readme"; + description = "Helper setup scripts for packaging command-line tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "click-clack" = callPackage ({ mkDerivation, base, containers, GLFW, Hipmunk, MonadRandom, mtl , OpenGL, random, StateVar, transformers @@ -45818,8 +46183,8 @@ self: { }: mkDerivation { pname = "cmv"; - version = "1.0.6"; - sha256 = "1djqw8szaq8p8mhxp4789gx5mgibdlcwhbkilzc5zcxf619pn3c1"; + version = "1.0.7"; + sha256 = "16gq4y8ixdppkkmwg2xafqgshpqplybv5dyqjkpqpbmwmv46mydv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47054,8 +47419,8 @@ self: { pname = "comonad"; version = "5.0.2"; sha256 = "115pai560rllsmym76bj787kwz5xx19y8bl6262005nddqwzxc0v"; - revision = "1"; - editedCabalFile = "1lnsnx8p3wlfhd1xfc68za3b00vq77z2m6b0vqiw2laqmpj9akcw"; + revision = "2"; + editedCabalFile = "1ngks9bym68rw0xdq43n14nay4kxdxv2n7alwfd9wcpismfz009g"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers contravariant distributive semigroups tagged @@ -47220,8 +47585,8 @@ self: { ({ mkDerivation, base, containers, transformers, vector }: mkDerivation { pname = "compactable"; - version = "0.1.0.2"; - sha256 = "19ra58dz8wcwx3f5znfqqc0dvnfhldkbd8rg9psc7cynf9xcf93m"; + version = "0.1.0.3"; + sha256 = "0zcazqwmyd458iv0j572fc8p13lbb57kdpfviqx2qlwmicb7i8z7"; libraryHaskellDepends = [ base containers transformers vector ]; description = "A generalization for containers that can be stripped of Nothings"; license = stdenv.lib.licenses.bsd3; @@ -47637,8 +48002,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "0.1.1.4"; - sha256 = "1jnynldi9clzz9in9cjpl17z5yh18wcdal875aphdxd72bhb2yk7"; + version = "1.1.0.0"; + sha256 = "12wiwbpkh663xmdvw4rhf605vlghnl1gmq55zaqdpwymqzb0y5f4"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -48487,6 +48852,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "conduit-algorithms_0_0_7_1" = callPackage + ({ mkDerivation, async, base, bytestring, bzlib-conduit, conduit + , conduit-combinators, conduit-extra, containers, deepseq + , directory, HUnit, lzma-conduit, mtl, resourcet, stm, stm-conduit + , test-framework, test-framework-hunit, test-framework-th + , transformers, vector + }: + mkDerivation { + pname = "conduit-algorithms"; + version = "0.0.7.1"; + sha256 = "153g4lhd8ah97hbdvjxc1j4cnkdmpy6x2pbdjv2n7wyn80mqh9i7"; + libraryHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq lzma-conduit mtl resourcet stm + stm-conduit transformers vector + ]; + testHaskellDepends = [ + async base bytestring bzlib-conduit conduit conduit-combinators + conduit-extra containers deepseq directory HUnit lzma-conduit mtl + resourcet stm stm-conduit test-framework test-framework-hunit + test-framework-th transformers vector + ]; + homepage = "https://github.com/luispedro/conduit-algorithms#readme"; + description = "Conduit-based algorithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conduit-audio" = callPackage ({ mkDerivation, base, conduit, vector }: mkDerivation { @@ -48878,6 +49271,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "config-ini_0_2_2_0" = callPackage + ({ mkDerivation, base, containers, directory, doctest, hedgehog + , ini, megaparsec, microlens, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "config-ini"; + version = "0.2.2.0"; + sha256 = "1820w4y8k0qrlilrizkqckwiyli0x4qcdjmagvcngy5bfsw6fk9n"; + libraryHaskellDepends = [ + base containers megaparsec text transformers unordered-containers + ]; + testHaskellDepends = [ + base containers directory doctest hedgehog ini microlens text + unordered-containers + ]; + homepage = "https://github.com/aisamanra/config-ini"; + description = "A library for simple INI-based configuration files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "config-manager" = callPackage ({ mkDerivation, base, directory, filepath, HUnit, parsec , temporary, test-framework, test-framework-hunit, text, time @@ -49386,8 +49801,8 @@ self: { ({ mkDerivation, base, category }: mkDerivation { pname = "constraint"; - version = "0.1.1.0"; - sha256 = "15kkkbqy6vjhbjl1jdqrsazrhv5k2l2vqymdjjdn3l07cfnf9lzj"; + version = "0.1.1.1"; + sha256 = "0iyz3n8qplp892cw2k2z5pp4pv54p5qaqrcjgpiwfm9jkri0v012"; libraryHaskellDepends = [ base category ]; description = "Reified constraints"; license = stdenv.lib.licenses.bsd3; @@ -49435,6 +49850,27 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "constraints_0_10" = callPackage + ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, hspec + , hspec-discover, mtl, semigroups, transformers + , transformers-compat + }: + mkDerivation { + pname = "constraints"; + version = "0.10"; + sha256 = "1ii6j62xihxwb85akvy8cdd73g9qr7rd5zl37h4925y2acpbh962"; + libraryHaskellDepends = [ + base binary deepseq ghc-prim hashable mtl semigroups transformers + transformers-compat + ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; + homepage = "http://github.com/ekmett/constraints/"; + description = "Constraint manipulation"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "constructible" = callPackage ({ mkDerivation, arithmoi, base, binary-search, complex-generic }: mkDerivation { @@ -49801,6 +50237,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "contravariant_1_4_1" = callPackage + ({ mkDerivation, base, StateVar, transformers, transformers-compat + }: + mkDerivation { + pname = "contravariant"; + version = "1.4.1"; + sha256 = "1vfhk8c5cxmmakx7rflap1ipkx5q0j5vnlrcz7yz6y53kxhksgf9"; + libraryHaskellDepends = [ + base StateVar transformers transformers-compat + ]; + homepage = "http://github.com/ekmett/contravariant/"; + description = "Contravariant functors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "contravariant-extras" = callPackage ({ mkDerivation, base-prelude, contravariant, template-haskell , tuple-th @@ -51729,6 +52181,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "criterion_1_3_0_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, base, base-compat, binary + , bytestring, cassava, code-page, containers, deepseq, directory + , exceptions, filepath, Glob, HUnit, js-flot, js-jquery + , microstache, mtl, mwc-random, optparse-applicative, parsec + , QuickCheck, semigroups, statistics, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, transformers-compat + , vector, vector-algorithms + }: + mkDerivation { + pname = "criterion"; + version = "1.3.0.0"; + sha256 = "0csgk6njr6a3i895d10pajf7z4r9hx8aj2r0c3rj5li6vrm37f8q"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint base base-compat binary bytestring cassava + code-page containers deepseq directory exceptions filepath Glob + js-flot js-jquery microstache mtl mwc-random optparse-applicative + parsec semigroups statistics text time transformers + transformers-compat vector vector-algorithms + ]; + executableHaskellDepends = [ + base base-compat optparse-applicative semigroups + ]; + testHaskellDepends = [ + aeson base base-compat bytestring deepseq directory HUnit + QuickCheck statistics tasty tasty-hunit tasty-quickcheck vector + ]; + 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 ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th , monad-control, mtl, optparse-applicative, placeholders @@ -52513,21 +53001,33 @@ self: { }) {}; "cryptoids" = callPackage - ({ mkDerivation, base, binary, bytestring, cryptoids-types - , cryptonite, directory, exceptions, filepath, memory + ({ mkDerivation, base, binary, bytestring, cryptoids-class + , cryptoids-types, cryptonite, directory, exceptions, filepath + , memory }: mkDerivation { pname = "cryptoids"; - version = "0.4.0.0"; - sha256 = "1km63vgckjsxxrkd45w7c5gc3d5hk6dg6f0y4z4c8wajz4ddp1a3"; + version = "0.5.0.0"; + sha256 = "05xywzs7waz01c0p3y02qlf4yfhfpmpzpdfs2cmv5rmphf1hzck2"; libraryHaskellDepends = [ - base binary bytestring cryptoids-types cryptonite directory - exceptions filepath memory + base binary bytestring cryptoids-class cryptoids-types cryptonite + directory exceptions filepath memory ]; description = "Reversable and secure encoding of object ids as a bytestring"; license = stdenv.lib.licenses.bsd3; }) {}; + "cryptoids-class" = callPackage + ({ mkDerivation, base, cryptoids-types, exceptions }: + mkDerivation { + pname = "cryptoids-class"; + version = "0.0.0"; + sha256 = "0zp0d815r0dv2xqdi6drq846zz2a82gpqp6nvap3b5dnx2q3hbjy"; + libraryHaskellDepends = [ base cryptoids-types exceptions ]; + description = "Typeclass-based interface to cryptoids"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cryptoids-types" = callPackage ({ mkDerivation, base, binary, http-api-data, path-pieces }: mkDerivation { @@ -53232,12 +53732,14 @@ self: { }) {}; "curl" = callPackage - ({ mkDerivation, base, bytestring, curl }: + ({ mkDerivation, base, bytestring, containers, curl }: mkDerivation { pname = "curl"; version = "1.3.8"; sha256 = "0vj4hpaa30jz7c702xpsfvqaqdxz28zslsqnsfx6bf6dpwvck1wh"; - libraryHaskellDepends = [ base bytestring ]; + revision = "1"; + editedCabalFile = "02sq2bjw5igc2k9f9ssh58k2ivii2xsvk5r00ky3cxh8j61qy86q"; + libraryHaskellDepends = [ base bytestring containers ]; librarySystemDepends = [ curl ]; description = "Haskell binding to libcurl"; license = stdenv.lib.licenses.bsd3; @@ -53340,40 +53842,48 @@ self: { }) {}; "curry-base" = callPackage - ({ mkDerivation, base, containers, directory, filepath, mtl - , old-time, pretty, syb + ({ mkDerivation, base, Cabal, containers, directory, extra + , filepath, mtl, parsec, pretty, time, transformers }: mkDerivation { pname = "curry-base"; - version = "0.2.9"; - sha256 = "0sdwygsbqmvcbzi7zsr0jd02s2r19pc7zsk4b6hjxv4vzjc9f120"; + version = "1.0.0"; + sha256 = "05j0wv2aj5979j5gq13bn317pd9gis96qjp6inqa08aafc4l3yya"; libraryHaskellDepends = [ - base containers directory filepath mtl old-time pretty syb + base containers directory extra filepath mtl parsec pretty time + transformers ]; - homepage = "http://www.curry-language.org"; + testHaskellDepends = [ base Cabal filepath mtl ]; + homepage = "http://curry-language.org"; description = "Functions for manipulating Curry programs"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curry-frontend" = callPackage - ({ mkDerivation, base, containers, curry-base, filepath, mtl - , old-time, pretty, syb + ({ mkDerivation, base, Cabal, containers, curry-base, directory + , extra, filepath, mtl, network-uri, pretty, process, set-extra + , transformers }: mkDerivation { pname = "curry-frontend"; - version = "0.2.12"; - sha256 = "1igys4i7wwj1ildkf4is66gq22zsjg158kv3ald5xiilwkmvfc4h"; + version = "1.0.1"; + sha256 = "07khd3b5v8ys1vidz3gkxj91k4pwq5hn5zlyr99n0n1rm24vhbf8"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; - libraryHaskellDepends = [ filepath ]; - executableHaskellDepends = [ - base containers curry-base mtl old-time pretty syb + libraryHaskellDepends = [ + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers ]; - homepage = "http://www.curry-language.org"; + executableHaskellDepends = [ + base containers curry-base directory extra filepath mtl network-uri + pretty process set-extra transformers + ]; + testHaskellDepends = [ base Cabal curry-base filepath ]; + homepage = "http://curry-language.org"; description = "Compile the functional logic language Curry to several intermediate formats"; - license = "unknown"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -54819,6 +55329,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "data-dword_0_3_1_2" = callPackage + ({ mkDerivation, base, data-bword, ghc-prim, hashable, tasty + , tasty-quickcheck, template-haskell + }: + mkDerivation { + pname = "data-dword"; + version = "0.3.1.2"; + sha256 = "084invjg8zj7ndxnz9clqmq06ch47k1d9lhxwap6xs0x4807crvb"; + libraryHaskellDepends = [ + base data-bword ghc-prim hashable template-haskell + ]; + testHaskellDepends = [ base tasty tasty-quickcheck ]; + homepage = "https://github.com/mvv/data-dword"; + description = "Stick two binary words together to get a bigger one"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "data-easy" = callPackage ({ mkDerivation, base, containers, directory, errors , haskell-src-exts, hlint, hspec, HUnit, QuickCheck, safe, text @@ -56455,6 +56983,34 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "dbus_0_10_15" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, criterion + , deepseq, directory, extra, filepath, libxml-sax, network, parsec + , process, QuickCheck, random, resourcet, tasty, tasty-hunit + , tasty-quickcheck, text, transformers, unix, vector, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "0.10.15"; + sha256 = "1a5sjavq8mfzz4zxpkd9b6jxsvy0kl1rjq2hhy40gcz2qjfnamb4"; + libraryHaskellDepends = [ + base bytestring cereal containers deepseq libxml-sax network parsec + random text transformers unix vector xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath + libxml-sax network parsec process QuickCheck random resourcet tasty + tasty-hunit tasty-quickcheck text transformers unix vector + xml-types + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + homepage = "https://github.com/rblaze/haskell-dbus#readme"; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -59003,6 +59559,8 @@ self: { pname = "diagrams-rasterific"; version = "1.4"; sha256 = "190mc32fjjf3770fjp1bmbh3zc8l5bhqhqy30vv48l0pypfjrsns"; + revision = "1"; + editedCabalFile = "0y4hf13l9y4179vhdsak8zq69wyn3rgmwnz9wp0x4rj32gdjjp3j"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class diagrams-core @@ -59141,23 +59699,21 @@ self: { }) {}; "dib" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, digest - , directory, filepath, mtl, process, text, time + ({ mkDerivation, ansi-terminal, base, bytestring, cereal + , containers, digest, directory, filepath, mtl, process, text, time }: mkDerivation { pname = "dib"; - version = "0.7.1"; - sha256 = "19qk3k39ckjjinsiixapjnslv2y7abnb0vivp33g054lhjv066z3"; - revision = "1"; - editedCabalFile = "19kzycbym6q077kwz5xw6gqkzc8bd6ig6pvx0pri4d1r1bkmgy0i"; + version = "0.7.2"; + sha256 = "0r1hk45fdyhygmscnphl4n6dcs0rvgavhbg5si0aqsck4wsnql83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring cereal containers digest directory filepath mtl - process text time + ansi-terminal base bytestring cereal containers digest directory + filepath mtl process text time ]; executableHaskellDepends = [ - base containers directory filepath mtl time + base containers directory filepath mtl process time ]; description = "A simple, forward build system"; license = stdenv.lib.licenses.mit; @@ -59254,6 +59810,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dictionaries_0_2_0_4" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , criterion, data-default, deepseq, directory, exceptions, filepath + , hspec, QuickCheck, random, random-shuffle, tagged, text, time + , transformers, zlib + }: + mkDerivation { + pname = "dictionaries"; + version = "0.2.0.4"; + sha256 = "1m581w0fmb9ggwqkyfgxjw6zxfkk6iapmh17sizsqkmg2vbw7qzx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers data-default deepseq + directory exceptions filepath tagged text time transformers zlib + ]; + executableHaskellDepends = [ + base bytestring containers criterion deepseq directory exceptions + filepath random random-shuffle tagged text transformers + ]; + testHaskellDepends = [ + base bytestring containers directory filepath hspec QuickCheck + random tagged text time + ]; + description = "Tools to handle StarDict dictionaries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dictionary-sharing" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -62077,6 +62662,36 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "dotenv_0_5_2_3" = callPackage + ({ mkDerivation, base, base-compat, directory, exceptions, hspec + , hspec-megaparsec, megaparsec, optparse-applicative, process, text + , transformers, yaml + }: + mkDerivation { + pname = "dotenv"; + version = "0.5.2.3"; + sha256 = "194cjf641q54b19daldg9nyi9gf8j4fxql6aslqzbgy7bfg5aj5b"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base base-compat directory exceptions megaparsec process text + transformers yaml + ]; + executableHaskellDepends = [ + base base-compat megaparsec optparse-applicative process text + transformers yaml + ]; + testHaskellDepends = [ + base base-compat directory exceptions hspec hspec-megaparsec + megaparsec process text transformers yaml + ]; + homepage = "https://github.com/stackbuilders/dotenv-hs"; + description = "Loads environment variables from dotenv files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dotfs" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , haskell-src, HFuse, HUnit, parsec, process, QuickCheck @@ -62610,13 +63225,19 @@ self: { }) {}; "drinkery" = callPackage - ({ mkDerivation, base, criterion, mtl, transformers }: + ({ mkDerivation, base, conduit, conduit-combinators, gauge, list-t + , ListT, machines, mtl, pipes, transformers + }: mkDerivation { pname = "drinkery"; - version = "0"; - sha256 = "06ad33l3xv9paspb5ymr97zzb4dkdfq9sg40b3i62nf52gpjfdly"; + version = "0.1"; + sha256 = "0cwv7z7gzbbkxrdfikkbmkhd6asbib1m0j9h98nwhm7i1c498rhi"; + revision = "1"; + editedCabalFile = "19zjmmfjkkx3dsy4zwz8f3iciwgvlra9rxp5y11mkb5glg5qy3f9"; libraryHaskellDepends = [ base mtl transformers ]; - benchmarkHaskellDepends = [ base criterion ]; + benchmarkHaskellDepends = [ + base conduit conduit-combinators gauge list-t ListT machines pipes + ]; homepage = "https://github.com/fumieval/drinkery#readme"; description = "Boozy streaming library"; license = stdenv.lib.licenses.bsd3; @@ -63359,8 +63980,8 @@ self: { }: mkDerivation { pname = "dynamic-graph"; - version = "0.1.0.10"; - sha256 = "14bgkrd14a62dnkk9h3syzgxqmkjd50br9qxmiqq2b9fnqd7nf34"; + version = "0.1.0.11"; + sha256 = "0mgciglcq8cshbcrc0ff858596zlm07z6wcmjpaa3irqbkdn7ma1"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base cairo colour either GLFW-b GLUtil OpenGL pango pipes @@ -64969,6 +65590,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eliminators_0_4" = callPackage + ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats + , singletons, template-haskell, th-abstraction, th-desugar + }: + mkDerivation { + pname = "eliminators"; + version = "0.4"; + sha256 = "1lsvz498db2vlaj4d9p4bi4pl4cnsl27gmmhw1ipfxw4kxmfdf4z"; + revision = "1"; + editedCabalFile = "188dnmw7gwfp4fxyljhb3gv78bj9gai4v2if8d9gcnss6ykp5mn1"; + libraryHaskellDepends = [ + base extra singleton-nats singletons template-haskell + th-abstraction th-desugar + ]; + testHaskellDepends = [ base hspec singleton-nats singletons ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/RyanGlScott/eliminators"; + description = "Dependently typed elimination functions using singletons"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elision" = callPackage ({ mkDerivation, base, profunctors }: mkDerivation { @@ -64986,18 +65629,16 @@ self: { }) {}; "elm-bridge" = callPackage - ({ mkDerivation, aeson, base, containers, hspec, QuickCheck - , template-haskell, text + ({ mkDerivation, aeson, base, containers, hspec, hspec-discover + , QuickCheck, template-haskell, text }: mkDerivation { pname = "elm-bridge"; - version = "0.4.1"; - sha256 = "1wp813l6bdw5x7vpiq098v1gbxzvv3129n2rl4div9mrj53a3i2l"; - revision = "1"; - editedCabalFile = "05kk6lsh10ligdgj4dw0iyhvv0blnrcvmk94hn27qq70bpv8xcqz"; + version = "0.4.2"; + sha256 = "1mcaic3xdll6bdv4yjp0j0861yapgfgb4wd0ckh7dpcmcnfnarhx"; libraryHaskellDepends = [ aeson base template-haskell ]; testHaskellDepends = [ - aeson base containers hspec QuickCheck text + aeson base containers hspec hspec-discover QuickCheck text ]; homepage = "https://github.com/agrafix/elm-bridge"; description = "Derive Elm types and Json code from Haskell types"; @@ -65805,8 +66446,8 @@ self: { }: mkDerivation { pname = "eng-stemmer"; - version = "0.1.0.1"; - sha256 = "0v0k2hqh2270djy5pgj9c5biywfb4amssv3410y9dqgl9jpsjdg8"; + version = "0.1.0.2"; + sha256 = "0fz7dwgmhlna906x6m5s5yrk6w5wswsj75irrkc2hrwxrq1f6mqw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers mtl text ]; @@ -66361,8 +67002,8 @@ self: { }: mkDerivation { pname = "epub-tools"; - version = "2.10"; - sha256 = "0bahnq1fs31j5bmfm5pi9cn72c64bv5ib29w5qw1lqhp10zr3j17"; + version = "2.11"; + sha256 = "18k4aipaw6zlzhpxidl5b7q5hvy51sj030p7mw89flrgd8kd3g2p"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -66374,7 +67015,7 @@ self: { ]; homepage = "https://github.com/dino-/epub-tools.git"; description = "Command line utilities for working with epub files"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.isc; }) {}; "epubname" = callPackage @@ -66407,6 +67048,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "eq_4_1" = callPackage + ({ mkDerivation, base, semigroupoids }: + mkDerivation { + pname = "eq"; + version = "4.1"; + sha256 = "10k1xnvga7c6ijmkfq2qd4vc5i2lnkz4xjmba74g0xzhk6gkvp0n"; + libraryHaskellDepends = [ base semigroupoids ]; + homepage = "http://github.com/ekmett/eq/"; + description = "Leibnizian equality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "equal-files" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, filemanip , transformers, utility-ht @@ -66780,6 +67434,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ersatz_0_4_2" = callPackage + ({ mkDerivation, array, attoparsec, base, bytestring, Cabal + , cabal-doctest, containers, data-default, directory, doctest + , filepath, lens, mtl, parsec, process, semigroups, temporary + , transformers, unordered-containers + }: + mkDerivation { + pname = "ersatz"; + version = "0.4.2"; + sha256 = "1rr46awz0rbzg0i6424rnrykcwkgwxfzgx5d5qmva4y41l62vkxf"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array attoparsec base bytestring containers data-default lens mtl + process semigroups temporary transformers unordered-containers + ]; + executableHaskellDepends = [ + array base containers lens mtl parsec semigroups + ]; + testHaskellDepends = [ array base directory doctest filepath mtl ]; + homepage = "http://github.com/ekmett/ersatz"; + description = "A monad for expressing SAT or QSAT problems using observable sharing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ersatz-toysat" = callPackage ({ mkDerivation, array, base, containers, ersatz, toysolver , transformers @@ -68112,8 +68794,8 @@ self: { pname = "exceptions"; version = "0.8.3"; sha256 = "1gl7xzffsqmigam6zg0jsglncgzxqafld2p6kb7ccp9xirzdjsjd"; - revision = "2"; - editedCabalFile = "1vl59j0l7m53hkzlcfmdbqbab8dk4lp9gzwryn7nsr6ylg94wayw"; + revision = "4"; + editedCabalFile = "18iip6wffnrp1jgnf09gxg4v17ymjank50kjshxvcy9s9l9g13ln"; libraryHaskellDepends = [ base mtl stm template-haskell transformers transformers-compat ]; @@ -69018,6 +69700,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extrapolate_0_3_1" = callPackage + ({ mkDerivation, base, leancheck, speculate, template-haskell }: + mkDerivation { + pname = "extrapolate"; + version = "0.3.1"; + sha256 = "1hz03mdascy4jvqhyrqqmb1py3pb03g4z3if05z2cbdxgbgsbbn4"; + libraryHaskellDepends = [ + base leancheck speculate template-haskell + ]; + testHaskellDepends = [ base leancheck speculate ]; + homepage = "https://github.com/rudymatela/extrapolate#readme"; + description = "generalize counter-examples of test properties"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ez-couch" = callPackage ({ mkDerivation, aeson, attoparsec, attoparsec-conduit, base , blaze-builder, bytestring, classy-prelude, classy-prelude-conduit @@ -69062,8 +69760,8 @@ self: { }: mkDerivation { pname = "factory"; - version = "0.3.0.0"; - sha256 = "0izhwb0plxhlsr4ghk2rybm367n83d598s3nk8ss0mnnv7gv5wpm"; + version = "0.3.1.4"; + sha256 = "0k5bb0imp001f1sj785qqy9k67wvb91mr4fpdcg5riykiv8j9l1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69337,14 +70035,15 @@ self: { }) {}; "fast-arithmetic" = callPackage - ({ mkDerivation, base, Cabal, composition-prelude, criterion - , directory, hspec, http-client, http-client-tls, parallel-io - , QuickCheck, recursion-schemes, tar, zlib + ({ mkDerivation, arithmoi, base, Cabal, combinat + , composition-prelude, criterion, directory, hspec, http-client + , http-client-tls, parallel-io, QuickCheck, recursion-schemes, tar + , zlib }: mkDerivation { pname = "fast-arithmetic"; - version = "0.1.1.5"; - sha256 = "1pp9wdzzjfsjdbf8vnbpf1a29x6xzigzrjivrdpw7l6cwkhs9gff"; + version = "0.3.2.0"; + sha256 = "1bj3qcbyfr9fg5j4dmrkbja3dv40whxz6kyakjwd8m3rw250ncck"; setupHaskellDepends = [ base Cabal directory http-client http-client-tls parallel-io tar zlib @@ -69352,8 +70051,8 @@ self: { libraryHaskellDepends = [ base composition-prelude recursion-schemes ]; - testHaskellDepends = [ base hspec QuickCheck ]; - benchmarkHaskellDepends = [ base criterion ]; + testHaskellDepends = [ arithmoi base combinat hspec QuickCheck ]; + benchmarkHaskellDepends = [ arithmoi base combinat criterion ]; homepage = "https://github.com/vmchale/fast-arithmetic#readme"; description = "Fast functions on integers"; license = stdenv.lib.licenses.bsd3; @@ -71077,16 +71776,16 @@ self: { "filepath-crypto" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive - , cryptoids, cryptoids-types, encoding, exceptions, filepath, sandi - , template-haskell + , cryptoids, cryptoids-class, cryptoids-types, exceptions, filepath + , sandi, template-haskell }: mkDerivation { pname = "filepath-crypto"; - version = "0.0.0.2"; - sha256 = "1i6y0bpyndghkfip2l0ijk9mnhia0fjmd6skzl1a3dbh5pibf7fd"; + version = "0.1.0.0"; + sha256 = "1bj9haa4ignmk6c6gdiqb4rnwy395pwqdyfy4kgg0z16w0l39mw0"; libraryHaskellDepends = [ - base binary bytestring case-insensitive cryptoids cryptoids-types - encoding exceptions filepath sandi template-haskell + base binary bytestring case-insensitive cryptoids cryptoids-class + cryptoids-types exceptions filepath sandi template-haskell ]; description = "Reversable and secure encoding of object ids as filepaths"; license = stdenv.lib.licenses.bsd3; @@ -71550,8 +72249,8 @@ self: { }: mkDerivation { pname = "fishfood"; - version = "0.0.1.7"; - sha256 = "1b2nabliv1xqi42q2bknri85gizb1xbh7j5729dxv3sybzq50wd8"; + version = "0.0.1.8"; + sha256 = "04wqj8s8b97i6448f66ljv5wk6nhcjs80vapg96vwmlslxwcmhnc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -73042,15 +73741,18 @@ self: { }) {}; "foldl-statistics" = callPackage - ({ mkDerivation, base, criterion, foldl, math-functions, mwc-random - , profunctors, quickcheck-instances, statistics, tasty - , tasty-quickcheck, vector + ({ mkDerivation, base, containers, criterion, foldl, hashable + , math-functions, mwc-random, profunctors, quickcheck-instances + , statistics, tasty, tasty-quickcheck, unordered-containers, vector }: mkDerivation { pname = "foldl-statistics"; - version = "0.1.4.6"; - sha256 = "05ibj8gw86n5jspn5qnvvqyihb1fanmk86xxrm04sghxbfc9szzy"; - libraryHaskellDepends = [ base foldl math-functions profunctors ]; + version = "0.1.5.0"; + sha256 = "1z9qx7kiaidl3icz6g3rd6pyycwnvyv7xyw8g6p1n7rpvz60633b"; + libraryHaskellDepends = [ + base containers foldl hashable math-functions profunctors + unordered-containers + ]; testHaskellDepends = [ base foldl profunctors quickcheck-instances statistics tasty tasty-quickcheck vector @@ -73696,6 +74398,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "forsyde-shallow" = callPackage + ({ mkDerivation, base, directory, hspec, old-time, process, random + }: + mkDerivation { + pname = "forsyde-shallow"; + version = "3.3.2.0"; + sha256 = "1cfqv2mn1ccbp2j7vnjj123ys2n5s414dqid4ywy1l749pzf7w1j"; + libraryHaskellDepends = [ base directory old-time process random ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://forsyde.ict.kth.se/"; + description = "ForSyDe's Haskell-embedded Domain Specific Language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "forth-hll" = callPackage ({ mkDerivation, array-forth, base, free, mtl }: mkDerivation { @@ -73853,6 +74569,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "foundation_0_0_18" = callPackage + ({ mkDerivation, base, basement, gauge, ghc-prim }: + mkDerivation { + pname = "foundation"; + version = "0.0.18"; + sha256 = "1y15ibqrap49ylggjl723gvda11m3x8iglb5psx4wl95zav1kr3n"; + revision = "1"; + editedCabalFile = "0595hq5wa42wqrcypxf286csrymhrby43icw2imy9gkalmrqdbil"; + libraryHaskellDepends = [ base basement ghc-prim ]; + testHaskellDepends = [ base basement ]; + benchmarkHaskellDepends = [ base basement gauge ]; + homepage = "https://github.com/haskell-foundation/foundation"; + description = "Alternative prelude with batteries and no dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "foundation-edge" = callPackage ({ mkDerivation, bytestring, foundation, text }: mkDerivation { @@ -76106,18 +76839,16 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gauge_0_2_0" = callPackage + "gauge_0_2_1" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, directory - , HUnit, math-functions, mwc-random, process, tasty, tasty-hunit - , vector + , HUnit, process, tasty, tasty-hunit, vector }: mkDerivation { pname = "gauge"; - version = "0.2.0"; - sha256 = "05sq8lgg7a7y5wpvsvx847whwdznsarxf41vndjx264v8x61jv86"; + version = "0.2.1"; + sha256 = "0401b5jzfib4wxwicqynhkn79q98hnxrpiqk1b353a6wix55hy1d"; libraryHaskellDepends = [ - base basement deepseq directory math-functions mwc-random process - vector + base basement deepseq directory process vector ]; testHaskellDepends = [ base bytestring deepseq directory HUnit tasty tasty-hunit @@ -76570,6 +77301,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gen-imports" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, filepath + , hackage-db, pretty + }: + mkDerivation { + pname = "gen-imports"; + version = "0.1.0.2"; + sha256 = "1qm01lnvicg59cnj659famd7f9z1z6l9r4jsl7gakrq0ylw7mkqd"; + libraryHaskellDepends = [ + base bytestring Cabal containers filepath hackage-db pretty + ]; + homepage = "https://github.com/clintonmead/gen-imports#readme"; + description = "Code to generate instances for the package \"ghc-instances\""; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gen-passwd" = callPackage ({ mkDerivation, base, bytestring, optparse-applicative, random , vector @@ -76834,6 +77581,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-deriving_1_12_1" = callPackage + ({ mkDerivation, base, containers, ghc-prim, hspec, hspec-discover + , template-haskell + }: + mkDerivation { + pname = "generic-deriving"; + version = "1.12.1"; + sha256 = "0wwl29f5mlxmrigh0kp35q7aj10ymknnjabmdrdfxpi079rkzzgm"; + revision = "1"; + editedCabalFile = "1vr9lyvcrdiar6ndqnspwvhvrbnc1fvsjyx458ivpcr6j75j0l5j"; + libraryHaskellDepends = [ + base containers ghc-prim template-haskell + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + homepage = "https://github.com/dreixel/generic-deriving"; + description = "Generic programming library for generalised deriving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-enum" = callPackage ({ mkDerivation, array, base, bytestring, hspec }: mkDerivation { @@ -76865,6 +77633,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "generic-lens-labels" = callPackage + ({ mkDerivation, base, generic-lens }: + mkDerivation { + pname = "generic-lens-labels"; + version = "0.1.0.2"; + sha256 = "0lhzxknz8117zc28d7l9wfvln5lp7alxfx8f6q4b986i93dzkl09"; + libraryHaskellDepends = [ base generic-lens ]; + homepage = "https://github.com/duog/generic-lens-labels"; + description = "GHC.OverloadedLabels.IsLabel instance for lenses from ghc-generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "generic-lucid-scaffold" = callPackage ({ mkDerivation, base, lucid, text }: mkDerivation { @@ -76934,12 +77714,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-random_1_1_0_1" = callPackage + "generic-random_1_1_0_2" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { pname = "generic-random"; - version = "1.1.0.1"; - sha256 = "0axbsrxcczhlci4zm4brq2lmd7cjgmixl9hk6jnd86w4v107xiph"; + version = "1.1.0.2"; + sha256 = "0zslrz4cizw8c76q5szgmpc58f25hx4qf01lavxshynn771cx271"; libraryHaskellDepends = [ base QuickCheck ]; testHaskellDepends = [ base QuickCheck ]; homepage = "http://github.com/lysxia/generic-random"; @@ -77350,6 +78130,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_4_0_4" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, validity }: + mkDerivation { + pname = "genvalidity"; + version = "0.4.0.4"; + sha256 = "0gfndjss4j2dmyk46r9ab3ahw8pmc6bry7nzzx7qpgim6zz5597w"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -77608,6 +78402,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "genvalidity-time_0_1_0_1" = callPackage + ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec + , QuickCheck, time, validity-time + }: + mkDerivation { + pname = "genvalidity-time"; + version = "0.1.0.1"; + sha256 = "1d9j6scv83kzxk4jngmad4i0843lm2bkr7yq4qsdbxpsj6akkdrg"; + libraryHaskellDepends = [ + base genvalidity QuickCheck time validity-time + ]; + testHaskellDepends = [ base genvalidity-hspec hspec time ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "GenValidity support for time"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-unordered-containers" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity @@ -78330,6 +79142,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-instances" = callPackage + ({ mkDerivation, array, base, binary, bytestring, Cabal, containers + , deepseq, directory, filepath, ghc, ghc-boot, ghc-compact + , ghc-prim, hoopl, hpc, integer-gmp, process, template-haskell + , time, unix + }: + mkDerivation { + pname = "ghc-instances"; + version = "0.1.0.1"; + sha256 = "0vfqwd2w95lwqa4sbxaz9yl0mk8qj2v28zgzqhmlfg4xg25l76qs"; + revision = "1"; + editedCabalFile = "0rkg9mmxad74fqa1k8np8yj3p0agicpj8cy2983397ibzhyrsjwc"; + libraryHaskellDepends = [ + array base binary bytestring Cabal containers deepseq directory + filepath ghc ghc-boot ghc-compact ghc-prim hoopl hpc integer-gmp + process template-haskell time unix + ]; + homepage = "https://github.com/clintonmead/ghc-instances#readme"; + description = "Easily import all instances contained in GHC distributed libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-make" = callPackage ({ mkDerivation, base, process, shake, unordered-containers }: mkDerivation { @@ -79322,6 +80156,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) atk;}; + "gi-atk_2_0_15" = callPackage + ({ mkDerivation, atk, base, bytestring, Cabal, containers, gi-glib + , gi-gobject, haskell-gi, haskell-gi-base, haskell-gi-overloading + , text, transformers + }: + mkDerivation { + pname = "gi-atk"; + version = "2.0.15"; + sha256 = "1vmzby12nvbrka6f44pr1pjwccl0p6s984pxvibajzp72x2knxc9"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib gi-gobject haskell-gi + haskell-gi-base haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ atk ]; + doHaddock = false; + 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, Cabal, cairo, containers , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -79347,6 +80203,32 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) cairo;}; + "gi-cairo_1_0_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-cairo"; + version = "1.0.15"; + sha256 = "1hm8bcd6j11dimb3ksfjkcqf9wqa9frq1jyjpbr2j5s8srrf7031"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ cairo ]; + doHaddock = false; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) cairo;}; + "gi-gdk" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3 @@ -79355,8 +80237,8 @@ self: { }: mkDerivation { pname = "gi-gdk"; - version = "3.0.14"; - sha256 = "0ds8h0sjl4jf8y5vjfl18gsbarhy6pxl6if7nd4lqaznbribw4jl"; + version = "3.0.15"; + sha256 = "17cjg6m69xlmlnwlwa6s23f1j28bfrwkg08v3n5xmz56zvzsgykg"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib @@ -79378,8 +80260,8 @@ self: { }: mkDerivation { pname = "gi-gdkpixbuf"; - version = "2.0.14"; - sha256 = "1p8sksyg9jrva2mm0ipqxv10df0hnmzmiv2rs05ayl1ris366h2q"; + version = "2.0.15"; + sha256 = "0j2bqphjfhgm9nk8pyfpd6zp7i3q4b11s4vlgas9xdwwi9p1md8r"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79400,8 +80282,8 @@ self: { }: mkDerivation { pname = "gi-gdkx11"; - version = "3.0.1"; - sha256 = "0y9dkiwrx6d7r94ihczc250c2wzg2l4jsz9i198r4kysjdgm7q7v"; + version = "3.0.2"; + sha256 = "0s3iry866p6v2hm4d841fcimrhjsk9miskkqf9js8as7mwlk7jac"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib @@ -79422,8 +80304,8 @@ self: { }: mkDerivation { pname = "gi-ggit"; - version = "1.0.1"; - sha256 = "08jfsfjvdbyd1m1si2r50frc4s3x5x9710r2np6wl1p0y3pk20cf"; + version = "1.0.2"; + sha256 = "17449xz5v5n1i6c7vgrszq395v78q2hp2zjlnc85zxj5qlnkwz64"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79444,8 +80326,8 @@ self: { }: mkDerivation { pname = "gi-gio"; - version = "2.0.14"; - sha256 = "0dwy8zd66b04jbn0g7c5n511nl2xxjvchzf56bmw8cfcm384r66d"; + version = "2.0.15"; + sha256 = "1mxiwwm6dnbxxnqm05bh73qnb27dbfsyz3pr2bvgwvhp4f2m0nn3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -79466,8 +80348,8 @@ self: { }: mkDerivation { pname = "gi-girepository"; - version = "1.0.14"; - sha256 = "1pains4g8a4yxacggx6jama3d1rdky684kcm758m6kiigsplkfkp"; + version = "1.0.15"; + sha256 = "1g9bvf850zsbqi4dw8i1nbclqwi599zvwny4fsl0hp8lqb9w7ps6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gobject haskell-gi haskell-gi-base @@ -79501,6 +80383,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-glib_2_0_16" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-glib"; + version = "2.0.16"; + sha256 = "03hl5szq0cyzg37kxh4kyxzciibs4grsypf78ihfsa6nvj4n5fqw"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GLib bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gobject" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib , haskell-gi, haskell-gi-base, haskell-gi-overloading, text @@ -79522,6 +80426,28 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "gi-gobject_2_0_16" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib, glib + , haskell-gi, haskell-gi-base, haskell-gi-overloading, text + , transformers + }: + mkDerivation { + pname = "gi-gobject"; + version = "2.0.16"; + sha256 = "1bgn4ywx94py0v213iv7mbjjvvy3y7gvpgw4wpn38s2np7al8y65"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers gi-glib haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ glib ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "GObject bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gstreamer, haskell-gi, haskell-gi-base @@ -79529,8 +80455,8 @@ self: { }: mkDerivation { pname = "gi-gst"; - version = "1.0.14"; - sha256 = "1yjimqcaqq9ah9nkyd1rq0bvs2sp4vbicfw6d5d0s6pcavqzxhpg"; + version = "1.0.15"; + sha256 = "09h4ilyg85d9b20chqf6fp6zqvxcclqn9i8s02bqw86cq7s19cq4"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -79551,8 +80477,8 @@ self: { }: mkDerivation { pname = "gi-gstaudio"; - version = "1.0.14"; - sha256 = "1l3cldq3i5anb8cmwya33gfpwj9njbhk3f40nz0772sa29j4311h"; + version = "1.0.15"; + sha256 = "0yw6z11d0wgfa19446s34hr260mfasbsd1h7mzfyd690nzicyh8p"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -79573,8 +80499,8 @@ self: { }: mkDerivation { pname = "gi-gstbase"; - version = "1.0.15"; - sha256 = "1gb7q5gxdrpblc8xfbrvv4072vfz910v3fg0h38ixda8p30fh30j"; + version = "1.0.16"; + sha256 = "1pqkiqlhvwjkw9b9i36md7nhi8205940d4jbcvaqywa82hv7k2aa"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst haskell-gi @@ -79596,8 +80522,8 @@ self: { }: mkDerivation { pname = "gi-gstpbutils"; - version = "1.0.14"; - sha256 = "0pjjxqsfrl06v88mz3aacwy5812i752m4h979gw1qn8h431kgg4y"; + version = "1.0.15"; + sha256 = "161wh4rn4f6lsnk8x12fwzn016fv4pymfb3vg6zlfijyj3avhdh9"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstaudio @@ -79619,8 +80545,8 @@ self: { }: mkDerivation { pname = "gi-gsttag"; - version = "1.0.14"; - sha256 = "056wbkkjds3gk2x0wm4abskpqqw5f8gyhwscl3ih5j90w78d0a28"; + version = "1.0.15"; + sha256 = "1i5wqrhipyagsv94yfjfg6wmdbgnjg03mjxbfq5mx09g61iznl2r"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -79641,8 +80567,8 @@ self: { }: mkDerivation { pname = "gi-gstvideo"; - version = "1.0.14"; - sha256 = "1hr20yf43zgcmpmygca5vdn1qb2fhhqqbh8s24kwjfy7bwl8zly1"; + version = "1.0.15"; + sha256 = "1k35x6cc1kiyhwq978dlckib2sfz7k3w2gxfqsha591a0661k10d"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase @@ -79664,8 +80590,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.18"; - sha256 = "1fp84dba8hg6pvkdy0mip2pz9npx0kwp492gx8p1bgf119rqqfl1"; + version = "3.0.19"; + sha256 = "1qcivdbwa3g05dzgzd3jnzha33j5jm06gp2ml9fma0d1160dqa2g"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -79706,8 +80632,8 @@ self: { }: mkDerivation { pname = "gi-gtkosxapplication"; - version = "2.0.14"; - sha256 = "1hx01rr99kw8ja1py7s8fzzxy7psaarsyk9g773rijf25xq4b53f"; + version = "2.0.15"; + sha256 = "1znsrbzin2fxdb7gkip0qhr335f9pinaszn2r320j05sz6k8qdfw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-gobject gi-gtk @@ -79729,8 +80655,8 @@ self: { }: mkDerivation { pname = "gi-gtksource"; - version = "3.0.15"; - sha256 = "09vfxh75wbg3012mbzy39bczlvwyxndiy9wqmhwvhgh3iq0yk2fd"; + version = "3.0.16"; + sha256 = "0fm5bnyq4f9icyhxkyxf42mmanmc2klbdgin75dcdq5r92gipfcp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -79767,6 +80693,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.gnome3) webkitgtk;}; + "gi-javascriptcore_4_0_15" = callPackage + ({ mkDerivation, base, bytestring, Cabal, containers, haskell-gi + , haskell-gi-base, haskell-gi-overloading, text, transformers + , webkitgtk + }: + mkDerivation { + pname = "gi-javascriptcore"; + version = "4.0.15"; + sha256 = "07dz5kisis93x0ywb207w8nv54bfdgsahq325dyvbfvlgkqrxsh3"; + setupHaskellDepends = [ base Cabal haskell-gi ]; + libraryHaskellDepends = [ + base bytestring containers haskell-gi haskell-gi-base + haskell-gi-overloading text transformers + ]; + libraryPkgconfigDepends = [ webkitgtk ]; + doHaddock = false; + homepage = "https://github.com/haskell-gi/haskell-gi"; + description = "JavaScriptCore bindings"; + license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.gnome3) webkitgtk;}; + "gi-notify" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdkpixbuf , gi-glib, gi-gobject, haskell-gi, haskell-gi-base @@ -79774,8 +80722,8 @@ self: { }: mkDerivation { pname = "gi-notify"; - version = "0.7.14"; - sha256 = "12ahyx3pn2pf63n22pa8qkwgh36yrdza2hw3n6khqws814g2f0ay"; + version = "0.7.15"; + sha256 = "1lk27dw7kyiikknmj858g4hv9p48161ixs3qq8pb08jkjlzcwfw8"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gdkpixbuf gi-glib gi-gobject @@ -79796,8 +80744,8 @@ self: { }: mkDerivation { pname = "gi-ostree"; - version = "1.0.5"; - sha256 = "1w9x0jn2k8wny7925zw2lsmvs18i6j15ijizr515brqff3gyi5fs"; + version = "1.0.6"; + sha256 = "04pq0vz2dcyyq03l2gr0mms1l0dvh4ci17kcla6h1nw1lq5f1l6m"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79818,8 +80766,8 @@ self: { }: mkDerivation { pname = "gi-pango"; - version = "1.0.15"; - sha256 = "0ymwbbm5ga31fj6i2mc75743ndqfb7p900576yv5y2p9d8cgp5j1"; + version = "1.0.16"; + sha256 = "1x3q1q4ww1v6v42p1wcaghxsja8cigqaqvklkfg4gxyp2f2cdg57"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-glib gi-gobject haskell-gi @@ -79845,8 +80793,8 @@ self: { }: mkDerivation { pname = "gi-pangocairo"; - version = "1.0.15"; - sha256 = "0vy5fg2867dda19myyjbkxnrrbwgp3n7yqnfwqc67m5n8ziha2sb"; + version = "1.0.16"; + sha256 = "0hp90rx33xbi3w2y3iacf19p9mhkz6s4q8q6hcsrh5jnbavbpjwy"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-glib gi-gobject gi-pango @@ -79871,8 +80819,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.14"; - sha256 = "03dgkaqiy7y808x7g1xmmns1m19xc94f4kg0vjhyb1f1xr7k7hzj"; + version = "0.18.15"; + sha256 = "1qbsmgx0nfn3pm6ffkhaq1wy26jdwnq5zjsxs32cf8ipdzlhg3cv"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-cairo gi-gio gi-glib gi-gobject @@ -79893,8 +80841,8 @@ self: { }: mkDerivation { pname = "gi-secret"; - version = "0.0.4"; - sha256 = "12kvdnxvsaj4mljkjhnma7n0d6qav6k9a4laca881ww50hdbwid2"; + version = "0.0.5"; + sha256 = "0jwdv8fmc7wbwbh3nc1may4ij078xz9xc55rkr62x1szxi6ihdq5"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79915,8 +80863,8 @@ self: { }: mkDerivation { pname = "gi-soup"; - version = "2.4.14"; - sha256 = "1z0cxhyadampjdibsrvqi6rw3kmcvq0q3mf4gk33ss2xb0f86m75"; + version = "2.4.15"; + sha256 = "1imgkbqfkdf7vbx4x170qnnyivy7jdn4hcj428wv3996ff5pjqa6"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-glib gi-gobject haskell-gi @@ -79937,8 +80885,8 @@ self: { }: mkDerivation { pname = "gi-vte"; - version = "2.91.16"; - sha256 = "0gv1ab2an6gfk83d5ryjpfz92rwrll2jyl41i48ql6fagbxx0n18"; + version = "2.91.17"; + sha256 = "1pslywq1mkcvrvbb3d5a4nc6vrmr9hvbgmg8dcsjq061fcg6b2aw"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject @@ -79961,8 +80909,8 @@ self: { }: mkDerivation { pname = "gi-webkit"; - version = "3.0.14"; - sha256 = "006jja6hr7bsqff2yxgzjrdnhbccym32fcr9vd7dscyj4wqw1ng1"; + version = "3.0.15"; + sha256 = "1bd2db34bfza9s84fwqd073wpf8cjp9rrjrlgi2q2hb6y6rn26w3"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf @@ -79985,8 +80933,8 @@ self: { }: mkDerivation { pname = "gi-webkit2"; - version = "4.0.14"; - sha256 = "15r5kq0vq5gc4rsi0icw2f5zbqjw7kgdwpa3fbzn6jx7xmbl39kp"; + version = "4.0.15"; + sha256 = "1mwd5jyis7rfqpigyk1yp3rx2hkdb2gwg4m1l41dggdb8svv1jhp"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib @@ -80009,8 +80957,8 @@ self: { }: mkDerivation { pname = "gi-webkit2webextension"; - version = "4.0.15"; - sha256 = "100m6m13gcyz1wgwj20gh2mybmfpzq9fvqn44a9as37680srx2bi"; + version = "4.0.16"; + sha256 = "010svwg3p3sdd209l8cnwhsm2dp9n6qf0shzqjdx5l1pkjv32zqm"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers gi-gio gi-gobject gi-gtk @@ -80031,8 +80979,8 @@ self: { }: mkDerivation { pname = "gi-xlib"; - version = "2.0.1"; - sha256 = "1f1f3jnrvqisdalsad9k9wjr92c4ykw2i1gngsygainflk3hzgia"; + version = "2.0.2"; + sha256 = "0w9dwnd7a9hh1qn3swa48i8hp4gx9kznc92zjf198lrmrbkamp22"; setupHaskellDepends = [ base Cabal haskell-gi ]; libraryHaskellDepends = [ base bytestring containers haskell-gi haskell-gi-base @@ -80271,7 +81219,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, case-insensitive + , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive , clientsession, concurrent-output, conduit, conduit-extra , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus , directory, disk-free-space, dlist, dns, edit-distance, esqueleto @@ -80291,8 +81239,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171214"; - sha256 = "06nmsibpb1ng058gkfdspwkmv8psgd144qrxchwf3d8lfdphpkih"; + version = "6.20180112"; + sha256 = "0662780hzv2afajphjmgglm01d5w5vs4rp7xa1px1bznk67yjdxw"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -80301,6 +81249,10 @@ self: { ]; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ + base bytestring Cabal data-default directory exceptions filepath + hslogger IfElse process split unix-compat utf8-string + ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession concurrent-output conduit @@ -82157,8 +83109,8 @@ self: { }: mkDerivation { pname = "gnss-converters"; - version = "0.3.25"; - sha256 = "1ps3jjlf9igqmllyapqznzxjkf7291i7zv8w86p2fnm6wxsd73q9"; + version = "0.3.28"; + sha256 = "1r754m2yfg7mmrg0m4lx0dpwp9d2fypyllgipmqxcfirgqyhln09"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -82222,6 +83174,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gnuplot_0_5_5" = callPackage + ({ mkDerivation, array, base, containers, data-accessor + , data-accessor-transformers, deepseq, filepath, process, temporary + , time, transformers, utility-ht + }: + mkDerivation { + pname = "gnuplot"; + version = "0.5.5"; + sha256 = "1ka756zvc6q5hkjhi8zknb7d5whizmyl7ff0qzclx1n8qbx4jv98"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers data-accessor data-accessor-transformers + deepseq filepath process temporary time transformers utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Gnuplot"; + description = "2D and 3D plots using gnuplot"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gnutls" = callPackage ({ mkDerivation, base, bytestring, gnutls, monads-tf, transformers }: @@ -88131,6 +89105,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haddock_2_17_5" = callPackage + ({ mkDerivation, base, filepath, haddock-api, hspec }: + mkDerivation { + pname = "haddock"; + version = "2.17.5"; + sha256 = "1qxy6yxpxgpqpwcs76ydpal45cz4a3hyq3rq07cwma1cs4p034ql"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base haddock-api ]; + testHaskellDepends = [ base filepath hspec ]; + doCheck = false; + preCheck = "unset GHC_PACKAGE_PATH"; + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock" = callPackage ({ mkDerivation, base, filepath, haddock-api, hspec }: mkDerivation { @@ -88371,20 +89363,22 @@ self: { }) {}; "hadolint" = callPackage - ({ mkDerivation, base, bytestring, gitrev, hspec, HUnit - , language-docker, optparse-applicative, parsec, ShellCheck, split + ({ mkDerivation, base, bytestring, directory, filepath, gitrev + , hspec, HUnit, language-docker, optparse-applicative, parsec + , ShellCheck, split, yaml }: mkDerivation { pname = "hadolint"; - version = "1.2.5"; - sha256 = "1rnbxkzqj493yn41ln9hxpmbdvgynb1mm86kl4l522is96smqp7v"; + version = "1.2.6"; + sha256 = "09ajj0x9cw1nyrxlki8kldal1h0mfsyr8rsz8c1y23qf8d2h69f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring language-docker parsec ShellCheck split ]; executableHaskellDepends = [ - base gitrev language-docker optparse-applicative parsec + base directory filepath gitrev language-docker optparse-applicative + parsec yaml ]; testHaskellDepends = [ base bytestring hspec HUnit language-docker parsec ShellCheck split @@ -88864,6 +89858,51 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) utillinux;}; + "hakyll_4_11_0_0" = callPackage + ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring + , containers, cryptohash, data-default, deepseq, directory + , file-embed, filepath, fsnotify, http-conduit, http-types + , lrucache, mtl, network, network-uri, optparse-applicative, pandoc + , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base + , regex-tdfa, resourcet, scientific, tagsoup, tasty, tasty-hunit + , tasty-quickcheck, text, time, time-locale-compat + , unordered-containers, utillinux, vector, wai, wai-app-static + , warp, yaml + }: + mkDerivation { + pname = "hakyll"; + version = "4.11.0.0"; + sha256 = "08930cs783krsjqzlswz4fplppdlmw5b29nry5i7kan7d4f4lfb8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptohash data-default deepseq directory file-embed filepath + fsnotify http-conduit http-types lrucache mtl network network-uri + optparse-applicative pandoc pandoc-citeproc parsec process random + regex-base regex-tdfa resourcet scientific tagsoup text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + executableHaskellDepends = [ base directory filepath pandoc ]; + testHaskellDepends = [ + base binary blaze-html blaze-markup bytestring containers + cryptohash data-default deepseq directory filepath fsnotify + http-conduit http-types lrucache mtl network network-uri + optparse-applicative pandoc pandoc-citeproc parsec process + QuickCheck random regex-base regex-tdfa resourcet scientific + tagsoup tasty tasty-hunit tasty-quickcheck text time + time-locale-compat unordered-containers vector wai wai-app-static + warp yaml + ]; + testToolDepends = [ utillinux ]; + homepage = "http://jaspervdj.be/hakyll"; + description = "A static website compiler library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) utillinux;}; + "hakyll-R" = callPackage ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process }: @@ -89472,8 +90511,8 @@ self: { }: mkDerivation { pname = "hamtsolo"; - version = "1.0.0"; - sha256 = "0lpac24fayd9s40b39l46aak9d51vv3bjslg0drgj2xlp1d9w60y"; + version = "1.0.2"; + sha256 = "0756ffnh1fxwagwkj3zy8axnwkwhnn8m37583sr0ymwyp9vwi3sx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92009,6 +93048,34 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; + "haskell-gi_0_21_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers + , directory, doctest, filepath, glib, gobjectIntrospection + , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe + , text, transformers, xdg-basedir, xml-conduit + }: + mkDerivation { + pname = "haskell-gi"; + version = "0.21.0"; + sha256 = "109jgixxrb9xjlkqnwkch9zgb2rj79knd8ivgfi1cc4v30299vwi"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base bytestring Cabal containers directory filepath + haskell-gi-base mtl pretty-show process regex-tdfa safe text + transformers xdg-basedir xml-conduit + ]; + libraryPkgconfigDepends = [ glib gobjectIntrospection ]; + executableHaskellDepends = [ + base containers directory filepath haskell-gi-base pretty-show text + ]; + testHaskellDepends = [ base doctest ]; + 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 { @@ -92022,6 +93089,20 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; + "haskell-gi-base_0_21_0" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.21.0"; + sha256 = "1vrz2vrmvsbahzsp1c06x4qmny5qhbrnz5ybzh5p8z1g3ji9z166"; + 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) glib;}; + "haskell-gi-overloading_0_0" = callPackage ({ mkDerivation }: mkDerivation { @@ -92673,6 +93754,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-src-exts-sc" = callPackage + ({ mkDerivation, base, haskell-src-exts }: + mkDerivation { + pname = "haskell-src-exts-sc"; + version = "0.1.0.4"; + sha256 = "00db79f99333viibrzhr77cvhv9ihk7vb5yh1xbsz2lirfajwmr2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base haskell-src-exts ]; + executableHaskellDepends = [ base haskell-src-exts ]; + homepage = "https://github.com/achirkin/haskell-src-exts-sc#readme"; + description = "Pretty print haskell code with comments"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-src-exts-simple" = callPackage ({ mkDerivation, base, haskell-src-exts }: mkDerivation { @@ -92714,6 +93810,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-exts-util_0_2_2" = callPackage + ({ mkDerivation, base, containers, data-default, haskell-src-exts + , semigroups, transformers, uniplate + }: + mkDerivation { + pname = "haskell-src-exts-util"; + version = "0.2.2"; + sha256 = "14rhwcrdz3kfb69c64qn8kybl7wnpajrjlfz5p95ca4bva4mwclg"; + libraryHaskellDepends = [ + base containers data-default haskell-src-exts semigroups + transformers uniplate + ]; + homepage = "https://github.com/pepeiborra/haskell-src-exts-util"; + description = "Helper functions for working with haskell-src-exts trees"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta" = callPackage ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb , template-haskell, test-framework, test-framework-hunit @@ -92734,6 +93848,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_8_0_2" = callPackage + ({ mkDerivation, base, haskell-src-exts, HUnit, pretty, syb + , template-haskell, test-framework, test-framework-hunit + , th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.8.0.2"; + sha256 = "12rc4v5dbbbcwdp7j8isvnm9vqpazv124j5kdfwlgwgwjhxi8ysb"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + testHaskellDepends = [ + base haskell-src-exts HUnit pretty template-haskell test-framework + test-framework-hunit + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -92805,6 +93940,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-ast_1_0_0_4" = callPackage + ({ mkDerivation, base, ghc, mtl, references, template-haskell + , uniplate + }: + mkDerivation { + pname = "haskell-tools-ast"; + version = "1.0.0.4"; + sha256 = "000dazz2qmc46pyfxskimz02xllf7fs6nl18ki6pvvahp0ammgd9"; + libraryHaskellDepends = [ + base ghc mtl references template-haskell uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Haskell AST for efficient tooling"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-ast-fromghc" = callPackage ({ mkDerivation, base, bytestring, containers, ghc , haskell-tools-ast, mtl, references, safe, split, template-haskell @@ -92877,6 +94029,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-backend-ghc_1_0_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, ghc, ghc-boot-th + , haskell-tools-ast, mtl, references, safe, split, template-haskell + , transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-backend-ghc"; + version = "1.0.0.4"; + sha256 = "0c909xknb4q28cqm4cckx5girygz1jjg0nwj9v31dj7yhwgm6y2g"; + libraryHaskellDepends = [ + base bytestring containers ghc ghc-boot-th haskell-tools-ast mtl + references safe split template-haskell transformers uniplate + ]; + homepage = "https://github.com/nboldi/haskell-tools"; + description = "Creating the Haskell-Tools AST from GHC's representations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-builtin-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -92909,6 +94080,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-builtin-refactorings_1_0_0_4" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-prettyprint + , haskell-tools-refactor, haskell-tools-rewrite, mtl, old-time + , polyparse, references, split, tasty, tasty-hunit + , template-haskell, time, transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-builtin-refactorings"; + version = "1.0.0.4"; + sha256 = "1hxl8j8nkn3f59wxbzfyhjbshjypi4bv7v2vrqlpfygnb1n1jhci"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl references split template-haskell + transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-refactor + haskell-tools-rewrite mtl old-time polyparse references split tasty + tasty-hunit template-haskell time transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-cli" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , directory, filepath, ghc, ghc-paths, Glob @@ -92946,6 +94149,43 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-cli_1_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , directory, filepath, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-daemon + , haskell-tools-refactor, knob, mtl, optparse-applicative, process + , references, split, strict, tasty, tasty-hunit, time + }: + mkDerivation { + pname = "haskell-tools-cli"; + version = "1.0.0.4"; + sha256 = "121q9ydi0jlj9bs6zyy2h6vkmaajwf1pcnnq4s21yw99ah4xhy6q"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath ghc ghc-paths + haskell-tools-builtin-refactorings haskell-tools-daemon + haskell-tools-refactor mtl references split strict + ]; + executableHaskellDepends = [ + base directory filepath Glob haskell-tools-builtin-refactorings + haskell-tools-daemon mtl optparse-applicative process split + ]; + testHaskellDepends = [ + base bytestring directory filepath + haskell-tools-builtin-refactorings knob tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + aeson base bytestring criterion directory filepath + haskell-tools-builtin-refactorings haskell-tools-daemon knob split + time + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Command-line frontend for Haskell-tools Refact"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-daemon" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob @@ -92981,6 +94221,41 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-daemon_1_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, Diff, directory, filepath, fswatch, ghc, ghc-paths, Glob + , haskell-tools-builtin-refactorings, haskell-tools-prettyprint + , haskell-tools-refactor, HUnit, mtl, network, optparse-applicative + , pretty, process, references, split, strict, tasty, tasty-hunit + , template-haskell + }: + mkDerivation { + pname = "haskell-tools-daemon"; + version = "1.0.0.4"; + sha256 = "1gqx9nn87mq2n722lzl0slpw54dg6asc2s77zjs0sywvcpck4b4v"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq Diff directory + filepath fswatch ghc ghc-paths haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor mtl network + optparse-applicative pretty process references split strict + template-haskell + ]; + executableHaskellDepends = [ + base directory filepath haskell-tools-builtin-refactorings + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath ghc Glob + haskell-tools-builtin-refactorings HUnit network process tasty + tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Background process for Haskell-tools that editors can connect to"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-debug" = callPackage ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings @@ -93006,6 +94281,31 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-debug_1_0_0_4" = callPackage + ({ mkDerivation, base, filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings + , haskell-tools-prettyprint, haskell-tools-refactor, references + , split, template-haskell + }: + mkDerivation { + pname = "haskell-tools-debug"; + version = "1.0.0.4"; + sha256 = "0lh48bfjicpjsk2vazl91n6xw0ahff89rw9iiizpla92rz1fcb20"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base filepath ghc ghc-paths haskell-tools-ast + haskell-tools-backend-ghc haskell-tools-builtin-refactorings + haskell-tools-prettyprint haskell-tools-refactor references split + template-haskell + ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Debugging Tools for Haskell-tools"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-demo" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, ghc, ghc-paths, haskell-tools-ast @@ -93038,6 +94338,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-demo_1_0_0_4" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-backend-ghc, haskell-tools-builtin-refactorings + , haskell-tools-prettyprint, haskell-tools-refactor, http-types + , HUnit, mtl, network, references, tasty, tasty-hunit, transformers + , wai, wai-websockets, warp, websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "1.0.0.4"; + sha256 = "0vqjs4wrgjacj3i6hykfvafhnyik6nn9p8miyb1plmhm9w6g0ynq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-builtin-refactorings haskell-tools-prettyprint + haskell-tools-refactor http-types mtl references transformers wai + wai-websockets warp websockets + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + aeson base bytestring directory filepath HUnit network tasty + tasty-hunit websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-experimental-refactorings" = callPackage ({ mkDerivation, base, Cabal, containers, directory, either , filepath, ghc, ghc-paths, haskell-tools-ast @@ -93048,8 +94380,8 @@ self: { }: mkDerivation { pname = "haskell-tools-experimental-refactorings"; - version = "1.0.0.3"; - sha256 = "0y8dzrxv62ad164nikzhlny55im4ys16nkiak041yqygzg9qzshz"; + version = "1.0.0.4"; + sha256 = "0mzwvs33snv3a3dvhkd1mnidkifip21rj2y44k9dcwdhfzcz6xbl"; libraryHaskellDepends = [ base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-backend-ghc @@ -93086,6 +94418,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-prettyprint_1_0_0_4" = callPackage + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, split, text, uniplate + }: + mkDerivation { + pname = "haskell-tools-prettyprint"; + version = "1.0.0.4"; + sha256 = "001mk8fdxl06il8s3w1i4901s85kb99nyhp3yk7jg6ghh4iaf1c9"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast mtl references split text + uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Pretty printing of Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-refactor" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc @@ -93107,6 +94457,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-refactor_1_0_0_4" = callPackage + ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc + , ghc-paths, haskell-tools-ast, haskell-tools-backend-ghc + , haskell-tools-prettyprint, haskell-tools-rewrite, mtl, references + , split, template-haskell, transformers, uniplate + }: + mkDerivation { + pname = "haskell-tools-refactor"; + version = "1.0.0.4"; + sha256 = "192najfy3r05vhxl21bg6lqy8m5081sdxp5yfvw9nyjlarfcb2b9"; + libraryHaskellDepends = [ + base Cabal containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-backend-ghc + haskell-tools-prettyprint haskell-tools-rewrite mtl references + split template-haskell transformers uniplate + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Refactoring Tool for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tools-rewrite" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , haskell-tools-ast, haskell-tools-prettyprint, mtl, references @@ -93129,6 +94501,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-tools-rewrite_1_0_0_4" = callPackage + ({ mkDerivation, base, containers, directory, filepath, ghc + , haskell-tools-ast, haskell-tools-prettyprint, mtl, references + , tasty, tasty-hunit + }: + mkDerivation { + pname = "haskell-tools-rewrite"; + version = "1.0.0.4"; + sha256 = "1jjg6w2ajlnjz7hl74znm2gaylmlixvp65m2ns7p4iryycsr5fjg"; + libraryHaskellDepends = [ + base containers ghc haskell-tools-ast haskell-tools-prettyprint mtl + references + ]; + testHaskellDepends = [ + base directory filepath haskell-tools-ast haskell-tools-prettyprint + tasty tasty-hunit + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Facilities for generating new parts of the Haskell-Tools AST"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-tor" = callPackage ({ mkDerivation, array, asn1-encoding, asn1-types, async , attoparsec, base, base64-bytestring, binary, bytestring, cereal @@ -94433,8 +95828,8 @@ self: { pname = "hasmin"; version = "1.0.1"; sha256 = "1h5ygl9qmzmbhqfb58hhm2zw850dqfkp4b8cp3bhsnangg4lgbjk"; - revision = "1"; - editedCabalFile = "18qpp71nkf0sayzwxwfn2nz1g8fklsa55h2jrazqilhrdq82gq7d"; + revision = "2"; + editedCabalFile = "0hav8khv14k41rf4lmh79w6ym4basrmmsjwfc5bww2qya7889d5k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96357,6 +97752,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "heaps_0_3_6" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, directory, doctest + , filepath + }: + mkDerivation { + pname = "heaps"; + version = "0.3.6"; + sha256 = "1cnxgmxxvl053yv93vcz5fnla4iir5g9wr697n88ysdyybbkq70q"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/heaps/"; + description = "Asymptotically optimal Brodal/Okasaki heaps"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heapsort" = callPackage ({ mkDerivation, array, base, QuickCheck }: mkDerivation { @@ -96604,6 +98016,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hedis_0_10_0" = callPackage + ({ mkDerivation, async, base, bytestring, bytestring-lexing + , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri + , resource-pool, scanner, slave-thread, stm, test-framework + , test-framework-hunit, text, time, unordered-containers, vector + }: + mkDerivation { + pname = "hedis"; + version = "0.10.0"; + sha256 = "02f095461v812csrncf4bdhvgpn1a3wqpd66gpb72pxij4mrh5zy"; + libraryHaskellDepends = [ + async base bytestring bytestring-lexing deepseq errors HTTP mtl + network network-uri resource-pool scanner stm text time + unordered-containers vector + ]; + testHaskellDepends = [ + async base bytestring doctest HUnit mtl slave-thread stm + test-framework test-framework-hunit text time + ]; + benchmarkHaskellDepends = [ base mtl time ]; + homepage = "https://github.com/informatikr/hedis"; + description = "Client library for the Redis datastore: supports full command set, pipelining"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hedis-config" = callPackage ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text , time @@ -98034,25 +99472,26 @@ self: { }) {}; "hfmt" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal, Diff - , directory, exceptions, filepath, haskell-src-exts, hindent, hlint - , HUnit, optparse-applicative, path, path-io, pipes, pretty - , stylish-haskell, test-framework, test-framework-hunit, text - , transformers, yaml + ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal + , conduit-combinators, Diff, directory, exceptions, filepath + , haskell-src-exts, hindent, hlint, HUnit, optparse-applicative + , path, path-io, pretty, stylish-haskell, test-framework + , test-framework-hunit, text, transformers, yaml }: mkDerivation { pname = "hfmt"; - version = "0.1.1"; - sha256 = "0cg5vaihyrdsigpvj82a2xdmq6wj1vbqg10ldcp4c2pxwsgz97mh"; + version = "0.2.0"; + sha256 = "1d62kby9mzld7lnfvrvhkri8lf2wgijb972wzrarbcbnkahhjnps"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring Cabal directory exceptions filepath - haskell-src-exts hindent hlint HUnit path path-io pipes + base bytestring Cabal conduit-combinators Diff directory exceptions + filepath haskell-src-exts hindent hlint HUnit path path-io pretty stylish-haskell text transformers yaml ]; executableHaskellDepends = [ - ansi-wl-pprint base Diff optparse-applicative pipes pretty + ansi-wl-pprint base conduit-combinators directory + optparse-applicative ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -99902,6 +101341,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hjsonschema_1_7_2" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, file-embed, filepath, hashable, hjsonpointer, hspec + , http-client, http-types, pcre-heavy, profunctors, protolude + , QuickCheck, scientific, semigroups, text, unordered-containers + , vector, wai-app-static, warp + }: + mkDerivation { + pname = "hjsonschema"; + version = "1.7.2"; + sha256 = "1czxfwfhl7zxx8385x8qskiym8qb1fpjdxmbywl8p4p102cb9083"; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed filepath hashable + hjsonpointer http-client http-types pcre-heavy profunctors + protolude QuickCheck scientific semigroups text + unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring directory filepath hjsonpointer hspec + profunctors protolude QuickCheck semigroups text + unordered-containers vector wai-app-static warp + ]; + homepage = "https://github.com/seagreen/hjsonschema"; + description = "JSON Schema library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hjugement" = callPackage ({ mkDerivation, base, containers, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, text, transformers @@ -100143,6 +101610,8 @@ self: { pname = "hledger-iadd"; version = "1.3.1"; sha256 = "0z7f9bm7xkq8a9kbhf3bd6fxhfaab08ddgghpbg5z460l4lhcczv"; + revision = "1"; + editedCabalFile = "1kwncys0n2xbvbq6a5rgfxg955726xk8av6v9221qx8zpndf2di4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -100426,7 +101895,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hlint_2_0_12" = callPackage + "hlint_2_0_15" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, cmdargs , containers, cpphs, data-default, directory, extra, filepath , haskell-src-exts, haskell-src-exts-util, hscolour, process @@ -100435,8 +101904,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "2.0.12"; - sha256 = "1cfq4g1h5c47nxqn7433jd40hajv5pq30p5rb132fc5sp68vx0by"; + version = "2.0.15"; + sha256 = "0k9y9dj9sq8rwkjnca4s6wv0ncba536lmcpq10vpyvy47x5dzs2d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -100589,7 +102058,7 @@ self: { pname = "hmatrix"; version = "0.18.1.0"; sha256 = "07zkwvg872hfk6jyn4s54ws8mvclynazaxf7fsbqi16dmf9dn61c"; - configureFlags = [ "-fopenblas" ]; + configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; libraryHaskellDepends = [ array base binary bytestring deepseq random split storable-complex vector @@ -100601,6 +102070,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) openblasCompat;}; + "hmatrix_0_18_2_0" = callPackage + ({ mkDerivation, array, base, binary, bytestring, deepseq + , openblasCompat, random, semigroups, split, storable-complex + , vector + }: + mkDerivation { + pname = "hmatrix"; + version = "0.18.2.0"; + sha256 = "0q452gpmyxb0qp7pnwyrvvw3nc650qm68z3g0cd88s1x2j0xq34n"; + configureFlags = [ "-fdisable-default-paths" "-fopenblas" ]; + libraryHaskellDepends = [ + array base binary bytestring deepseq random semigroups split + storable-complex vector + ]; + librarySystemDepends = [ openblasCompat ]; + 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 ({ mkDerivation, base, hmatrix, liblapack, transformers }: mkDerivation { @@ -100981,17 +102471,17 @@ self: { }) {}; "hmm-hmatrix" = callPackage - ({ mkDerivation, array, base, containers, explicit-exception - , hmatrix, lazy-csv, non-empty, random, semigroups, transformers - , utility-ht + ({ mkDerivation, array, base, containers, deepseq + , explicit-exception, hmatrix, lazy-csv, non-empty, random + , semigroups, transformers, utility-ht }: mkDerivation { pname = "hmm-hmatrix"; - version = "0.0.1"; - sha256 = "1kkikv3spnvqms59980p8aappw3wh26y9qs2c8ykia5fpz9zag4h"; + version = "0.1"; + sha256 = "1ww2hxy9s9d2mywf5v5ka5fac9105ir3frm9vafgw2ydq64rdivx"; libraryHaskellDepends = [ - array base containers explicit-exception hmatrix lazy-csv non-empty - random semigroups transformers utility-ht + array base containers deepseq explicit-exception hmatrix lazy-csv + non-empty random semigroups transformers utility-ht ]; homepage = "http://hub.darcs.net/thielema/hmm-hmatrix"; description = "Hidden Markov Models using HMatrix primitives"; @@ -101035,6 +102525,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) mpfr;}; + "hmpfr_0_4_4" = callPackage + ({ mkDerivation, base, integer-gmp, mpfr }: + mkDerivation { + pname = "hmpfr"; + version = "0.4.4"; + sha256 = "1x8n5245rm0brjl7vhcabazh1k69dcjdas70pnrnlkx26bqfpb9b"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base integer-gmp ]; + librarySystemDepends = [ mpfr ]; + homepage = "https://github.com/michalkonecny/hmpfr"; + description = "Haskell binding to the MPFR library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) mpfr;}; + "hmt" = callPackage ({ mkDerivation, aeson, array, base, bytestring, colour, containers , data-ordlist, directory, fgl, filepath, lazy-csv, logict @@ -102100,6 +103605,8 @@ self: { pname = "hoogle"; version = "5.0.14"; sha256 = "1y5vjwp60s35h13bnhjh4ga731m3vz004dbg8w5s7mwnfk5akkz7"; + revision = "3"; + editedCabalFile = "14973295rif9gsyaxfrw7y5p59sxnz4znki3jm3bk73y0b3j1l5d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102131,8 +103638,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.16"; - sha256 = "0fkq0mgf48rkyscs5ca11dcz47wr9f2sayl2607rcj4v897kx1a5"; + version = "5.0.17"; + sha256 = "0igs4c08sjwckk71ck358d4c90mgb3mhlyl2ag569wzyqyj77mlp"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -102399,6 +103906,8 @@ self: { pname = "hopfli"; version = "0.2.2.1"; sha256 = "061as7aa806xzcpch35isrkqbgqhwdy48fs049f491wwb47xqwad"; + revision = "1"; + editedCabalFile = "116jns5im51sb9xiwpx308wz3pr67335633anrf8f704pz8vwjka"; libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; homepage = "https://github.com/ananthakumaran/hopfli"; @@ -102954,6 +104463,43 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_22_0" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , http-client, http-client-tls, http-types, interpolate, mockery + , pretty, QuickCheck, scientific, temporary, text, transformers + , unordered-containers, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.22.0"; + sha256 = "1abkbnnmrw2hdvvpf55m4dxh7vdxyk6ayc21ah91sgv8nnmavm67"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types pretty scientific text transformers unordered-containers + yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types pretty scientific text transformers unordered-containers + yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types interpolate mockery pretty QuickCheck scientific + temporary text transformers unordered-containers yaml + ]; + homepage = "https://github.com/sol/hpack#readme"; + description = "An alternative format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -103382,8 +104928,8 @@ self: { }: mkDerivation { pname = "hpqtypes-extras"; - version = "1.5.0.0"; - sha256 = "1hp9nn49a8kg58y8cywsiwcy64zq65c1hnsn2xi5ajk71hag8b8c"; + version = "1.5.0.1"; + sha256 = "022732jsji79a1bb805gh6pcif9ismivs2dwgwks0fb5i9hviilm"; libraryHaskellDepends = [ base base16-bytestring bytestring containers cryptohash exceptions fields-json hpqtypes lifted-base log-base monad-control mtl safe @@ -105266,36 +106812,36 @@ self: { "hsdev" = callPackage ({ mkDerivation, aeson, aeson-lens, aeson-pretty, array, async , attoparsec, base, bytestring, Cabal, containers, cpphs - , data-default, deepseq, directory, exceptions, filepath, fsnotify - , ghc, ghc-boot, ghc-paths, ghc-syb-utils, haddock-api - , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens - , lifted-base, mmorph, monad-control, monad-loops, mtl, network - , optparse-applicative, process, regex-pcre-builtin, scientific - , simple-log, syb, template-haskell, text, text-region, time - , transformers, transformers-base, uniplate, unix - , unordered-containers, vector + , data-default, deepseq, direct-sqlite, directory, exceptions + , filepath, fsnotify, ghc, ghc-boot, ghc-paths, ghc-syb-utils + , haddock-api, haskell-names, haskell-src-exts, hdocs, hformat + , hlint, hspec, HTTP, lens, lifted-base, mmorph, monad-control + , monad-loops, mtl, network, optparse-applicative, process + , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm + , syb, template-haskell, text, text-region, time, transformers + , transformers-base, uniplate, unix, unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.2.5.1"; - sha256 = "15rr12mric0gm4xfskwsqh89kdiqxzvg47nkddbyr7hah1rjmcn4"; + version = "0.3.0.1"; + sha256 = "02wwwxbr6ymmxw3g0m47bxm82mdh755f8jr6vjcbmdb60bqn9lrn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal - containers cpphs data-default deepseq directory exceptions filepath - fsnotify ghc ghc-boot ghc-paths ghc-syb-utils haddock-api - haskell-src-exts hdocs hformat hlint HTTP lens lifted-base mmorph - monad-control monad-loops mtl network optparse-applicative process - regex-pcre-builtin scientific simple-log syb template-haskell text - text-region time transformers transformers-base uniplate unix + containers cpphs data-default deepseq direct-sqlite directory + exceptions filepath fsnotify ghc ghc-boot ghc-paths ghc-syb-utils + haddock-api haskell-names haskell-src-exts hdocs hformat hlint HTTP + lens lifted-base mmorph monad-control monad-loops mtl network + optparse-applicative process regex-pcre-builtin scientific + simple-log sqlite-simple stm syb template-haskell text text-region + time transformers transformers-base uniplate unix unordered-containers vector ]; executableHaskellDepends = [ - aeson aeson-pretty base bytestring containers data-default deepseq - directory exceptions filepath haskell-src-exts lens monad-loops mtl - network optparse-applicative process text transformers - unordered-containers vector + aeson aeson-pretty base bytestring containers deepseq directory + exceptions filepath monad-loops mtl network optparse-applicative + process text transformers unordered-containers ]; testHaskellDepends = [ aeson aeson-lens async base containers data-default deepseq @@ -106258,15 +107804,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec_2_4_6" = callPackage + "hspec_2_4_7" = callPackage ({ mkDerivation, base, call-stack, directory, hspec-core , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck , stringbuilder, transformers }: mkDerivation { pname = "hspec"; - version = "2.4.6"; - sha256 = "1lq24aszswn103l801vggmmd0sp75zrkjzskifz47p3njl1lb1pj"; + version = "2.4.7"; + sha256 = "1jvf7x43gkch4b8nxqdascqlh4rh2d1qvl44skwqkz0gw154ldan"; libraryHaskellDepends = [ base call-stack hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -106338,6 +107884,8 @@ self: { pname = "hspec-core"; version = "2.4.4"; sha256 = "1pxzr3l8b9640mh904n51nwlr2338wak23781s48a9kzvwf347b0"; + revision = "1"; + editedCabalFile = "0m4bmclgs7as957wdnq1y4zh49hrwpslgz5m9430myl4dc14r81l"; libraryHaskellDepends = [ ansi-terminal array async base call-stack deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -106355,7 +107903,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-core_2_4_6" = callPackage + "hspec-core_2_4_7" = callPackage ({ mkDerivation, ansi-terminal, array, async, base, call-stack , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -106363,8 +107911,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.4.6"; - sha256 = "048bql9v6skxxjyapknpby0iisk2g2d8m6caxpkyd91cyrdvq4j6"; + version = "2.4.7"; + sha256 = "0syjbx3s62shwddp75qj0nfwmfjn0yflja4bh23x161xpx1g0igx"; libraryHaskellDepends = [ ansi-terminal array async base call-stack deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -106389,8 +107937,8 @@ self: { }: mkDerivation { pname = "hspec-dirstream"; - version = "0.1.0.1"; - sha256 = "0dkxk45wlx051m1g36kxam22lvdzhmzcvls3268wc4m3r0clxjli"; + version = "0.3.0.0"; + sha256 = "1gg17qx95v0widjng6sf0mf589vckixnwjl8n0kh08wpvbriqz60"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base dirstream filepath hspec hspec-core pipes pipes-safe @@ -106418,13 +107966,13 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-discover_2_4_6" = callPackage + "hspec-discover_2_4_7" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.4.6"; - sha256 = "1qh07b5by9ry62l7f700zxlnbdsjnhr5s1ja8ws0ifx6xqsyl719"; + version = "2.4.7"; + sha256 = "1cgj6c6f5vpn36jg2j7v80nr87x1dsf7qyvxvjw8qimjdxrcx0ba"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; @@ -106687,6 +108235,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-meta_2_4_6" = callPackage + ({ mkDerivation, ansi-terminal, array, async, base, call-stack + , deepseq, directory, filepath, hspec-expectations, HUnit + , QuickCheck, quickcheck-io, random, setenv, time, transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.4.6"; + sha256 = "0qmvk01n79j6skn79r6zalg2pd0x0nqqn9qn8mhg0pgyzcdnfc9b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv time transformers + ]; + executableHaskellDepends = [ + ansi-terminal array async base call-stack deepseq directory + filepath hspec-expectations HUnit QuickCheck quickcheck-io random + setenv time transformers + ]; + 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 ({ mkDerivation, base, hspec-core, monad-control, transformers , transformers-base @@ -106818,6 +108393,8 @@ self: { pname = "hspec-smallcheck"; version = "0.4.2"; sha256 = "1lsy71ri0lfvs6w1drwa4p69bcy0nrpb62dah3bg4vqwxfrd82ds"; + revision = "1"; + editedCabalFile = "19fp4xandn3jn1hzs1bkjbncyv74908wzcqkvk7xf0dfmm0wpmqw"; libraryHaskellDepends = [ base hspec-core smallcheck ]; testHaskellDepends = [ base hspec hspec-core QuickCheck smallcheck @@ -106827,6 +108404,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-smallcheck_0_5_0" = callPackage + ({ mkDerivation, base, call-stack, hspec, hspec-core, HUnit + , QuickCheck, smallcheck + }: + mkDerivation { + pname = "hspec-smallcheck"; + version = "0.5.0"; + sha256 = "0lff095qm855y7dd055c4h5ip8lcx1i6pady2b81fby4wgf78g1m"; + libraryHaskellDepends = [ + base call-stack hspec-core HUnit smallcheck + ]; + testHaskellDepends = [ + base call-stack hspec hspec-core HUnit QuickCheck smallcheck + ]; + 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 ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core @@ -108069,6 +109666,8 @@ self: { pname = "html-entity-map"; version = "0.1.0.0"; sha256 = "0k1l1pbmrfmh44v9cc9ka01bx9xm1x4jabbl675fc5c57v1h0dlq"; + revision = "1"; + editedCabalFile = "1y2w3jmdxwa8lfj1gr4ln98v1474bw1cjsdfpmbaphcjj9bjg0sg"; libraryHaskellDepends = [ base text unordered-containers ]; benchmarkHaskellDepends = [ base criterion text unordered-containers @@ -108272,8 +109871,8 @@ self: { }: mkDerivation { pname = "htoml-megaparsec"; - version = "1.0.1.12"; - sha256 = "1yzkhbsbxfpmy70nb52715gsppmlsnzr50vfmv0w0fqmw76abd8i"; + version = "1.1.0.1"; + sha256 = "10bgm0dqi2hni9sxjri2i7imfwqfi750pwwrpbghdvyfxrivfcpy"; libraryHaskellDepends = [ base composition-prelude containers deepseq megaparsec mtl old-locale text time unordered-containers vector @@ -108461,6 +110060,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client_0_5_8" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , deepseq, directory, exceptions, filepath, ghc-prim, hspec + , http-types, mime-types, monad-control, network, network-uri + , random, stm, streaming-commons, text, time, transformers, zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.5.8"; + sha256 = "13khi2vsx2la0s4pvysdfharjnbway7nbv1fcw4bjld8crbpwb68"; + revision = "1"; + editedCabalFile = "023gnif575iaq25af2d4dwcppagnph74ig3xdsda1fp1k5cwif9q"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie deepseq exceptions filepath + ghc-prim http-types mime-types network network-uri random stm + 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"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-auth" = callPackage ({ mkDerivation, base, base64-string, blaze-builder, bytestring , case-insensitive, conduit, crypto-conduit, http-client @@ -108682,6 +110313,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-conduit_2_3_0" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring + , case-insensitive, conduit, conduit-extra, connection, cookie + , data-default-class, hspec, http-client, http-client-tls + , http-types, HUnit, mtl, network, resourcet, streaming-commons + , temporary, text, time, transformers, unliftio, unliftio-core + , utf8-string, wai, wai-conduit, warp, warp-tls + }: + mkDerivation { + pname = "http-conduit"; + version = "2.3.0"; + sha256 = "0z9158a27g6kg7vbhkiw6icb2wgzb3lhsifgg5yh6wph5cd40fx4"; + libraryHaskellDepends = [ + aeson base bytestring conduit conduit-extra http-client + http-client-tls http-types mtl resourcet transformers unliftio-core + ]; + testHaskellDepends = [ + aeson base blaze-builder bytestring case-insensitive conduit + conduit-extra connection cookie data-default-class hspec + http-client http-types HUnit network resourcet streaming-commons + temporary text time transformers unliftio 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; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-conduit-browser" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , case-insensitive, conduit, containers, cookie, data-default @@ -110353,8 +112014,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.3.0"; - sha256 = "0nrymgfp2kgfhizi5niaa08n56b1zsypy1vk9in9i0k39kxfkd3n"; + version = "2.3.1"; + sha256 = "0sjr3xqpx47lwzm6kk1rjinc9k39i9zjm74160ly9i68gnjgx69i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -110668,6 +112329,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hwhile" = callPackage + ({ mkDerivation, alex, array, base, Cabal, containers, filepath + , happy, haskeline, mtl, repline + }: + mkDerivation { + pname = "hwhile"; + version = "0.1.1.2"; + sha256 = "1zilz8fdy90dpq6rzj98d70jw5j668fqpx28jhkpj50k72xlrpkb"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers filepath haskeline mtl repline + ]; + executableHaskellDepends = [ array base containers filepath mtl ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ array base Cabal containers mtl ]; + description = "An implementation of Neil D. Jones' While language"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "hworker" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hedis, hspec , hspec-contrib, HUnit, text, time, uuid @@ -111189,6 +112870,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hybrid-vectors_0_2_2" = callPackage + ({ mkDerivation, base, deepseq, primitive, semigroups, vector }: + mkDerivation { + pname = "hybrid-vectors"; + version = "0.2.2"; + sha256 = "1mw69xjdncj6kqa2mvag8xc79y4jijnh2qg6ahrhifb4vxqw7ij1"; + libraryHaskellDepends = [ + base deepseq primitive semigroups vector + ]; + homepage = "http://github.com/ekmett/hybrid-vectors"; + description = "Hybrid vectors e.g. Mixed Boxed/Unboxed vectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hydra-hs" = callPackage ({ mkDerivation, base, hmatrix, sixense_x64 }: mkDerivation { @@ -111721,6 +113417,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hyphenation_0_7_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, containers + , doctest, unordered-containers, zlib + }: + mkDerivation { + pname = "hyphenation"; + version = "0.7.1"; + sha256 = "1h5i07v2zlka29dj4zysc47p747j88x6z4zm3zwcr5i8yirm0p52"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base bytestring containers unordered-containers zlib + ]; + testHaskellDepends = [ + base containers doctest unordered-containers + ]; + homepage = "http://github.com/ekmett/hyphenation"; + description = "Configurable Knuth-Liang hyphenation"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hypher" = callPackage ({ mkDerivation, aeson, base, bytestring, Cabal, containers , data-default, hashable, HTTP, http-conduit, http-types, HUnit @@ -112176,8 +113894,8 @@ self: { pname = "identicon"; version = "0.2.2"; sha256 = "0qzj2063sh7phbqyxqxf96avz1zcwd1ry06jdqxwkg55q3yb8y9n"; - revision = "1"; - editedCabalFile = "0jlm9cmw0ycbyifab7bzkmykj8w7vn2wyc6pfadfjrhb76zyvcxr"; + revision = "2"; + editedCabalFile = "0shj211pvba5cfgs1vy9f8jd84by8j4mprk4yvhv4ia1kl6dq4mr"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring JuicyPixels ]; testHaskellDepends = [ @@ -113506,8 +115224,8 @@ self: { }: mkDerivation { pname = "impure-containers"; - version = "0.4.1"; - sha256 = "06z74yxa3pxwa0ad1464riqjzylnsldzkzfpw1di7n4a8a0g0n0x"; + version = "0.4.2"; + sha256 = "04g7xsa9mylfcjahlr3d81k8cvf0fi4rg8wkk2x4z6hmidy5s4kg"; libraryHaskellDepends = [ base containers ghc-prim hashable primitive vector ]; @@ -113654,6 +115372,27 @@ self: { license = "GPL"; }) {}; + "incremental-parser_0_2_5_3" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.2.5.3"; + sha256 = "0646hxjd25hpmffabbdp6bxa5720gd99hgg31ifcx8nprlm8sl7a"; + libraryHaskellDepends = [ base monoid-subclasses ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + homepage = "https://github.com/blamario/incremental-parser"; + description = "Generic parser library capable of providing partial results from partial input"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -114019,6 +115758,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inflections_0_4_0_1" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec + , hspec-megaparsec, megaparsec, QuickCheck, text + , unordered-containers + }: + mkDerivation { + pname = "inflections"; + version = "0.4.0.1"; + sha256 = "1vc04afp5lvh5drs4pf6djmkn80513h4phkw5gs4g4d37h3d3jg2"; + libraryHaskellDepends = [ + base exceptions megaparsec text unordered-containers + ]; + testHaskellDepends = [ + base containers hspec hspec-megaparsec megaparsec QuickCheck text + ]; + homepage = "https://github.com/stackbuilders/inflections-hs"; + description = "Inflections library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inflist" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -114435,6 +116195,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "inspection-testing_0_2" = callPackage + ({ mkDerivation, base, containers, ghc, mtl, template-haskell + , transformers + }: + mkDerivation { + pname = "inspection-testing"; + version = "0.2"; + sha256 = "0dnnsmzi6k548fgyigzmif26g1yia8m5aqaf7fxj06171i6fihx2"; + libraryHaskellDepends = [ + base containers ghc mtl template-haskell transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/nomeata/inspection-testing"; + description = "GHC plugin to do inspection testing"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inspector-wrecker" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , connection, data-default, http-client, http-client-tls @@ -114648,6 +116426,8 @@ self: { pname = "integer-logarithms"; version = "1.0.2"; sha256 = "0w5mhak181zi6qr5h2zbcs9ymaqacisp9jwk99naz6s8zz5rq1ii"; + revision = "1"; + editedCabalFile = "0sccd0d6qrcm3a7nni5lqv40g5m5knf965z4skkgbyyhb3z6qsq8"; libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; testHaskellDepends = [ base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck @@ -115036,8 +116816,8 @@ self: { }: mkDerivation { pname = "intricacy"; - version = "0.7.1"; - sha256 = "1byc6k4d5wcwls96zg12xq6kz4fzp9zmr0wcsk92iv2qpg0ra6ji"; + version = "0.7.1.1"; + sha256 = "1s947b71r0m3f81w8sid2cwgh9j16bxsmlpi498rzxajq32cd5yk"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -115433,6 +117213,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "io-string-like" = callPackage + ({ mkDerivation, base, binary, bytestring, text }: + mkDerivation { + pname = "io-string-like"; + version = "0.1.0.1"; + sha256 = "0p8p4xp9qj7h1xa9dyizqpr85j8qjiccj3y9kplbskaqazl9pyqp"; + revision = "1"; + editedCabalFile = "1q10d2pjhy3k549pw3lid2lda5z4790x0vmg1qajwyapm7q5cma6"; + libraryHaskellDepends = [ base binary bytestring text ]; + homepage = "https://github.com/clintonmead/io-string-like#readme"; + description = "Classes to handle Prelude style IO functions for different datatypes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "io-throttle" = callPackage ({ mkDerivation, base, SafeSemaphore, threads }: mkDerivation { @@ -115823,6 +117617,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "irc-client_1_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, containers + , contravariant, exceptions, irc-conduit, irc-ctcp, mtl + , network-conduit-tls, old-locale, profunctors, stm, stm-conduit + , text, time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "1.0.1.0"; + sha256 = "0c0vzmzpryjfv22kxinnqjf7rkj51dz7shi1gn8ivgcmnhf9hl57"; + libraryHaskellDepends = [ + base bytestring conduit connection containers contravariant + exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale + profunctors stm stm-conduit text time tls transformers x509 + x509-store x509-validation + ]; + homepage = "https://github.com/barrucadu/irc-client"; + description = "An IRC client library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -119720,6 +121536,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "kawa" = callPackage + ({ mkDerivation, attoparsec, base, directory, hashable, hedgehog + , optparse-applicative, text, unordered-containers + }: + mkDerivation { + pname = "kawa"; + version = "0.1.0.0"; + sha256 = "1rd5k12my1693sjnkqr6jn7p7byrycpcszf98z5s9pxaxblz4gdk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base hashable text unordered-containers + ]; + executableHaskellDepends = [ + base directory optparse-applicative text unordered-containers + ]; + testHaskellDepends = [ base hedgehog text unordered-containers ]; + homepage = "https://github.com/thoferon/kawa#readme"; + description = "Key-value store in single files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "kawaii" = callPackage ({ mkDerivation, base, bytestring, containers, data-default, hakyll , hspec, lens, lifted-base, monad-control, monad-logger, mtl @@ -124179,6 +126017,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens-action_0_2_3" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, comonad, contravariant + , directory, doctest, filepath, lens, mtl, profunctors + , semigroupoids, semigroups, transformers + }: + mkDerivation { + pname = "lens-action"; + version = "0.2.3"; + sha256 = "1q4q190lv6gh3bvdz9n177hwrckkkbfbwcw64b9ksz11gxn8m106"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base comonad contravariant lens mtl profunctors semigroupoids + semigroups transformers + ]; + testHaskellDepends = [ base directory doctest filepath ]; + homepage = "http://github.com/ekmett/lens-action/"; + description = "Monadic Getters and Folds"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal , cabal-doctest, doctest, generic-deriving, lens, scientific @@ -124291,8 +126150,10 @@ self: { ({ mkDerivation, base, lens, QuickCheck, transformers }: mkDerivation { pname = "lens-properties"; - version = "4.11"; - sha256 = "0cg0n75ss5ayy31igwyz9yz2sh0smcaiidbbm1wkrk1krzbws31w"; + version = "4.11.1"; + sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g"; + revision = "1"; + editedCabalFile = "1b9db7dbfq46q63y6w1471nffj77rb363rk4b1l3l23g15cq6a5i"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; @@ -125589,6 +127450,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "licensor_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers + , directory, http-conduit, process + }: + mkDerivation { + pname = "licensor"; + version = "0.2.2"; + sha256 = "0kxcsw1ds9q8apsmhbnwcz76kxfhabv08b8myadbflwm4wj0szlz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-conduit process + ]; + executableHaskellDepends = [ + base Cabal cmdargs containers directory + ]; + homepage = "https://github.com/jpvillaisaza/licensor"; + description = "A license compatibility helper"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "life" = callPackage ({ mkDerivation, array, base, GLUT, OpenGL, random }: mkDerivation { @@ -125654,6 +127537,8 @@ self: { pname = "lifted-base"; version = "0.2.3.11"; sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f"; + revision = "1"; + editedCabalFile = "0vrik0j1xv2yp759ffa7jb7q838z4wglnbgsrja97mx0dwsbavnx"; libraryHaskellDepends = [ base monad-control transformers-base ]; testHaskellDepends = [ base HUnit monad-control test-framework test-framework-hunit @@ -127178,26 +129063,25 @@ self: { "live-sequencer" = callPackage ({ mkDerivation, alsa-core, alsa-seq, base, bytestring, cgi , concurrent-split, containers, data-accessor - , data-accessor-transformers, directory, event-list - , explicit-exception, filepath, html, httpd-shed, midi, midi-alsa - , network, network-uri, non-empty, non-negative, parsec, pretty - , process, stm, stm-split, strict, transformers, unix, utility-ht - , wx, wxcore + , data-accessor-transformers, event-list, explicit-exception, html + , httpd-shed, midi, midi-alsa, network, network-uri, non-empty + , non-negative, parsec, pathtype, pretty, process, stm, stm-split + , strict, transformers, unix, utility-ht, wx, wxcore }: mkDerivation { pname = "live-sequencer"; - version = "0.0.6"; - sha256 = "0gsbixz0cmy9cajqj4s8iaf8mjk42162sd39bpcdp4xqyxfj5g63"; + version = "0.0.6.1"; + sha256 = "0g099sm4q7n0aiqc8qznqfcqvlnc25kzvz31qf49xblah89dzx0n"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base event-list non-negative ]; executableHaskellDepends = [ alsa-core alsa-seq base bytestring cgi concurrent-split containers - data-accessor data-accessor-transformers directory - explicit-exception filepath html httpd-shed midi midi-alsa network - network-uri non-empty parsec pretty process stm stm-split strict - transformers unix utility-ht wx wxcore + data-accessor data-accessor-transformers explicit-exception html + httpd-shed midi midi-alsa network network-uri non-empty parsec + pathtype pretty process stm stm-split strict transformers unix + utility-ht wx wxcore ]; homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; @@ -127549,8 +129433,8 @@ self: { }: mkDerivation { pname = "llvm-hs-pretty"; - version = "0.1.0.0"; - sha256 = "1p16vhxx7w1hdb130c9mls45rwyq8hix1grnwdj92rbrqbjwk7l3"; + version = "0.2.0.0"; + sha256 = "133kyksbp88q0wavp3wdjg69h9fpwi7nq626nvikdy46cf7lgklh"; libraryHaskellDepends = [ array base bytestring llvm-hs-pure text wl-pprint-text ]; @@ -128898,6 +130782,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "longboi" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "longboi"; + version = "1.0.0"; + sha256 = "0jm231i9mnbkn8ffdv6w2mhd95i8lwlbxi5h9nywvqbclgf95977"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/chessai/longboi"; + description = "Dependently-typed linked list implementation"; + license = stdenv.lib.licenses.mit; + }) {}; + "lookup-tables" = callPackage ({ mkDerivation, base, primitive, tasty, tasty-hunit , template-haskell @@ -129211,6 +131107,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lrucaching_0_3_3" = callPackage + ({ mkDerivation, base, base-compat, containers, deepseq, hashable + , hspec, psqueues, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "lrucaching"; + version = "0.3.3"; + sha256 = "192a2zap1bmxa2y48n48rmngf18fr8k0az4a230hziv3g795yzma"; + libraryHaskellDepends = [ + base base-compat deepseq hashable psqueues vector + ]; + testHaskellDepends = [ + base containers deepseq hashable hspec QuickCheck transformers + ]; + homepage = "https://github.com/cocreature/lrucaching#readme"; + description = "LRU cache"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ls-usb" = callPackage ({ mkDerivation, ansi-wl-pprint, base, base-unicode-symbols , cmdtheline, text, usb, usb-id-database, vector @@ -129482,6 +131398,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lucid-colonnade" = callPackage + ({ mkDerivation, base, colonnade, lucid, text }: + mkDerivation { + pname = "lucid-colonnade"; + version = "1.0"; + sha256 = "13jb1vh2pxz1w2ycswdmyhr05c00i0x30agcwf93i359rwzcmbmc"; + revision = "1"; + editedCabalFile = "08zcksc8pd7sh4z78i80rinlmr3mghhclhcqn8kdkgv4p7ynldlv"; + libraryHaskellDepends = [ base colonnade lucid text ]; + homepage = "https://github.com/andrewthad/colonnade#readme"; + description = "Helper functions for using lucid with colonnade"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lucid-extras" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, directory, lucid , text @@ -130084,8 +132014,8 @@ self: { pname = "machines"; version = "0.6.3"; sha256 = "1kxypm26xxd30979yrg94pnaaj3yfn180ri3y4z2xsm2m5iyiliz"; - revision = "1"; - editedCabalFile = "045qh0qwjiyrwcfsfw9galhqr6w7c96zpg7fnib3jaw8509d53x5"; + revision = "2"; + editedCabalFile = "1k62b3h2xklv170wdxf607s4h7vmjjj4dscgnv54gfbwi224cysq"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ adjunctions base comonad containers distributive mtl pointed @@ -130293,20 +132223,20 @@ self: { }) {}; "madlang" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, Cabal + ({ mkDerivation, ansi-wl-pprint, base, binary, Cabal, cli-setup , composition-prelude, containers, criterion, directory, file-embed , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec - , MonadRandom, mtl, optparse-applicative, process, random-shuffle + , MonadRandom, mtl, optparse-applicative, random-shuffle , recursion-schemes, recursion-schemes-ext, tar, template-haskell , text, th-lift-instances, titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "4.0.0.0"; - sha256 = "1dg13q8sq6ha5hpjx16cm1ny32kjd7l9mwdmi0x756yh675835xi"; + version = "4.0.0.3"; + sha256 = "01jnhwxflphimnm2ga8zbhpkmvc4k92a7vicrmx0h6dhjyhmm7m7"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory process ]; + setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ ansi-wl-pprint base binary composition-prelude containers directory file-embed http-client http-client-tls megaparsec MonadRandom mtl @@ -130352,6 +132282,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) file;}; + "magic-wormhole" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, cryptonite + , hashable, hedgehog, memory, network, network-uri + , optparse-applicative, pqueue, process, protolude, saltine, spake2 + , stm, tasty, tasty-hedgehog, tasty-hspec, text + , unordered-containers, websockets + }: + mkDerivation { + pname = "magic-wormhole"; + version = "0.1.0"; + sha256 = "0lkwnbr76chiakc7j51pm23q15q26l3xqglg1rj5blwybkymg29x"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers cryptonite hashable memory network + network-uri pqueue protolude saltine spake2 stm + unordered-containers websockets + ]; + executableHaskellDepends = [ + aeson base optparse-applicative protolude spake2 text + ]; + testHaskellDepends = [ + aeson base bytestring hedgehog memory process protolude saltine + spake2 stm tasty tasty-hedgehog tasty-hspec + ]; + homepage = "https://github.com/LeastAuthority/haskell-magic-wormhole#readme"; + description = "Interact with Magic Wormhole"; + license = stdenv.lib.licenses.asl20; + }) {}; + "magicbane" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, classy-prelude , conduit, conduit-combinators, data-default, data-has, ekg-core @@ -131243,13 +133204,13 @@ self: { ({ mkDerivation, base, bytestring, cassava, containers }: mkDerivation { pname = "map-exts"; - version = "0.1.0.1"; - sha256 = "0zkcwxdvl4m4lw9yjjxk7mx22hr0kp9hn3vzry2s8n489i0r4sw3"; + version = "0.2.0.0"; + sha256 = "038k2d5vir65n2xi4gv5jvd3ya877iazjkinyg20wn4aj317b8bq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base bytestring cassava containers ]; - homepage = "http://github.com/elsen-trading/map-extensions#readme"; + homepage = "http://github.com/charles-cooper/map-exts#readme"; description = "Extensions to Data.Map"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -132059,35 +134020,38 @@ self: { }) {}; "matterhorn" = callPackage - ({ mkDerivation, aspell-pipe, base, base-compat, brick, bytestring - , cheapskate, checkers, config-ini, connection, containers - , directory, filepath, gitrev, hashable, Hclip, mattermost-api - , mattermost-api-qc, microlens-platform, mtl, process - , quickcheck-text, skylighting, stm, stm-delay, strict - , string-conversions, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-zipper, time, transformers, Unique, unix - , unordered-containers, utf8-string, vector, vty, xdg-basedir + ({ mkDerivation, aeson, aspell-pipe, async, base, base-compat + , brick, bytestring, cheapskate, checkers, config-ini, connection + , containers, directory, filepath, gitrev, hashable, Hclip + , mattermost-api, mattermost-api-qc, microlens-platform, mtl + , process, quickcheck-text, semigroups, skylighting, stm, stm-delay + , strict, string-conversions, tasty, tasty-hunit, tasty-quickcheck + , temporary, text, text-zipper, time, timezone-olson + , timezone-series, transformers, Unique, unix, unordered-containers + , utf8-string, vector, vty, word-wrap, xdg-basedir }: mkDerivation { pname = "matterhorn"; - version = "40400.0.0"; - sha256 = "1qp2d18lhf6j4gq67w1sd5alwhz5zlbmjp26apsvxbvcary0mb0a"; + version = "40600.0.0"; + sha256 = "0niha43l1p00af3qjkz5j43ksdl0a0sgagra584c8j34cl1f9akv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aspell-pipe base base-compat brick bytestring cheapskate config-ini - connection containers directory filepath gitrev hashable Hclip - mattermost-api microlens-platform mtl process skylighting stm - stm-delay strict temporary text text-zipper time transformers unix - unordered-containers utf8-string vector vty xdg-basedir + aeson aspell-pipe async base base-compat brick bytestring + cheapskate config-ini connection containers directory filepath + gitrev hashable Hclip mattermost-api microlens-platform mtl process + semigroups skylighting stm stm-delay strict temporary text + text-zipper time timezone-olson timezone-series transformers unix + unordered-containers utf8-string vector vty word-wrap xdg-basedir ]; testHaskellDepends = [ base base-compat brick bytestring cheapskate checkers config-ini connection containers directory filepath hashable Hclip mattermost-api mattermost-api-qc microlens-platform mtl process quickcheck-text stm strict string-conversions tasty tasty-hunit - tasty-quickcheck text text-zipper time transformers Unique - unordered-containers vector vty xdg-basedir + tasty-quickcheck text text-zipper time timezone-olson + timezone-series transformers Unique unordered-containers vector vty + xdg-basedir ]; description = "Terminal client for the Mattermost chat system"; license = stdenv.lib.licenses.bsd3; @@ -132103,8 +134067,8 @@ self: { }: mkDerivation { pname = "mattermost-api"; - version = "40400.0.0"; - sha256 = "1n5mv56srq171ql9n7gvpfma8mx9jb61w88ab72v99xhiid3ahdi"; + version = "40600.0.0"; + sha256 = "0s27n9a7s6bgbara2rzh689234ykl3vfpm84yg1nvc61wsrxbkql"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -132130,8 +134094,8 @@ self: { }: mkDerivation { pname = "mattermost-api-qc"; - version = "40400.0.0"; - sha256 = "0kp36m2vf3zzfgibzs6kgai1bfsghxpzx7hpw0bywg1jpwqr95ka"; + version = "40600.0.0"; + sha256 = "0pfmf4ja4a7vc9bnr4kc604j0b8dmcm1ggddg4m64jf355mw6nxm"; libraryHaskellDepends = [ base containers mattermost-api QuickCheck text time ]; @@ -132886,8 +134850,8 @@ self: { pname = "megaparsec"; version = "6.3.0"; sha256 = "15bhghiszm18acn1igmq6vgdlcvsvsx4dlkl2vg2ghy5qgyrqxsv"; - revision = "1"; - editedCabalFile = "0glp2vgbkgzaci5maa01fnpcp79kk32iskvkhm19p5612zjr87ad"; + revision = "2"; + editedCabalFile = "1npxvydar8l68vfp3g0ir9cvq5vglf1z2a9q1h1mj438y0084f7v"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -132912,6 +134876,8 @@ self: { pname = "megaparsec"; version = "6.4.0"; sha256 = "0h9azhs0dfrc359vrbd1jljrg3yfdbwd4p62cxqkn7mnh8913jpd"; + revision = "1"; + editedCabalFile = "1jzj3gb96skggngv69wibyx27bgng78dmlgv9i3lvz46z6bx8qzd"; libraryHaskellDepends = [ base bytestring case-insensitive containers deepseq mtl parser-combinators scientific text transformers @@ -132946,14 +134912,14 @@ self: { }: mkDerivation { pname = "mellon-core"; - version = "0.8.0.2"; - sha256 = "0fl9pwh67diibj2ki75xcwylbhvw0nqn0b0azla4ndr3fxdgnh30"; + version = "0.8.0.3"; + sha256 = "10grfkc0ljvjpw2qvpv9gimnh51xwzqsbdzd24jk1d52adb4vbzd"; libraryHaskellDepends = [ async base mtl time transformers ]; testHaskellDepends = [ async base doctest hlint hspec mtl QuickCheck quickcheck-instances time transformers ]; - homepage = "https://github.com/quixoftic/mellon/"; + homepage = "https://github.com/quixoftic/mellon#readme"; description = "Control physical access devices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -132963,11 +134929,11 @@ self: { ({ mkDerivation, base, hlint, hpio, mellon-core }: mkDerivation { pname = "mellon-gpio"; - version = "0.8.0.2"; - sha256 = "1dx31nyyi4gar2wlmmgfnqi48x4pzwh53q87xg8rrbghc9vfqygj"; + version = "0.8.0.3"; + sha256 = "0sz24f9ymy4hwpmwkqlb7v1rjfs8fz4bx9rfvzag5bprwgg4ayq9"; libraryHaskellDepends = [ base hpio mellon-core ]; testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/quixoftic/mellon/"; + homepage = "https://github.com/quixoftic/mellon#readme"; description = "GPIO support for mellon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -132985,8 +134951,8 @@ self: { }: mkDerivation { pname = "mellon-web"; - version = "0.8.0.2"; - sha256 = "03awn8qcqn5iz5cd082cr6ap15zlbidp5l2aacz24m0fn5vdgjlf"; + version = "0.8.0.3"; + sha256 = "08ar679w1b3an6qf492pd3fjyrk0i7kbzv9qw2agibbdcpaw8pnk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133007,7 +134973,7 @@ self: { servant-lucid servant-server servant-swagger servant-swagger-ui swagger2 text time transformers wai wai-extra warp ]; - homepage = "https://github.com/quixoftic/mellon/"; + homepage = "https://github.com/quixoftic/mellon#readme"; description = "A REST web service for Mellon controllers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133300,6 +135266,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "memory_0_14_12" = callPackage + ({ mkDerivation, base, basement, bytestring, deepseq, foundation + , ghc-prim, tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "memory"; + version = "0.14.12"; + sha256 = "0qb67lmsq4clcx726hgq1ichjs72cqnjkpcsqa7ply21zq23an6q"; + libraryHaskellDepends = [ + base basement bytestring deepseq foundation ghc-prim + ]; + testHaskellDepends = [ + base basement foundation tasty tasty-hunit tasty-quickcheck + ]; + 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 ({ mkDerivation, base, containers, transformers, unsafe, vector }: mkDerivation { @@ -133339,8 +135325,8 @@ self: { pname = "mercury-api"; version = "0.1.0.1"; sha256 = "0h5v08k27nqksl3x8r5d4p26zgb4s7k2shgrjkg6bc2n0bn9iqzr"; - revision = "1"; - editedCabalFile = "0k8k9lcvpwkvz4w0ydrxzzmfgch8885h6vdybvqi7ra4kvhf4gzs"; + revision = "2"; + editedCabalFile = "093c8afmcrnbfliz1ykpyc4w40dli2wig0qi0xcwg8445idwp2kg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -133850,6 +135836,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens_0_4_8_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "microlens"; + version = "0.4.8.3"; + sha256 = "17qx2mbqdrlnkc3gxq8njbp7qw8nh51drmz6fc8khgj9bls5ni2k"; + libraryHaskellDepends = [ base ]; + homepage = "http://github.com/aelve/microlens"; + description = "A tiny lens library with no dependencies. If you're writing an app, you probably want microlens-platform, not this."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers @@ -133929,6 +135928,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-mtl_0_1_11_1" = callPackage + ({ mkDerivation, base, microlens, mtl, transformers + , transformers-compat + }: + mkDerivation { + pname = "microlens-mtl"; + version = "0.1.11.1"; + sha256 = "0l6z1gkzwcpv89bxf5vgfrjb6gq2pj7sjjc53nvi5b9alx34zryk"; + libraryHaskellDepends = [ + base microlens mtl transformers transformers-compat + ]; + homepage = "http://github.com/aelve/microlens"; + description = "microlens support for Reader/Writer/State from mtl"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "microlens-platform" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector @@ -133960,6 +135976,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_1_3" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.1.3"; + sha256 = "15a12cqxlgbcn1n73zwrxnp2vfm8b0ma0a0sdd8zmjbs8zy3np4f"; + libraryHaskellDepends = [ + base containers microlens template-haskell + ]; + homepage = "http://github.com/aelve/microlens"; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -134934,15 +136965,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_0_11_0_0" = callPackage + "miso_0_12_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "0.11.0.0"; - sha256 = "1hca50w1h3xby1mkbgv65miha7zg899c5ygvfqs4i49gjzq3hd61"; + version = "0.12.0.0"; + sha256 = "08d50apwcyym4crdnly97j1vwl85p9a5fr606x1mj8729pd0pwjb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135140,8 +137171,8 @@ self: { pname = "mmark"; version = "0.0.4.0"; sha256 = "05dslarsdfcp2im9w80ks52wzqcqq8ma23b69wdl8nyfbkmaj5ch"; - revision = "1"; - editedCabalFile = "1syr3bynam607wj4nkz9cijkdkz9szpk3x9pnxm76mv0sxk7iq2f"; + revision = "2"; + editedCabalFile = "1l2xljnasvgj3icc8dynsakyskd65c114gm4f94la3pv8ghcc3rg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -135159,7 +137190,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mmark_0_0_4_3" = callPackage + "mmark_0_0_5_0" = callPackage ({ mkDerivation, aeson, base, case-insensitive, containers , criterion, data-default-class, deepseq, dlist, email-validate , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid @@ -135169,8 +137200,8 @@ self: { }: mkDerivation { pname = "mmark"; - version = "0.0.4.3"; - sha256 = "0xl88vry05050i1pxmakb625x98wmq90h4jz44h0nc7jrqzvqxa0"; + version = "0.0.5.0"; + sha256 = "17vbj5hc57dikhqc4ngps61vkswlpff6vq1d8jbb79pr467zczgv"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base case-insensitive containers data-default-class deepseq @@ -135183,12 +137214,33 @@ self: { QuickCheck text ]; benchmarkHaskellDepends = [ base criterion text weigh ]; - homepage = "https://github.com/mrkkrp/mmark"; + homepage = "https://github.com/mmark-md/mmark"; description = "Strict markdown processor for writers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "mmark-cli" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, gitrev, lucid + , megaparsec, mmark, mmark-ext, optparse-applicative, skylighting + , stache, text, unordered-containers + }: + mkDerivation { + pname = "mmark-cli"; + version = "0.0.1.0"; + sha256 = "1ix5c7xirhnrbnqp63ff78ddmwq8jimwmadavridanp3cf2wygx2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring directory gitrev lucid megaparsec mmark + mmark-ext optparse-applicative skylighting stache text + unordered-containers + ]; + homepage = "https://github.com/mmark-md/mmark-cli"; + description = "Description"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mmark-ext" = callPackage ({ mkDerivation, base, data-default-class, foldl, hspec, lucid , microlens, mmark, modern-uri, text @@ -135209,6 +137261,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mmark-ext_0_1_0_0" = callPackage + ({ mkDerivation, base, blaze-html, foldl, hspec, lucid, microlens + , mmark, modern-uri, skylighting, text + }: + mkDerivation { + pname = "mmark-ext"; + version = "0.1.0.0"; + sha256 = "1qwwhjmphxry6dfalhalmyvaw41gr2b70g39acrx4zcqlif6gg3x"; + revision = "1"; + editedCabalFile = "0qnadhdn9di4wwib57r05c7xkp3ir7xjdixlpajycpgnzr2p038a"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base blaze-html foldl lucid microlens mmark modern-uri skylighting + text + ]; + testHaskellDepends = [ base hspec lucid mmark text ]; + homepage = "https://github.com/mrkkrp/mmark-ext"; + description = "Commonly useful extensions for MMark markdown processor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mmorph" = callPackage ({ mkDerivation, base, mtl, transformers, transformers-compat }: mkDerivation { @@ -135380,6 +137454,8 @@ self: { pname = "modern-uri"; version = "0.1.2.1"; sha256 = "10y3ppcd4d987khk9jxaa0clkjssmvip2kpq63z8xcigvdiil91h"; + revision = "1"; + editedCabalFile = "1kgwf0y5p5imrkjga53yna4sy6jqk5x3v0zks24c4vb52mi2a19n"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec profunctors QuickCheck template-haskell text @@ -135405,6 +137481,8 @@ self: { pname = "modern-uri"; version = "0.2.0.0"; sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z"; + revision = "1"; + editedCabalFile = "1svq0ndnv5jfz3nhxwdx4vxim5sahfcryj5ik4l4x704jsjbl4bm"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -136134,6 +138212,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-logger_0_3_28" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, conduit + , conduit-extra, exceptions, fast-logger, lifted-base + , monad-control, monad-loops, mtl, resourcet, stm, stm-chans + , template-haskell, text, transformers, transformers-base + , transformers-compat, unliftio-core + }: + mkDerivation { + pname = "monad-logger"; + version = "0.3.28"; + sha256 = "0xmi4b52zdaydcjh4hzr3q3vajhkhjljjbfp3grhx1pc41wycfhr"; + libraryHaskellDepends = [ + base blaze-builder bytestring conduit conduit-extra exceptions + fast-logger lifted-base monad-control monad-loops mtl resourcet stm + stm-chans template-haskell text transformers transformers-base + transformers-compat unliftio-core + ]; + homepage = "https://github.com/kazu-yamamoto/logger"; + description = "A class of monads which can log messages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-json" = callPackage ({ mkDerivation, aeson, base, monad-logger, template-haskell, text }: @@ -137268,6 +139369,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "mono-traversable_1_0_8_1" = callPackage + ({ mkDerivation, base, bytestring, containers, foldl, gauge + , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split + , text, transformers, unordered-containers, vector + , vector-algorithms + }: + mkDerivation { + pname = "mono-traversable"; + version = "1.0.8.1"; + sha256 = "0d9r6z3a8gkhl1j5yq8hjg5wcndi5yixxm9xwbrf4z6pgdwr04lr"; + libraryHaskellDepends = [ + base bytestring containers hashable split text transformers + unordered-containers vector vector-algorithms + ]; + testHaskellDepends = [ + base bytestring containers foldl hspec HUnit QuickCheck semigroups + text transformers unordered-containers vector + ]; + benchmarkHaskellDepends = [ base gauge mwc-random vector ]; + homepage = "https://github.com/snoyberg/mono-traversable#readme"; + description = "Type classes for mapping, folding, and traversing monomorphic containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mono-traversable-instances" = callPackage ({ mkDerivation, base, comonad, containers, dlist, dlist-instances , mono-traversable, semigroupoids, semigroups, transformers @@ -140289,8 +142415,8 @@ self: { ({ mkDerivation, aeson, attoparsec, base, lens, text, wreq }: mkDerivation { pname = "namecoin-update"; - version = "0.2.1.0"; - sha256 = "1vz4n57xk8zbyqiwsm69mls31f36ng0bh9av5axi3rq7car2jlxz"; + version = "0.2.2.0"; + sha256 = "09g3mjvmfgynlna17nvynh1gwzkski0kg07d82zvdmd7j8qvdrvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson attoparsec base lens text wreq ]; @@ -140542,6 +142668,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "nanospec_0_2_2" = callPackage + ({ mkDerivation, base, hspec, silently }: + mkDerivation { + pname = "nanospec"; + version = "0.2.2"; + sha256 = "1rcmhl9bhyfvanalnf1r86wkx6rq6wdvagnw1h011jcnnb1cq56g"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec silently ]; + homepage = "https://github.com/hspec/nanospec#readme"; + description = "A lightweight implementation of a subset of Hspec's API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nanovg" = callPackage ({ mkDerivation, base, bytestring, c2hs, containers, freeglut, GLEW , hspec, inline-c, mesa, QuickCheck, text, vector @@ -140784,8 +142924,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "2"; - editedCabalFile = "1j90pd1zznr18966axskad5w0kx4dvqg62r65rmw1ihqwxm1ndix"; + revision = "3"; + editedCabalFile = "0z6vmdgz9r2fbgzh2xvrw6cy5h7m1jv911jah615s6xgr52smhrf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -141727,6 +143867,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network_2_6_3_3" = callPackage + ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework + , test-framework-hunit, unix + }: + mkDerivation { + pname = "network"; + version = "2.6.3.3"; + sha256 = "1xa0jif154i26a465bp2wpvsm891zhy98y5zp9zdbl39m6q6hrkp"; + revision = "1"; + editedCabalFile = "0nh9sbbyj3jdm2ybffsxa3c4mdywy3wq48sg8d5ylkr2s6cmbbpz"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ + base bytestring doctest HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, criterion, QuickCheck, test-framework , test-framework-quickcheck2 @@ -142637,8 +144797,8 @@ self: { }: mkDerivation { pname = "network-uri-json"; - version = "0.1.2.0"; - sha256 = "0prk3qb1d9f6hgxyqgapyci5kqqnqlfnbxlqn5xw4l2nxsgsvh48"; + version = "0.1.2.1"; + sha256 = "1xnlyghpyrbllzzr8bdmzgm12lsa1sg4miynh6d4awdppai9y433"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base hspec network-arbitrary network-uri QuickCheck @@ -143022,15 +145182,16 @@ self: { }) {}; "ngx-export" = callPackage - ({ mkDerivation, async, base, binary, bytestring, monad-loops - , template-haskell, unix + ({ mkDerivation, async, base, binary, bytestring, deepseq + , monad-loops, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.9.1.2"; - sha256 = "1428pkzj7kam7ya21fb3qchq95lvp6dp9dnh5qj41nkw9x5dz517"; + version = "1.0.1"; + sha256 = "1n2d9sh8df6532716pbyxklr3k7lykb6hjf2b976jfd9qrgw505z"; libraryHaskellDepends = [ - async base binary bytestring monad-loops template-haskell unix + async base binary bytestring deepseq monad-loops template-haskell + unix ]; homepage = "http://github.com/lyokha/nginx-haskell-module"; description = "Helper module for Nginx haskell module"; @@ -143078,21 +145239,22 @@ self: { "nice-html" = callPackage ({ mkDerivation, base, bifunctors, blaze-html, blaze-markup - , bytestring, criterion, data-default-class, deepseq, free, lucid - , pretty-show, recursion-schemes, template-haskell, text - , transformers, vector, weigh + , bytestring, containers, criterion, data-default-class, deepseq + , free, lens, lucid, pretty-show, recursion-schemes, shakespeare + , template-haskell, text, transformers, type-of-html, vector, weigh }: mkDerivation { pname = "nice-html"; - version = "0.3.0"; - sha256 = "1ns6qrzm9lwbgjcr7mw58g0qivbqac4yxisvbfy9j2cq3dqzm6d3"; + version = "0.4.1"; + sha256 = "117wrpg4fgh69bqgdr9jmj68izd4jk28lx91pvsj2425ajhdfsma"; libraryHaskellDepends = [ - base bifunctors blaze-markup bytestring data-default-class deepseq - free recursion-schemes template-haskell text transformers vector + base bifunctors blaze-markup bytestring containers + data-default-class deepseq free lens recursion-schemes + template-haskell text transformers vector ]; benchmarkHaskellDepends = [ base blaze-html blaze-markup bytestring criterion lucid pretty-show - text weigh + shakespeare text transformers type-of-html weigh ]; homepage = "https://github.com/mikeplus64/nice-html#readme"; description = "A fast and nice HTML templating library with distinct compilation/rendering phases"; @@ -143235,8 +145397,8 @@ self: { }: mkDerivation { pname = "nix-deploy"; - version = "1.0.1"; - sha256 = "04wknx8yy4s7b3qx5rg26znrfl0932nvrcx17zcfiggrh4lcw33x"; + version = "1.0.2"; + sha256 = "07cirn4gaaarw5va128f63jp2q7jlghmg4kclya4fvapx963qbya"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -143908,6 +146070,8 @@ self: { pname = "normalization-insensitive"; version = "2.0.1"; sha256 = "00nbha984yg4lxnpkyd3q0gbywf7xn5z5ixy3cr9ksn05w6blm1v"; + revision = "1"; + editedCabalFile = "1zaqbgrfy33y2d9ix178mhyysyffsia0hbmg77gcjmvv32b44m6j"; libraryHaskellDepends = [ base bytestring deepseq hashable text unicode-transforms ]; @@ -144914,6 +147078,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "o-clock" = callPackage + ({ mkDerivation, base, deepseq, gauge, ghc-prim, hedgehog + , markdown-unlit, tasty, tasty-hedgehog, tasty-hspec, tiempo + , time-units, transformers, type-spec + }: + mkDerivation { + pname = "o-clock"; + version = "0.0.0"; + sha256 = "0nswlj9anwmhl6vgw5gpdd924niiw15plwb46wwmzrv7jsmbaiyj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ghc-prim transformers ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base hedgehog markdown-unlit tasty tasty-hedgehog tasty-hspec + type-spec + ]; + benchmarkHaskellDepends = [ base deepseq gauge tiempo time-units ]; + homepage = "https://github.com/serokell/o-clock"; + description = "Type-safe time library"; + license = stdenv.lib.licenses.mit; + }) {}; + "oanda-rest-api" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , Decimal, hlint, hspec, http-client, http-conduit, HUnit, lens @@ -145134,8 +147321,8 @@ self: { }: mkDerivation { pname = "ocaml-export"; - version = "0.3.0.0"; - sha256 = "1hxi2dij5qgpa0njvvgda0zvz5xjl16jba3aw8y0ma5bqvhl7hp4"; + version = "0.5.0.0"; + sha256 = "0xp4aiqn5p1c3frl83axjchbs5dwh4ibqqyiixvi0i1wpbi9fqka"; libraryHaskellDepends = [ aeson base bytestring containers directory file-embed filepath formatting hspec-golden-aeson mtl QuickCheck @@ -147891,8 +150078,8 @@ self: { }: mkDerivation { pname = "packman"; - version = "0.3.0"; - sha256 = "07raaqqf9vz2mc3nasqzf2bz8370diy0j0lj60pqz2cg89y0q4cq"; + version = "0.4.0"; + sha256 = "1x02dbaydw8mz4r0730hmdwx10pg0pwk8b6zlh3jqmkf9093jfms"; libraryHaskellDepends = [ array base binary bytestring ghc-prim primitive ]; @@ -148180,23 +150367,23 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_1" = callPackage + "pandoc_2_1_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , binary, blaze-html, blaze-markup, bytestring, Cabal , case-insensitive, cmark-gfm, containers, criterion, data-default - , deepseq, Diff, directory, doctemplates, executable-path, filepath - , Glob, haddock-library, hslua, hslua-module-text, HTTP - , http-client, http-client-tls, http-types, JuicyPixels, mtl - , network, network-uri, pandoc-types, parsec, process, QuickCheck - , random, safe, scientific, SHA, skylighting, split, syb, tagsoup - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, temporary - , texmath, text, time, unix, unordered-containers, vector, xml - , yaml, zip-archive, zlib + , deepseq, Diff, directory, doctemplates, exceptions + , executable-path, filepath, Glob, haddock-library, hslua + , hslua-module-text, HTTP, http-client, http-client-tls, http-types + , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec + , process, QuickCheck, random, safe, scientific, SHA, skylighting + , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, temporary, texmath, text, time, unix + , unordered-containers, vector, xml, yaml, zip-archive, zlib }: mkDerivation { pname = "pandoc"; - version = "2.1"; - sha256 = "192ab8b8376fr7aj60zlk5jbb18r0kh1kmrznr9n6w8m7b5zmfy2"; + version = "2.1.1"; + sha256 = "1dg97d74bqmq11bkh1ni92g4imcq45nh8y9ixwpk8pcafv401z7a"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -148205,8 +150392,8 @@ self: { libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring binary blaze-html blaze-markup bytestring case-insensitive cmark-gfm containers - data-default deepseq directory doctemplates filepath Glob - haddock-library hslua hslua-module-text HTTP http-client + data-default deepseq directory doctemplates exceptions filepath + Glob haddock-library hslua hslua-module-text HTTP http-client http-client-tls http-types JuicyPixels mtl network network-uri pandoc-types parsec process random safe scientific SHA skylighting split syb tagsoup temporary texmath text time unix @@ -148266,6 +150453,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_13_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , setenv, split, syb, tagsoup, temporary, text, time + , unordered-containers, vector, xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.13.0.1"; + sha256 = "01kwaqz7w8rrkikmcp5r1fbbh44d5qmbk17q0d8blpv66vgmln6v"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 + setenv split syb tagsoup text time unordered-containers vector + xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring containers directory + filepath mtl pandoc pandoc-types process syb temporary text vector + yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath mtl pandoc + pandoc-types process temporary text yaml + ]; + doCheck = false; + homepage = "https://github.com/jgm/pandoc-citeproc"; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process }: @@ -148292,8 +150516,8 @@ self: { }: mkDerivation { pname = "pandoc-crossref"; - version = "0.3.0.0"; - sha256 = "0fgds8i9fwxmfprbp4giv7qi4gzx373p07smfm7arpbimv239d6n"; + version = "0.3.0.1"; + sha256 = "0lhjbkgmd9hshi3lxvciwviknbbj8lyrzinzfxbwssgqrdzcaayn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -148561,6 +150785,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-types_1_17_3_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, HUnit, QuickCheck, string-qq, syb + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , transformers + }: + mkDerivation { + pname = "pandoc-types"; + version = "1.17.3.1"; + sha256 = "0dhp5bcjl6605n2chiab5rp51zir3671gxkmwy34znh0s3vp85jb"; + libraryHaskellDepends = [ + aeson base bytestring containers deepseq ghc-prim QuickCheck syb + transformers + ]; + testHaskellDepends = [ + aeson base bytestring containers HUnit QuickCheck string-qq syb + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base criterion ]; + 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 ({ mkDerivation, base, pandoc }: mkDerivation { @@ -151674,7 +153923,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent_2_7_3" = callPackage + "persistent_2_7_3_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, conduit, containers , exceptions, fast-logger, haskell-src-meta, hspec, http-api-data @@ -151685,8 +153934,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.7.3"; - sha256 = "16by2ip2gljz1xsyp6j3k04jab0l0as9ynfwxdsbbcv4qd8l1sxk"; + version = "2.7.3.1"; + sha256 = "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger @@ -151966,6 +154215,28 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent-postgresql_2_6_3" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, monad-control, monad-logger, persistent + , postgresql-libpq, postgresql-simple, resource-pool, resourcet + , text, time, transformers + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.6.3"; + sha256 = "0yr384b77mp8z7k8mjmdbsqrrqplymcy9rfy6lm1v3ff81g52vli"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers + monad-control monad-logger persistent postgresql-libpq + postgresql-simple resource-pool resourcet text time transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -152418,10 +154689,8 @@ self: { }: mkDerivation { pname = "pgdl"; - version = "10.9"; - sha256 = "0hwky1331bv1zbjq9nbfnvx8gkbfhs5sjawxjccz9l484xsrbb5z"; - revision = "9"; - editedCabalFile = "1r1sjcnaawwklr8lx98zf79qmd9cxkmj83kahdn71q4rvfxm29fv"; + version = "10.10"; + sha256 = "0wqj7i4shdcy80aiib0dkp3y6ccilqq4g3p8bvndh4vl3cyd2pwv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -153076,6 +155345,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "pinboard_0_9_12_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , http-client, http-client-tls, http-types, monad-logger, mtl + , network, profunctors, QuickCheck, random, safe-exceptions + , semigroups, text, time, transformers, unordered-containers + , vector + }: + mkDerivation { + pname = "pinboard"; + version = "0.9.12.8"; + sha256 = "0k9lyk3h108y3zyvqz1krr08cqf4fahg4lh4f5fn1spgz46q3dwk"; + libraryHaskellDepends = [ + aeson base bytestring containers http-client http-client-tls + http-types monad-logger mtl network profunctors random + safe-exceptions text time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec mtl QuickCheck + safe-exceptions semigroups text time transformers + unordered-containers + ]; + homepage = "https://github.com/jonschoning/pinboard"; + description = "Access to the Pinboard API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pinch" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text @@ -154949,8 +157245,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "plumbers"; - version = "0.0.3"; - sha256 = "1grw827jhxwka1zl0n5ycgrpc4ljw8bxg3psms8lsxfiiz6mwmq9"; + version = "0.0.4"; + sha256 = "1lih19zjz5yrrjvrgk8zv5xrvld57ykdxxhdrvhwh6bqyzzarqjj"; libraryHaskellDepends = [ base template-haskell ]; description = "Pointless plumbing combinators"; license = stdenv.lib.licenses.bsd3; @@ -156787,9 +159083,9 @@ self: { "postgrest" = callPackage ({ mkDerivation, aeson, aeson-qq, ansi-wl-pprint, async, base , base64-bytestring, bytestring, case-insensitive, cassava - , configurator-ng, containers, contravariant, cookie, either, hasql - , hasql-pool, hasql-transaction, heredoc, hjsonpointer, hjsonschema - , hspec, hspec-wai, hspec-wai-json, HTTP, http-types + , configurator-ng, containers, contravariant, cookie, either + , gitrev, hasql, hasql-pool, hasql-transaction, heredoc + , hjsonschema, hspec, hspec-wai, hspec-wai-json, HTTP, http-types , insert-ordered-containers, interpolatedstring-perl6, jose, lens , lens-aeson, monad-control, network-uri, optparse-applicative , parsec, process, protolude, Ranged-sets, regex-tdfa, retry, safe @@ -156799,17 +159095,17 @@ self: { }: mkDerivation { pname = "postgrest"; - version = "0.4.3.0"; - sha256 = "1a0l5j755h6nlnv3xww0l88pz6ny5y40d1as9vfn1i1ybk4jx5gq"; + version = "0.4.4.0"; + sha256 = "1dj0gzwjq5psxqmjx0jhbvwa0jlf52dvsbdmbx6ry0yqhsa0yvjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64-bytestring bytestring case-insensitive cassava configurator-ng containers contravariant - cookie either hasql hasql-pool hasql-transaction heredoc HTTP - http-types insert-ordered-containers interpolatedstring-perl6 jose - lens lens-aeson network-uri optparse-applicative parsec protolude - Ranged-sets regex-tdfa safe scientific swagger2 text + cookie either gitrev hasql hasql-pool hasql-transaction heredoc + HTTP http-types insert-ordered-containers interpolatedstring-perl6 + jose lens lens-aeson network-uri optparse-applicative parsec + protolude Ranged-sets regex-tdfa safe scientific swagger2 text unordered-containers vector wai wai-cors wai-extra wai-middleware-static ]; @@ -156820,9 +159116,9 @@ self: { testHaskellDepends = [ aeson aeson-qq async base base64-bytestring bytestring case-insensitive cassava containers contravariant hasql hasql-pool - heredoc hjsonpointer hjsonschema hspec hspec-wai hspec-wai-json - http-types lens lens-aeson monad-control process protolude - regex-tdfa transformers-base wai wai-extra + heredoc hjsonschema hspec hspec-wai hspec-wai-json http-types lens + lens-aeson monad-control process protolude regex-tdfa + transformers-base wai wai-extra ]; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; @@ -156896,8 +159192,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.2"; - sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b"; + version = "0.2.3"; + sha256 = "140z6r01byld665471dbk5zdqaf6lrcxwqp0wvbs5fbpjq37mfmp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157930,6 +160226,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pretty-simple_2_0_2_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers + , criterion, doctest, Glob, mtl, parsec, text, transformers + }: + mkDerivation { + pname = "pretty-simple"; + version = "2.0.2.0"; + sha256 = "1rzc9sfrw0m4aqp19zpzllkrrr6966byc06m9qcy77fbv1icsr44"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base containers mtl parsec text transformers + ]; + executableHaskellDepends = [ aeson base bytestring text ]; + testHaskellDepends = [ base doctest Glob ]; + benchmarkHaskellDepends = [ base criterion ]; + homepage = "https://github.com/cdepillabout/pretty-simple"; + description = "pretty printer for data types with a 'Show' instance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pretty-sop" = callPackage ({ mkDerivation, base, generics-sop, pretty-show }: mkDerivation { @@ -158590,6 +160908,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "process-extras_0_7_3" = callPackage + ({ mkDerivation, base, bytestring, data-default, deepseq + , generic-deriving, HUnit, ListLike, mtl, process, text + }: + mkDerivation { + pname = "process-extras"; + version = "0.7.3"; + sha256 = "0hyrqz2dinvql6r9ldd2q35zkavjwqadw13zqzcwrdhq8myhawzb"; + libraryHaskellDepends = [ + base bytestring data-default deepseq generic-deriving ListLike mtl + process text + ]; + testHaskellDepends = [ base HUnit ]; + homepage = "https://github.com/seereason/process-extras"; + description = "Process extras"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "process-iterio" = callPackage ({ mkDerivation, base, bytestring, cpphs, iterIO, process , transformers @@ -158984,6 +161321,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "profunctors_5_2_2" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, comonad + , contravariant, distributive, semigroups, tagged, transformers + }: + mkDerivation { + pname = "profunctors"; + version = "5.2.2"; + sha256 = "0s1pwjidbn761xk43pmzyvn99hm3psdifjd78ylki7f97aiyd0g9"; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad contravariant distributive + semigroups tagged transformers + ]; + homepage = "http://github.com/ekmett/profunctors/"; + description = "Profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "progress" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -159177,6 +161532,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "project-template_0_2_0_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, conduit + , conduit-extra, containers, directory, filepath, hspec, mtl + , QuickCheck, resourcet, text, transformers + }: + mkDerivation { + pname = "project-template"; + version = "0.2.0.1"; + sha256 = "1p69ww4rhah2qxragl615wl4a6mk4x9w09am8knmz3s4lxpljlpb"; + libraryHaskellDepends = [ + base base64-bytestring bytestring conduit conduit-extra containers + directory filepath mtl resourcet text transformers + ]; + testHaskellDepends = [ + base base64-bytestring bytestring conduit containers hspec + QuickCheck resourcet text transformers + ]; + homepage = "https://github.com/fpco/haskell-ide"; + description = "Specify Haskell project templates and generate files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "projectile" = callPackage ({ mkDerivation, base, deepseq, path, path-io, protolude , safe-exceptions, tasty, tasty-hunit, tasty-rerun, text, vector @@ -159883,6 +162261,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_2_1" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, safe, stm, text + , transformers, transformers-compat + }: + mkDerivation { + pname = "protolude"; + version = "0.2.1"; + sha256 = "1r2baxx6q4z75sswirlqsnyynk4i7amfmpzajggh31fbz13hxgxx"; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat safe stm text transformers transformers-compat + ]; + homepage = "https://github.com/sdiehl/protolude"; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -160115,6 +162512,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psqueues_0_2_5_0" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq + , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue + , QuickCheck, random, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2, unordered-containers + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.5.0"; + sha256 = "1fy2rflmk2g5qkrbdz53wcxbr2nzxlnvkwwf4xf56yhm1ciffgqn"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq fingertree-psqueue ghc-prim + hashable mtl PSQueue random unordered-containers + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pstemmer" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -161247,17 +163668,18 @@ self: { }) {}; "q4c12-twofinger" = callPackage - ({ mkDerivation, base, Cabal, cabal-doctest, deepseq, doctest, lens - , semigroupoids, streams, tasty, tasty-quickcheck + ({ mkDerivation, base, Cabal, cabal-doctest, containers, deepseq + , doctest, lens, lens-properties, semigroupoids, tasty + , tasty-quickcheck }: mkDerivation { pname = "q4c12-twofinger"; - version = "0.1"; - sha256 = "01rj89w3q0k24f0w179yl3pssixhlrh83nni5wm2hambz8ls0aqr"; + version = "0.2"; + sha256 = "0c4fm6pdl1mlh4xnp8syjifknyvbdqwdyiika9pkww4xmf12lv7z"; setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ base deepseq semigroupoids streams ]; + libraryHaskellDepends = [ base containers deepseq semigroupoids ]; testHaskellDepends = [ - base doctest lens streams tasty tasty-quickcheck + base doctest lens lens-properties tasty tasty-quickcheck ]; homepage = "https://github.com/quasicomputational/mega/tree/master/packages/twofinger"; description = "Efficient alternating finger trees"; @@ -162061,6 +164483,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_16_1" = callPackage + ({ mkDerivation, array, base, base-compat, bytestring + , case-insensitive, containers, hashable, old-time, QuickCheck + , scientific, tagged, text, time, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.16.1"; + sha256 = "01v5bs7r9yvhkvb4yc9bqnacy8r6cy2gr9lnmwx40n5apgi0gcbz"; + libraryHaskellDepends = [ + array base base-compat bytestring case-insensitive containers + hashable old-time QuickCheck scientific tagged text time + transformers transformers-compat unordered-containers uuid-types + vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + homepage = "https://github.com/phadej/qc-instances"; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -162254,14 +164701,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-state-machine_0_3_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, async, base, containers + , lifted-async, lifted-base, monad-control, mtl, QuickCheck + , quickcheck-with-counterexamples, random, stm, template-haskell + , th-abstraction + }: + mkDerivation { + pname = "quickcheck-state-machine"; + version = "0.3.1"; + sha256 = "141rs0m67p830n2v30jkpvbqpygqc7i8cka9c9bbycxnwdax5jj4"; + libraryHaskellDepends = [ + ansi-wl-pprint async base containers lifted-async lifted-base + monad-control mtl QuickCheck quickcheck-with-counterexamples random + stm template-haskell th-abstraction + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/advancedtelematic/quickcheck-state-machine#readme"; + description = "Test monadic programs using state machine based models"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-string-random" = callPackage ({ mkDerivation, base, QuickCheck, string-random, tasty , tasty-quickcheck, text }: mkDerivation { pname = "quickcheck-string-random"; - version = "0.1.0.0"; - sha256 = "04pbv5s3j0v9kv9sjhfkh892n9w210fb20k5j9innkxwvaj1bh6y"; + version = "0.1.0.1"; + sha256 = "1yx1kyd6p58b7s10v0lkq1v162vnz90p6m9jlwbr4s6qxa0sm31r"; libraryHaskellDepends = [ base QuickCheck string-random text ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck text @@ -163963,6 +166432,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ratel_0_3_10" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, filepath, hspec, http-client, http-client-tls + , http-types, text, uuid + }: + mkDerivation { + pname = "ratel"; + version = "0.3.10"; + sha256 = "10cqg2rrr8fx57r0vhw37wrv92243lzi2mp7ghsl3kkl1n73qz8n"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive containers http-client + http-client-tls http-types text uuid + ]; + testHaskellDepends = [ base filepath hspec ]; + homepage = "https://github.com/tfausak/ratel#readme"; + description = "Notify Honeybadger about exceptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -164035,15 +166524,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "rattletrap_4_0_1" = callPackage + "rattletrap_4_0_3" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, binary-bits , bytestring, containers, filepath, http-client, http-client-tls , HUnit, template-haskell, temporary, text, transformers }: mkDerivation { pname = "rattletrap"; - version = "4.0.1"; - sha256 = "01dvidlby3k6i7nnh0az3xmmdpvrx594jy6zq6ccf14cjb0m95kv"; + version = "4.0.3"; + sha256 = "04pad6qd7x7bx5xmmd8wyfd421rsnbgwqkipy3ygh056624xb4bz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -164409,17 +166898,18 @@ self: { }) {}; "re2" = callPackage - ({ mkDerivation, base, bytestring, chell, vector }: + ({ mkDerivation, base, bytestring, HUnit, re2, vector }: mkDerivation { pname = "re2"; - version = "0.1"; - sha256 = "08mmbxj9dpnb56b6vh0lz7nimp3w3v9g2c6ypxgz8ahvlia0a4f5"; + version = "0.2"; + sha256 = "0qfmiwy4kc87a736fpzh4cscvldiywq641gb9kvn4hc3sq7dh1k9"; libraryHaskellDepends = [ base bytestring vector ]; - testHaskellDepends = [ base bytestring chell vector ]; - homepage = "https://john-millikin.com/software/haskell-re2/"; + librarySystemDepends = [ re2 ]; + testHaskellDepends = [ base bytestring HUnit vector ]; + homepage = "https://github.com/rblaze/haskell-re2#readme"; description = "Bindings to the re2 regular expression library"; license = stdenv.lib.licenses.mit; - }) {}; + }) {inherit (pkgs) re2;}; "react-flux" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, mtl @@ -165298,8 +167788,8 @@ self: { }: mkDerivation { pname = "recursion-schemes-ext"; - version = "1.0.0.0"; - sha256 = "154ypcjn15z3g9rbl257csz8zfalkw7xf6pawfyi9w69jw2sz381"; + version = "1.0.0.1"; + sha256 = "1jd3dsns2ahsbkrzcp955bbq4xyhr0rmip3y6dvsgs4qjs0jlvbi"; libraryHaskellDepends = [ base composition-prelude lens recursion-schemes ]; @@ -165384,16 +167874,16 @@ self: { }: mkDerivation { pname = "reddit"; - version = "0.2.1.0"; - sha256 = "0874swpm11l33p27dpsik8qj0by40cxjp864v6zbf2jfl0aavra9"; + version = "0.2.2.2"; + sha256 = "0k94rsnrnanjc7bwqfjzlk8l005gc3141mm8iqq680d8pdcgf8m8"; libraryHaskellDepends = [ aeson api-builder base bytestring data-default-class free http-client http-client-tls http-types network text time transformers unordered-containers vector ]; testHaskellDepends = [ - aeson api-builder base bytestring Cabal hspec http-client - http-client-tls text time transformers + aeson api-builder base bytestring Cabal data-default-class hspec + http-client http-client-tls text time transformers ]; homepage = "https://github.com/intolerable/reddit"; description = "Library for interfacing with Reddit's API"; @@ -165775,6 +168265,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "reflection_2_1_3" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "reflection"; + version = "2.1.3"; + sha256 = "01g4ilgj073vvn6dx4y1fkiq81xk01ccswbhvr8iw8fpmciiky48"; + libraryHaskellDepends = [ base template-haskell ]; + homepage = "http://github.com/ekmett/reflection"; + description = "Reifies arbitrary terms into types that can be reflected back into terms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "reflection-extras" = callPackage ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged }: @@ -166694,8 +169197,8 @@ self: { }: mkDerivation { pname = "regexchar"; - version = "0.9.0.15"; - sha256 = "05p3m9phi84lj94vw2l1jdzcxpq96rch64q85jc0wvcb22y6rfm7"; + version = "0.9.0.16"; + sha256 = "01bn4vazmnqvng8a989l50v7vy9bd7g57x9v44d6cn78q773vfzh"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -166714,15 +169217,15 @@ self: { }) {}; "regexdot" = callPackage - ({ mkDerivation, base, data-default, deepseq, parallel, parsec - , toolshed + ({ mkDerivation, base, data-default, deepseq, extra, parallel + , parsec, toolshed }: mkDerivation { pname = "regexdot"; - version = "0.12.0.1"; - sha256 = "0r30lrgbklymc9vkl6bcrmjrxbpqi5g4ngm4c2sjhw7bc4466vdr"; + version = "0.12.1.0"; + sha256 = "11hv0mc48y42dz0bjfcvjxjxcbag33kvdc2gxbx0lsgyb4lm0q8j"; libraryHaskellDepends = [ - base data-default deepseq parallel parsec toolshed + base data-default deepseq extra parallel parsec toolshed ]; homepage = "http://functionalley.eu/RegExDot/regExDot.html"; description = "A polymorphic, POSIX, extended regex-engine"; @@ -168403,6 +170906,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_1_11" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, lifted-base + , mmorph, monad-control, mtl, transformers, transformers-base + , transformers-compat, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.1.11"; + sha256 = "1n94m2c7rxk2bgm8wywrkp9pmqlnv2dl35yaylninzm8xk1xavil"; + libraryHaskellDepends = [ + base containers exceptions lifted-base mmorph monad-control mtl + transformers transformers-base transformers-compat unliftio-core + ]; + testHaskellDepends = [ base hspec lifted-base transformers ]; + homepage = "http://github.com/snoyberg/conduit"; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -170253,8 +172776,8 @@ self: { }: mkDerivation { pname = "rotating-log"; - version = "0.4.2"; - sha256 = "1v2lyyapsbyrnswggy8lfn5qq2xrzdrw3vc881xkhc4yrdzaxw3f"; + version = "0.4.3"; + sha256 = "1xpfm07kd6mz13zwzmrwcp2cmc0dr0j94nhy1gzw1064jmd7b482"; libraryHaskellDepends = [ base bytestring directory filepath old-locale time time-locale-compat @@ -170651,8 +173174,8 @@ self: { }: mkDerivation { pname = "rtcm"; - version = "0.2.11"; - sha256 = "01vlj8ilxzyv6rqffpj3il7dcmcyy4vg6ab3mprdgcy6f0rpsv8b"; + version = "0.2.13"; + sha256 = "06xxkm2h6kf6j90987p33nk54bbvwmrf81ywkdj0bvy0payiiyms"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -171137,6 +173660,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safe-exceptions_0_1_7_0" = callPackage + ({ mkDerivation, base, deepseq, exceptions, hspec, transformers + , void + }: + mkDerivation { + pname = "safe-exceptions"; + version = "0.1.7.0"; + sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; + libraryHaskellDepends = [ base deepseq exceptions transformers ]; + testHaskellDepends = [ base hspec void ]; + homepage = "https://github.com/fpco/safe-exceptions#readme"; + description = "Safe, consistent, and easy exception handling"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safe-exceptions-checked" = callPackage ({ mkDerivation, base, deepseq, hspec, safe-exceptions , transformers @@ -171405,6 +173944,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "safeio_0_0_5_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-combinators + , directory, exceptions, filepath, HUnit, resourcet, test-framework + , test-framework-hunit, test-framework-th, unix + }: + mkDerivation { + pname = "safeio"; + version = "0.0.5.0"; + sha256 = "04g3070cbjdqj0h9l9ii6470xcbn40xfv4fr89a8yvnkdim9nyfm"; + libraryHaskellDepends = [ + base bytestring conduit conduit-combinators directory exceptions + filepath resourcet unix + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators directory exceptions + filepath HUnit resourcet test-framework test-framework-hunit + test-framework-th unix + ]; + homepage = "https://github.com/luispedro/safeio#readme"; + description = "Write output to disk atomically"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safepath" = callPackage ({ mkDerivation, base, doctest, text, validity }: mkDerivation { @@ -172179,6 +174742,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) z3;}; + "sbv_7_5" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , crackNum, data-binary-ieee754, deepseq, directory, doctest + , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty + , process, QuickCheck, random, syb, tasty, tasty-golden + , tasty-hunit, template-haskell, time, z3 + }: + mkDerivation { + pname = "sbv"; + version = "7.5"; + sha256 = "1c5drbqz0qld54v0k29zkra1zj09izkzf0rrmgcmgvzz7dfac4ik"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array async base containers crackNum data-binary-ieee754 deepseq + directory filepath generic-deriving ghc mtl pretty process + QuickCheck random syb template-haskell time + ]; + testHaskellDepends = [ + base bytestring containers data-binary-ieee754 directory doctest + filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit + template-haskell + ]; + testSystemDepends = [ z3 ]; + homepage = "http://leventerkok.github.com/sbv/"; + description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) z3;}; + "sbvPlugin" = callPackage ({ mkDerivation, base, containers, directory, filepath, ghc , ghc-prim, mtl, process, sbv, tasty, tasty-golden @@ -172769,8 +175361,8 @@ self: { pname = "scientific"; version = "0.3.5.2"; sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w"; - revision = "2"; - editedCabalFile = "0wsrd213480p3pqrd6i650fr092yv7dhla7a85p8154pn5gvbr0a"; + revision = "4"; + editedCabalFile = "108m6b9w8l2q4r68mla9m5z47k6ahb0p68hypsmn140hgfr6a8la"; libraryHaskellDepends = [ base binary bytestring containers deepseq hashable integer-gmp integer-logarithms primitive text @@ -173986,6 +176578,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_1_12" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.1.12"; + sha256 = "1pbf141p3j2gj91lz4ilfc75kf2b0mzfnzxpjn220knkzianm2d9"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -173994,8 +176604,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.0"; sha256 = "0smx2hvpdxjcw58zchwmzcqz4xr5m1idv5y5rrj20df190r4l3l2"; - revision = "1"; - editedCabalFile = "0icxqqb4n1qbfpjlngs3lypnvjanwqrw3l8298my7b1wzj3iyw2m"; + revision = "2"; + editedCabalFile = "01ghxjlbw2fbbkwyl1q1randxy1bybf3ilkfaz8hq1h37nvyfzmi"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -174004,6 +176614,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_7_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , selda, text + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.7.1"; + sha256 = "1izc27wdi9ldhjmmhwjw99g8pgbcayldwn65p5lsad173nc2rd22"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -174219,6 +176846,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "semigroupoids_5_2_2" = callPackage + ({ mkDerivation, base, base-orphans, bifunctors, Cabal + , cabal-doctest, comonad, containers, contravariant, distributive + , doctest, hashable, semigroups, tagged, template-haskell + , transformers, transformers-compat, unordered-containers + }: + mkDerivation { + pname = "semigroupoids"; + version = "5.2.2"; + sha256 = "17i96y4iqj8clcs090lf6k0ij3j16nj14vsfwz0mm9nd6i4gbpp4"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-orphans bifunctors comonad containers contravariant + distributive hashable semigroups tagged template-haskell + transformers transformers-compat unordered-containers + ]; + testHaskellDepends = [ base doctest ]; + homepage = "http://github.com/ekmett/semigroupoids"; + description = "Semigroupoids: Category sans id"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semigroupoids-syntax" = callPackage ({ mkDerivation, base, comonad, containers, contravariant , directory, distributive, doctest, filepath, QuickCheck @@ -174853,10 +177503,10 @@ self: { }) {}; "serokell-util" = callPackage - ({ mkDerivation, acid-state, aeson, ansi-terminal, base - , base16-bytestring, base64-bytestring, bytestring, clock - , containers, deepseq, directory, exceptions, extra, filepath - , formatting, hashable, hspec, lens, log-warper, monad-control, mtl + ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring + , base64-bytestring, bytestring, clock, containers, deepseq + , directory, exceptions, extra, filepath, formatting, hashable + , hspec, hspec-discover, lens, log-warper, monad-control, mtl , optparse-applicative, parsec, QuickCheck, quickcheck-instances , safecopy, scientific, semigroups, stm, template-haskell, text , text-format, time-units, transformers, universum @@ -174864,21 +177514,21 @@ self: { }: mkDerivation { pname = "serokell-util"; - version = "0.5.3"; - sha256 = "02rr1wc1ss2rjx31w485k2hdnzhbs59pqzr9yvmk39082q9ppmk3"; + version = "0.6.0"; + sha256 = "1821f6hak3wwjradyzy2zb3pfy153l7yc39i5z2mdxn8b4vh4k88"; libraryHaskellDepends = [ - acid-state aeson ansi-terminal base base16-bytestring - base64-bytestring bytestring clock containers deepseq directory - exceptions extra filepath formatting hashable lens log-warper - monad-control mtl optparse-applicative parsec QuickCheck - quickcheck-instances safecopy scientific semigroups stm - template-haskell text text-format time-units transformers universum - unordered-containers vector yaml + aeson ansi-terminal base base16-bytestring base64-bytestring + bytestring clock containers deepseq directory exceptions extra + filepath formatting hashable lens log-warper monad-control mtl + optparse-applicative parsec QuickCheck quickcheck-instances + scientific semigroups stm template-haskell text text-format + time-units transformers universum unordered-containers vector yaml ]; testHaskellDepends = [ aeson base bytestring hspec QuickCheck quickcheck-instances safecopy scientific text text-format unordered-containers vector ]; + testToolDepends = [ hspec-discover ]; homepage = "https://github.com/serokell/serokell-util"; description = "General-purpose functions by Serokell"; license = stdenv.lib.licenses.mit; @@ -175125,7 +177775,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-auth-cookie_0_6_0_1" = callPackage + "servant-auth-cookie_0_6_0_3" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring , cereal, cereal-time, cookie, criterion, cryptonite, data-default , deepseq, exceptions, hspec, http-api-data, http-types, memory @@ -175134,8 +177784,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.6.0.1"; - sha256 = "0fbzcqav3cgnjvbfw0yrqlp36c8fk3ab3ff0am5cwvic8db1kqhb"; + version = "0.6.0.3"; + sha256 = "12cwqvva4f2kricvwq645f5c759pjz4w2b9yhx9iz7agc95ghkv0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176181,6 +178831,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "servant-pandoc_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, http-media + , lens, pandoc-types, servant-docs, string-conversions, text + , unordered-containers + }: + mkDerivation { + pname = "servant-pandoc"; + version = "0.5.0.0"; + sha256 = "0qq4ahwl8vc8xgmvbh8qac7751hizgdcbp43gc0kxfs7xpy0kmqj"; + libraryHaskellDepends = [ + base bytestring case-insensitive http-media lens pandoc-types + servant-docs string-conversions text unordered-containers + ]; + description = "Use Pandoc to render servant API documentation"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-pool" = callPackage ({ mkDerivation, base, resource-pool, servant, time }: mkDerivation { @@ -176422,6 +179090,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-ruby_0_5_1_0" = callPackage + ({ mkDerivation, base, casing, doctest, lens, QuickCheck + , servant-foreign, text + }: + mkDerivation { + pname = "servant-ruby"; + version = "0.5.1.0"; + sha256 = "0j1q8yl1cz8lwij17zl13rk35r0qnk8ibh963qlcd35w83wms56j"; + libraryHaskellDepends = [ base casing lens servant-foreign text ]; + testHaskellDepends = [ base doctest QuickCheck ]; + homepage = "https://github.com/joneshf/servant-ruby#readme"; + description = "Generate a Ruby client from a Servant API with Net::HTTP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-scotty" = callPackage ({ mkDerivation, aeson, base, http-types, scotty, servant , servant-response, text, transformers @@ -176849,8 +179533,8 @@ self: { }: mkDerivation { pname = "serverless-haskell"; - version = "0.1.0"; - sha256 = "0xml0rjsrxmh4mf8vl1z596s86whafklb7h741b1f98bqxj8l24q"; + version = "0.3.0"; + sha256 = "0fvm7nsk3401xdh81gb7jc35k5phc1gfs7dd1gal48ryjc89p2sj"; libraryHaskellDepends = [ aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base bytestring lens text time unix unordered-containers @@ -176958,6 +179642,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serversession-backend-redis_1_0_3" = callPackage + ({ mkDerivation, base, bytestring, hedis, hspec, path-pieces + , serversession, tagged, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "serversession-backend-redis"; + version = "1.0.3"; + sha256 = "059nak15x4cbwmfbvfih6ndwa6i5jhcba22h9gz44f6s84vhljyf"; + libraryHaskellDepends = [ + base bytestring hedis path-pieces serversession tagged text time + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring hedis hspec path-pieces serversession text time + transformers unordered-containers + ]; + homepage = "https://github.com/yesodweb/serversession"; + description = "Storage backend for serversession using Redis"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession-frontend-snap" = callPackage ({ mkDerivation, base, bytestring, nonce, path-pieces , serversession, snap, snap-core, text, time, transformers @@ -177123,8 +179830,8 @@ self: { }: mkDerivation { pname = "sessiontypes"; - version = "0.1.1"; - sha256 = "0l9chnnyq8mblxqyg89nlfa55cadwy62mj29arakrc988l6ja3gq"; + version = "0.1.2"; + sha256 = "1xjf3yjapz9ipjkqhm8fljgbj6fww3iyl1mx1kjwh18s6b9ymq5s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -177144,8 +179851,8 @@ self: { }: mkDerivation { pname = "sessiontypes-distributed"; - version = "0.1.0"; - sha256 = "1q0y37iwjafcb70fv42hny44ay0bpzbvss48h10dahvsmzpqkk8a"; + version = "0.1.1"; + sha256 = "0fi263sdpshzjwc51h9rqgg0zj7f5a6igrfj9487lbdgaz1cb1ya"; libraryHaskellDepends = [ base binary bytestring distributed-process distributed-static exceptions rank1dynamic sessiontypes @@ -177829,8 +180536,8 @@ self: { ({ mkDerivation, base, path, path-io, shake }: mkDerivation { pname = "shake-path"; - version = "0.0.0.0"; - sha256 = "0cqsfvm9hsyyglifc1s7c76yi15wj13hh735lfjkg9ljiqv90qpb"; + version = "0.0.0.1"; + sha256 = "0sjw0hcs6i9c8vfirrk90y5xd3cf0f9c0wa2p5pqimc5wfid9plk"; libraryHaskellDepends = [ base path path-io shake ]; homepage = "http://cs-syd.eu"; description = "path alternatives to shake functions"; @@ -178316,10 +181023,8 @@ self: { }: mkDerivation { pname = "shelltestrunner"; - version = "1.3.5"; - sha256 = "0ad8sc4md8mp0l0s40yx7qbgaabqzd4nz8lx15ajcdbwr2ffnra2"; - revision = "2"; - editedCabalFile = "1d72n8k72w2mdi3y9s74ydlwxj407mc237albx6zx42lsjx1fw34"; + version = "1.9"; + sha256 = "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -178327,8 +181032,8 @@ self: { pretty-show process regex-tdfa safe test-framework test-framework-hunit utf8-string ]; - homepage = "http://joyful.com/shelltestrunner"; - description = "A tool for testing command-line programs"; + homepage = "https://github.com/simonmichael/shelltestrunner"; + description = "Easy, repeatable testing of CLI programs/commands"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -178443,6 +181148,28 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "shikensu_0_3_8" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath, flow + , Glob, tasty, tasty-hunit, text, unordered-containers + }: + mkDerivation { + pname = "shikensu"; + version = "0.3.8"; + sha256 = "0sji1lw1ma8js9kylixn694108nv74g8qpbfd198fwqvcqx5jhwh"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath flow Glob text + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath flow Glob tasty + tasty-hunit text unordered-containers + ]; + homepage = "https://github.com/icidasset/shikensu#readme"; + description = "Run a sequence of functions on in-memory representations of files"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shine" = callPackage ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time , transformers @@ -180041,6 +182768,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "singleton-nats_0_4_0_4" = callPackage + ({ mkDerivation, base, singletons }: + mkDerivation { + pname = "singleton-nats"; + version = "0.4.0.4"; + sha256 = "1cizvqiv1hw7an2c2k1mbj9089n6rrggyf5pv2pcl7knpy07hph4"; + libraryHaskellDepends = [ base singletons ]; + homepage = "https://github.com/AndrasKovacs/singleton-nats"; + description = "Unary natural numbers relying on the singletons infrastructure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "singleton-typelits" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -180562,28 +183302,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_5_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary - , blaze-html, bytestring, case-insensitive, containers, criterion - , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show - , QuickCheck, random, regex-pcre-builtin, safe, tasty, tasty-golden - , tasty-hunit, tasty-quickcheck, text, utf8-string + "skylighting_0_6" = callPackage + ({ mkDerivation, aeson, ansi-terminal, attoparsec, base + , base64-bytestring, binary, blaze-html, bytestring + , case-insensitive, colour, containers, criterion, Diff, directory + , filepath, HUnit, hxt, mtl, pretty-show, QuickCheck, random + , regex-pcre-builtin, safe, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, text, utf8-string }: mkDerivation { pname = "skylighting"; - version = "0.5.1"; - sha256 = "0l5lhhqqlfaq1fs7pn3n3b25kmazk8p4ahwvhagbrhcbm5hsigdg"; + version = "0.6"; + sha256 = "1027rcj6zqmnwm6is5k5v28r8af8bsf6i36dwi128h5g92pg206f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring binary blaze-html - bytestring case-insensitive containers directory filepath hxt mtl - regex-pcre-builtin safe text utf8-string + aeson ansi-terminal attoparsec base base64-bytestring binary + blaze-html bytestring case-insensitive colour containers directory + filepath hxt mtl regex-pcre-builtin safe text utf8-string ]; executableHaskellDepends = [ - aeson base base64-bytestring binary blaze-html bytestring - case-insensitive containers directory filepath hxt pretty-show - regex-pcre-builtin safe text utf8-string + aeson ansi-terminal base base64-bytestring binary blaze-html + bytestring case-insensitive colour containers directory filepath + hxt pretty-show regex-pcre-builtin safe text utf8-string ]; testHaskellDepends = [ aeson base bytestring containers Diff directory filepath HUnit @@ -181448,19 +184189,17 @@ self: { "snap" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal , clientsession, configurator, containers, deepseq, directory - , directory-tree, dlist, filepath, Glob, hashable, heist - , http-streams, HUnit, lens, lifted-base, map-syntax, monad-control - , mtl, mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core + , directory-tree, dlist, filepath, hashable, heist, http-streams + , HUnit, lens, lifted-base, map-syntax, monad-control, mtl + , mwc-random, pwstore-fast, QuickCheck, smallcheck, snap-core , snap-server, stm, syb, test-framework, test-framework-hunit , test-framework-quickcheck2, test-framework-smallcheck, text, time , transformers, transformers-base, unordered-containers, xmlhtml }: mkDerivation { pname = "snap"; - version = "1.0.0.2"; - sha256 = "0jx2prq0lxq9jqxqk8f059lwjm2yqxzwb9lx6iviq57flx4zxyqq"; - revision = "1"; - editedCabalFile = "1df44l26sxfk2qprs2vcfigzyzkxxwxi8siaaikbvmjzyjm0mby1"; + version = "1.1.0.0"; + sha256 = "166ilpc4dd4020mmqn2lrfs3j5dl4a2mvqag1sz4mx7jcndrjbc8"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -181471,7 +184210,7 @@ self: { testHaskellDepends = [ aeson async attoparsec base bytestring cereal clientsession configurator containers deepseq directory directory-tree dlist - filepath Glob hashable heist http-streams HUnit lens lifted-base + filepath hashable heist http-streams HUnit lens lifted-base map-syntax monad-control mtl mwc-random pwstore-fast QuickCheck smallcheck snap-core snap-server stm syb test-framework test-framework-hunit test-framework-quickcheck2 @@ -181671,8 +184410,8 @@ self: { }: mkDerivation { pname = "snap-extras"; - version = "0.12.1.0"; - sha256 = "1lkdva37dcg6zvy02v65qi8pwzia7wai0ny744jdr659lmninn4g"; + version = "0.12.1.1"; + sha256 = "0x5j5d4g605i2pnkaryy1d7pxikdwz2pmns7lp9sliii7h6yq2n6"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -181800,8 +184539,8 @@ self: { pname = "snap-server"; version = "1.0.3.3"; sha256 = "1vjfpgcl09l974mdsvgxdlqcl68xmn33z1scx3sfyvcnz32xnnkl"; - revision = "1"; - editedCabalFile = "1laqh4q98ia8l7znhsv4vpx04rb9sdb9dgycx4aychfrb0fbb3pc"; + revision = "2"; + editedCabalFile = "1nb3jxr7sgw2r305k6bbbyyx8myxm3r01a8zhvxdkz4xvv9907d0"; configureFlags = [ "-fopenssl" ]; isLibrary = true; isExecutable = true; @@ -182334,21 +185073,21 @@ self: { "snaplet-persistent" = callPackage ({ mkDerivation, base, bytestring, clientsession, configurator - , errors, heist, lens, monad-logger, MonadCatchIO-transformers, mtl - , persistent, persistent-postgresql, persistent-template, readable + , errors, heist, lens, map-syntax, monad-logger, mtl, persistent + , persistent-postgresql, persistent-template, readable , resource-pool, resourcet, safe, snap, text, time, transformers , unordered-containers }: mkDerivation { pname = "snaplet-persistent"; - version = "0.5"; - sha256 = "1zbxknmsg9q6jwbxr4nh8nkfgkjmxb7pr2wwqa7rgr0wvh8ipx5k"; + version = "0.5.1"; + sha256 = "00p5f1xysv618yd4s9zw66zfjpa1gx7nld5k9ysm8vrd0haa4v5r"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring clientsession configurator errors heist lens - monad-logger MonadCatchIO-transformers mtl persistent - persistent-postgresql persistent-template readable resource-pool - resourcet safe snap text time transformers unordered-containers + map-syntax monad-logger mtl persistent persistent-postgresql + persistent-template readable resource-pool resourcet safe snap text + time transformers unordered-containers ]; homepage = "https://github.com/soostone/snaplet-persistent"; description = "persistent snaplet for the Snap Framework"; @@ -183774,8 +186513,8 @@ self: { }: mkDerivation { pname = "spake2"; - version = "0.4.0"; - sha256 = "109hvcphd2rvqls84ahs6yy9k58yhh4f0zgqc4c78a6nz4709hdp"; + version = "0.4.1"; + sha256 = "0b9zs1mp7r8y1w79z1w7kpj84jyryhvy7md9ikihnl80cvnl6p7c"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -185087,13 +187826,13 @@ self: { }) {}; "squeeze" = callPackage - ({ mkDerivation, base, Cabal, data-default, directory, factory - , filepath, mtl, QuickCheck, random, toolshed + ({ mkDerivation, base, Cabal, data-default, directory, extra + , factory, filepath, mtl, QuickCheck, random, toolshed }: mkDerivation { pname = "squeeze"; - version = "1.0.4.13"; - sha256 = "0s6qkfkm8vxqc3vwgzdhayalyrdgbybxw5p1imvsgn409i7vhiyd"; + version = "1.0.4.16"; + sha256 = "0ywlxh7988i87qxpmja79a98ri9myzk4648d2j3aihsfdm34w2cr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -185102,7 +187841,9 @@ self: { executableHaskellDepends = [ base Cabal data-default factory filepath mtl random toolshed ]; - testHaskellDepends = [ base factory QuickCheck toolshed ]; + testHaskellDepends = [ + base Cabal extra factory QuickCheck toolshed + ]; homepage = "http://functionalley.eu/Squeeze/squeeze.html"; description = "A file-packing application"; license = "GPL"; @@ -185493,6 +188234,8 @@ self: { pname = "stache"; version = "1.2.1"; sha256 = "0fqipjyin2hpklm0gaab4qhcfj9gzkpb2g948sqzf1n6alkxvyvb"; + revision = "1"; + editedCabalFile = "18h31a8bd7v96lc9q0ai7sblnxg3y55s1053jqdixi3y7lz3jh79"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -185659,6 +188402,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "stack-lib" = callPackage + ({ mkDerivation, base, monad-logger, path, stack, time + , transformers + }: + mkDerivation { + pname = "stack-lib"; + version = "0.1.0.0"; + sha256 = "0fb7svqqp2p3q3a2w5nkxxlqk3v3lmkhrdhfk8cfkkwjz2gpb4bf"; + libraryHaskellDepends = [ + base monad-logger path stack time transformers + ]; + homepage = "https://github.com/clintonmead/stack-lib#readme"; + description = "Wrapper to use stack as a library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stack-prism" = callPackage ({ mkDerivation, base, profunctors, tagged, template-haskell , transformers @@ -186137,8 +188896,8 @@ self: { }: mkDerivation { pname = "stagen"; - version = "0.0.0"; - sha256 = "17hvijrkc0lczppp8c73n8drjghn7mmwhdai0m4rilga3vminw7r"; + version = "0.1.0"; + sha256 = "0cd0639ms4vcdvjvhn8l0893d5nv51kzg3ky0xd9bnmjr8f0wpzm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186356,6 +189115,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stateWriter_0_2_10" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, dlist, free + , hspec, lens, mtl, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "stateWriter"; + version = "0.2.10"; + sha256 = "0g1r7zn1ahky9wmqbimjryca3hkylx15xpqwhc42gkyf7h7kq2b8"; + revision = "1"; + editedCabalFile = "19zp7wy2k6f5dqw0wfj9wzarjgfr20nvw5rmqiv79h66qssjl9i6"; + libraryHaskellDepends = [ base mtl transformers ]; + testHaskellDepends = [ base free hspec mtl QuickCheck ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq dlist lens mtl transformers + vector + ]; + description = "A faster variant of the RWS monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "statechart" = callPackage ({ mkDerivation, base, polyparse }: mkDerivation { @@ -186451,6 +189231,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "static-closure" = callPackage + ({ mkDerivation, base, binary, bytestring, constraints, containers + , ghc-instances, template-haskell + }: + mkDerivation { + pname = "static-closure"; + version = "0.1.0.0"; + sha256 = "16cjjyn51wsv3ngc8fbivlshnjp085xxxnv0snyywyxpna1nn79d"; + libraryHaskellDepends = [ + base binary bytestring constraints containers ghc-instances + template-haskell + ]; + homepage = "https://github.com/clintonmead/static-closure#readme"; + description = "Serialisable static pointers to functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "static-hash" = callPackage ({ mkDerivation, array, base, containers, hashable, primes }: mkDerivation { @@ -188775,15 +191572,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "strive_5_0_0" = callPackage + "strive_5_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline , http-client, http-client-tls, http-types, markdown-unlit , template-haskell, text, time, transformers }: mkDerivation { pname = "strive"; - version = "5.0.0"; - sha256 = "1ywzn3vg47w36777ha0w2gx64kfnw2mdj9b9w60q3d6pl052lxq0"; + version = "5.0.1"; + sha256 = "01v2g2qbfjlzx8vfyix5g7lbb5hsa59xlywiphhq5sy1dp9cxciz"; libraryHaskellDepends = [ aeson base bytestring data-default gpolyline http-client http-client-tls http-types template-haskell text time transformers @@ -191147,6 +193944,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "system-filepath_0_4_14" = callPackage + ({ mkDerivation, base, bytestring, chell, chell-quickcheck, deepseq + , QuickCheck, text + }: + mkDerivation { + pname = "system-filepath"; + version = "0.4.14"; + sha256 = "14yras4pz2dh55xpwmazcgxijvi8913pjgzb9iw50mjq1lycwmhn"; + libraryHaskellDepends = [ base bytestring deepseq text ]; + testHaskellDepends = [ + base bytestring chell chell-quickcheck QuickCheck text + ]; + homepage = "https://github.com/fpco/haskell-filesystem"; + description = "High-level, byte-based file and directory path manipulations (deprecated)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "system-gpio" = callPackage ({ mkDerivation, array, base, ghc-prim }: mkDerivation { @@ -191163,8 +193978,8 @@ self: { ({ mkDerivation, attoparsec, base, process, text }: mkDerivation { pname = "system-info"; - version = "0.1.0.10"; - sha256 = "164f8x4npp5pywplpz7x7q2qrmc7fc2hlqxm8zw083402sw668m7"; + version = "0.1.0.13"; + sha256 = "0ym1j9bjjv7aa3v1zqklljfyq19agv3imghglfii0qk7mrlyya9d"; libraryHaskellDepends = [ attoparsec base process text ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -191769,8 +194584,8 @@ self: { pname = "tagged"; version = "0.8.5"; sha256 = "16cdzh0bw16nvjnyyy5j9s60malhz4nnazw96vxb0xzdap4m2z74"; - revision = "1"; - editedCabalFile = "15mqdimbgrq5brqljjl7dbxkyrxppap06q53cp7ml7w3l08v5mx8"; + revision = "2"; + editedCabalFile = "0r2knfcq0b4s652vlvlnfwxlc2mkc2ra9kl8bp4zdn1awmfy0ia5"; libraryHaskellDepends = [ base deepseq template-haskell transformers transformers-compat ]; @@ -192587,15 +195402,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_1_0" = callPackage + "tasty_1_0_0_1" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers , deepseq, mtl, optparse-applicative, stm, tagged, unbounded-delays , unix }: mkDerivation { pname = "tasty"; - version = "1.0"; - sha256 = "0wdcq1467x511bs3s439szr5a36qhm7sjmdi6jsy9v3z9lfrf580"; + version = "1.0.0.1"; + sha256 = "0ggqffw9kbb6nlq1pplk131qzxndqqzqyf4s2p7576nljx11a7qf"; libraryHaskellDepends = [ ansi-terminal async base clock containers deepseq mtl optparse-applicative stm tagged unbounded-delays unix @@ -192658,12 +195473,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-dejafu_1_0_0_0" = callPackage + "tasty-dejafu_1_0_0_1" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "1.0.0.0"; - sha256 = "1gybk59c1jcbpmyrddfqs45z026rvfk6idd99shds3qhlfbm4897"; + version = "1.0.0.1"; + sha256 = "1b06x1z6bc010w4nfz7hf5qb35z6cwa8bz35qd4526qnxqf88qf5"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -192796,8 +195611,8 @@ self: { pname = "tasty-hspec"; version = "1.1.3.2"; sha256 = "0n4pn89jz9i8d7mxsdp6ynwkg5gjyaipdy261parx64m3nxi4vcv"; - revision = "1"; - editedCabalFile = "05fl6jirj479lax2wqg6h5m82mkc475lhas7wmpx91kv1kfklx54"; + revision = "2"; + editedCabalFile = "1si8bkb5rqx0hfm2y52676x7d4zr4mpgd82sqp7na57f0w2j8hg2"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck random tagged tasty tasty-quickcheck tasty-smallcheck @@ -192998,6 +195813,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-quickcheck_0_9_2" = callPackage + ({ mkDerivation, base, pcre-light, QuickCheck, random, tagged + , tasty, tasty-hunit + }: + mkDerivation { + pname = "tasty-quickcheck"; + version = "0.9.2"; + sha256 = "0wsqm4fjxnh64sjlccjapvgvw4dhl603qpxl79g3sa3fmgg0m4n5"; + libraryHaskellDepends = [ base QuickCheck random tagged tasty ]; + testHaskellDepends = [ base pcre-light tasty tasty-hunit ]; + homepage = "https://github.com/feuerbach/tasty"; + description = "QuickCheck support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-rerun" = callPackage ({ mkDerivation, base, containers, mtl, optparse-applicative , reducers, split, stm, tagged, tasty, transformers @@ -195494,6 +198325,8 @@ self: { pname = "text-metrics"; version = "0.3.0"; sha256 = "18mzxwkdvjp31r720ai9bnxr638qq8x3a2v408bz0d8f0rsayx1q"; + revision = "1"; + editedCabalFile = "0jl0vlx9y0n7x4j5zspx6zmbbnmlf5p2bg6v9k2afdfc02fmhasm"; libraryHaskellDepends = [ base containers text vector ]; testHaskellDepends = [ base hspec QuickCheck text ]; benchmarkHaskellDepends = [ base criterion deepseq text weigh ]; @@ -195698,6 +198531,8 @@ self: { pname = "text-show"; version = "3.7.1"; sha256 = "0gbf3cpxz92v4jphmwvz93il7m38qkwirfnk5453517k2s84s899"; + revision = "1"; + editedCabalFile = "1f30i7b45hq3m1hb7b6m8kc1fwz4i697m17wwiabjsyzbx4qiv98"; libraryHaskellDepends = [ array base base-compat bifunctors bytestring bytestring-builder containers contravariant generic-deriving ghc-boot-th ghc-prim @@ -195736,6 +198571,8 @@ self: { pname = "text-show-instances"; version = "3.6.2"; sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5"; + revision = "1"; + editedCabalFile = "04rkwk7c6zzl2ql22x66gn3amgq7cfqdndxyhh6ywlbksa9ljjsw"; libraryHaskellDepends = [ base base-compat bifunctors binary bytestring containers directory ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process @@ -196404,6 +199241,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_5" = callPackage + ({ mkDerivation, base, hspec, hspec-discover, mtl, template-haskell + , th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.5"; + sha256 = "1b9599vyn0wjwbq7b7n0w25s3wbihdxr958hscfpwc8lg55lsr4m"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ base hspec template-haskell ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -196710,8 +199565,8 @@ self: { pname = "these"; version = "0.7.4"; sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw"; - revision = "2"; - editedCabalFile = "0mxl547dy7pp95kh3bvmdhsfcrmxcx8rzc94nnmcs3ahrbyw1nl1"; + revision = "4"; + editedCabalFile = "15pkx470kqx0a6rlxmwn8hdh6nlddncw040i4g5b8rphdr65whbn"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -197543,14 +200398,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_8_0_3" = callPackage + "time_1_8_0_4" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.8.0.3"; - sha256 = "0mbz76v74q938ramsgipgsvk8hvnplcnffplaq439z202zkyar1h"; + version = "1.8.0.4"; + sha256 = "18m58vj490pk6vxfpda5r2rc1vkv0gy5sqgp5nhql0562m5xi8mk"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -198627,6 +201482,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tldr_0_2_5" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, cmark, directory + , filepath, optparse-applicative, semigroups, shell-conduit, text + }: + mkDerivation { + pname = "tldr"; + version = "0.2.5"; + sha256 = "0b87zkwj27z7h5rxf25qh4sq20smwbd3fg6j30hgmn0p9rsg4gzw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring cmark text + ]; + executableHaskellDepends = [ + base directory filepath optparse-applicative semigroups + shell-conduit + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/psibi/tldr-hs#readme"; + description = "Haskell tldr client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, criterion, cryptonite, data-default-class, hourglass @@ -199112,17 +201991,19 @@ self: { "toolshed" = callPackage ({ mkDerivation, array, base, containers, data-default, deepseq - , directory, filepath, HUnit, QuickCheck, random + , directory, extra, filepath, HUnit, QuickCheck, random }: mkDerivation { pname = "toolshed"; - version = "0.17.0.2"; - sha256 = "10cyg48dlv34xndx7aqhldxlglnkijmc88abxkg3jwk7q06ckm93"; + version = "0.18.0.0"; + sha256 = "0x8sn6gvmns81xjkzs1r5jfaar3qjhcyl6q9dbniyglk5y7w35gm"; libraryHaskellDepends = [ array base containers data-default deepseq directory filepath QuickCheck random ]; - testHaskellDepends = [ base containers HUnit QuickCheck random ]; + testHaskellDepends = [ + base containers extra HUnit QuickCheck random + ]; homepage = "http://functionalley.eu"; description = "Ill-defined library"; license = "GPL"; @@ -199824,12 +202705,12 @@ self: { }) {effect-interpreters = null;}; "transformers-either" = callPackage - ({ mkDerivation, base, transformers }: + ({ mkDerivation, base, text, transformers }: mkDerivation { pname = "transformers-either"; - version = "0.0.1"; - sha256 = "1hr10mfmx2ac7si8a43cyhgxzg75amqin3wyvw06bgymnvd00dqj"; - libraryHaskellDepends = [ base transformers ]; + version = "0.0.2"; + sha256 = "1122rgspazl3n9vghlzzg14hv6p0a66lf6r7hkim14p0rcagvx5a"; + libraryHaskellDepends = [ base text transformers ]; description = "An Either monad transformer"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -200210,6 +203091,8 @@ self: { pname = "tree-diff"; version = "0.0.0.1"; sha256 = "0km6himykj2q9ymaivv67dvlk7ia9dli2zhyx6g8yh8963mcn91v"; + revision = "1"; + editedCabalFile = "1vvqpxccmpw7nrrhkcmhcwv3y7cirm4wzw8r3my025x3icwkcf57"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring containers generics-sop hashable MemoTrie parsec parsers pretty @@ -200225,6 +203108,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tree-diff_0_0_1" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base + , base-compat, bytestring, containers, generics-sop, hashable + , MemoTrie, parsec, parsers, pretty, QuickCheck, scientific, tagged + , tasty, tasty-golden, tasty-quickcheck, text, time, trifecta + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "tree-diff"; + version = "0.0.1"; + sha256 = "049v44c520jy3icxlnrvbdblh3mjmvd7m6qmkzxbzkf02x63xqmz"; + revision = "1"; + editedCabalFile = "0d3kbs32q816vlrbj17lwl1bmmv7lvwi2c2i3k3agm2a8h0psx6s"; + libraryHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat bytestring + containers generics-sop hashable MemoTrie parsec parsers pretty + QuickCheck scientific tagged text time unordered-containers + uuid-types vector + ]; + testHaskellDepends = [ + ansi-terminal ansi-wl-pprint base base-compat parsec QuickCheck + tasty tasty-golden tasty-quickcheck trifecta + ]; + homepage = "https://github.com/phadej/tree-diff"; + description = "Diffing of (expression) trees"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tree-fun" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -201064,6 +203976,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tuple-ops" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "tuple-ops"; + version = "0.0.0.0"; + sha256 = "0n6jv8l2kkvibxy24rf7zlyp0m6sqy4zyllczv23fdgpq7g6hi35"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/pierric/tuple-ops"; + description = "various operations on n-ary tuples via GHC.Generics"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tuple-th" = callPackage ({ mkDerivation, base, containers, template-haskell }: mkDerivation { @@ -202033,6 +204957,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-combinators-singletons_0_2_0_0" = callPackage + ({ mkDerivation, base, singletons, type-combinators }: + mkDerivation { + pname = "type-combinators-singletons"; + version = "0.2.0.0"; + sha256 = "0mqg2c36z22zdjgmix54xfj9d218ypwjgvhvhxlhzw5x0ka506s5"; + libraryHaskellDepends = [ base singletons type-combinators ]; + homepage = "https://github.com/mstksg/type-combinators-singletons"; + description = "Interop between /type-combinators/ and /singletons/"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-digits" = callPackage ({ mkDerivation, base, template-haskell, type-spine }: mkDerivation { @@ -202277,8 +205214,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "type-level-sets"; - version = "0.8.5.0"; - sha256 = "1ahfrwrlbdh61w6vh2v5j2ammkvcjxvw53d28pgqy296mpxikwvz"; + version = "0.8.7.0"; + sha256 = "1i5yzjdfw6q868ihhqmpk4psbnqwmz8liwha7dzn1rbw4h357ky7"; libraryHaskellDepends = [ base ghc-prim ]; description = "Type-level sets and finite maps (with value-level counterparts)"; license = stdenv.lib.licenses.bsd3; @@ -202314,8 +205251,8 @@ self: { }: mkDerivation { pname = "type-map"; - version = "0.1.1.0"; - sha256 = "12c7gcwrshdcn26cagm4w30ckbq7iqwg5yrc9y272zllx54bikpd"; + version = "0.1.2.0"; + sha256 = "0cm2b4xkassjh71ndc5nddpmqyr5bcf3fqxs74wzd11dycmfqfaa"; libraryHaskellDepends = [ base containers ghc-prim vector ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -202366,6 +205303,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_3_2_1" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, criterion + , double-conversion, ghc-prim, hspec, QuickCheck, text + }: + mkDerivation { + pname = "type-of-html"; + version = "1.3.2.1"; + sha256 = "1c7yj9fh9dxkif2f116cjjgz2prdz1a3xaqni5m9gmvy2y5gvbdn"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion QuickCheck text + ]; + homepage = "https://github.com/knupfer/type-of-html"; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-operators" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -202826,8 +205784,8 @@ self: { }: mkDerivation { pname = "typesafe-precure"; - version = "0.5.0.1"; - sha256 = "1c1f6wmn8yf3crzmna4ww977cwga6wl814f0ka99s1sr65j2c5bx"; + version = "0.5.1.1"; + sha256 = "0yg75dj3bfxpqzdqw8lk7ligs39dnlya93qcg9grlbav9jpzv38n"; libraryHaskellDepends = [ aeson aeson-pretty autoexporter base bytestring dlist monad-skeleton template-haskell text th-data-compat @@ -204087,16 +207045,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "uniquely-represented-sets" = callPackage + ({ mkDerivation, base, checkers, containers, criterion, deepseq + , doctest, QuickCheck, random + }: + mkDerivation { + pname = "uniquely-represented-sets"; + version = "0.1.0.0"; + sha256 = "0qzg8fp1bqg4nl5n901wndfp36nwg7dmv88s51v1sg0hqq1mr4yz"; + libraryHaskellDepends = [ base containers deepseq ]; + testHaskellDepends = [ + base checkers containers doctest QuickCheck + ]; + benchmarkHaskellDepends = [ base criterion random ]; + homepage = "https://github.com/oisdk/uniquely-represented-sets#readme"; + license = stdenv.lib.licenses.mit; + }) {}; + "unit" = callPackage ({ mkDerivation, base, hspec }: mkDerivation { pname = "unit"; - version = "0.1.0.0"; - sha256 = "0x6wivpbrf17czbpvg727bv82zbm0abhg75p8d1vcswf786cqiq7"; + version = "0.1.0.1"; + sha256 = "1v7fv4xpb2jvcicbl6mhjkgqmap4m842dwc41fpidd9l9pb8mpaz"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/cxfreeio/unit#readme"; - description = "Aliases for ()"; + homepage = "https://github.com/amohrland/haskell-unit"; + description = "Aliases for `()`"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -204388,7 +207363,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_0_2" = callPackage + "universum_1_0_3" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , ghc-prim, hashable, microlens, microlens-mtl, mtl , safe-exceptions, semigroups, stm, text, text-format, transformers @@ -204396,8 +207371,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.0.2"; - sha256 = "09pd637vxwnqhq8464bvv0y3nmdac289rxzbzdxz3cpj8xv9nhf4"; + version = "1.0.3"; + sha256 = "0d7aca78s5qkixfn95xfbvsz23xdv47pad4fl63jg7g8dykap4n0"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text text-format transformers @@ -206033,14 +209008,15 @@ self: { "uuid-crypto" = callPackage ({ mkDerivation, base, binary, bytestring, cryptoids - , cryptoids-types, exceptions, uuid + , cryptoids-class, cryptoids-types, exceptions, uuid }: mkDerivation { pname = "uuid-crypto"; - version = "1.3.1.0"; - sha256 = "10r6phn23f3piqs4jhx764pcl6f3dbxq75pvwsnmwcszdi970a3l"; + version = "1.4.0.0"; + sha256 = "191da0bdgzbpibh7v2n2cg13gkq2vchsybad0qy9qixk0rzi1cvn"; libraryHaskellDepends = [ - base binary bytestring cryptoids cryptoids-types exceptions uuid + base binary bytestring cryptoids cryptoids-class cryptoids-types + exceptions uuid ]; description = "Reversable and secure encoding of object ids as uuids"; license = stdenv.lib.licenses.bsd3; @@ -206444,6 +209420,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_4_0_3" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "validity"; + version = "0.4.0.3"; + sha256 = "15vp8qd3fvarwd58i69if87kyc7fmf26qgrvacwnis3xwav9nyvs"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -207680,6 +210669,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vicinity" = callPackage + ({ mkDerivation, base, containers, doctest, QuickCheck + , quickcheck-classes, semigroups + }: + mkDerivation { + pname = "vicinity"; + version = "0.1.0"; + sha256 = "0yy1arybixrbkgmdnfv0y2rmkl3qf5fa2rymklqbyr00av3dr25j"; + libraryHaskellDepends = [ base semigroups ]; + testHaskellDepends = [ + base containers doctest QuickCheck quickcheck-classes + ]; + homepage = "https://github.com/andrewthad/vicinity#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "viewprof" = callPackage ({ mkDerivation, base, brick, containers, ghc-prof, lens , scientific, text, vector, vector-algorithms, vty @@ -208749,6 +211754,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-extra_3_0_22_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, fast-logger, hspec + , http-types, HUnit, iproute, lifted-base, network, old-locale + , resourcet, streaming-commons, stringsearch, text, time + , transformers, unix, unix-compat, vault, void, wai, wai-logger + , word8, zlib + }: + mkDerivation { + pname = "wai-extra"; + version = "3.0.22.0"; + sha256 = "0rwksl5jkhkgd10qi0wvhfw28g1qci60pc6chrv5bg0w0xqkv532"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + directory fast-logger http-types iproute lifted-base network + old-locale resourcet streaming-commons stringsearch text time + transformers unix unix-compat vault void wai wai-logger word8 zlib + ]; + testHaskellDepends = [ + base blaze-builder bytestring case-insensitive cookie fast-logger + hspec http-types HUnit resourcet text time transformers wai zlib + ]; + homepage = "http://github.com/yesodweb/wai"; + description = "Provides some basic WAI handlers and middleware"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-frontend-monadcgi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, cgi , containers, http-types, transformers, wai @@ -209009,6 +212046,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-logger-buffered" = callPackage + ({ mkDerivation, base, bytestring, containers, data-default + , http-types, time, wai, warp + }: + mkDerivation { + pname = "wai-logger-buffered"; + version = "0.1.0.1"; + sha256 = "0ksyh5g3wsldg739gzjvvmw9r1wrm5vq84n3shjqsl2y29r4kbls"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers data-default time wai + ]; + executableHaskellDepends = [ + base bytestring containers data-default http-types time wai warp + ]; + testHaskellDepends = [ + base bytestring containers data-default time wai + ]; + homepage = "https://github.com/ChrisCoffey/wai-logger-buffered#readme"; + description = "Buffer requets before logging them"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wai-logger-prefork" = callPackage ({ mkDerivation, base, bytestring, date-cache, fast-logger , http-types, unix, wai, wai-logger @@ -209516,6 +212577,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-rollbar_0_8_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , containers, hostname, hspec, hspec-golden-aeson, http-client + , http-conduit, http-types, lens, lens-aeson, network, QuickCheck + , text, time, unordered-containers, uuid, wai + }: + mkDerivation { + pname = "wai-middleware-rollbar"; + version = "0.8.2"; + sha256 = "08bzikcfgrni328mmxwxsr4kbsc5bjjacbxm18hs74b8n4g5f1qd"; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive hostname http-client + http-conduit http-types network text time unordered-containers uuid + wai + ]; + testHaskellDepends = [ + aeson base bytestring case-insensitive containers hspec + hspec-golden-aeson lens lens-aeson QuickCheck text + ]; + homepage = "https://github.com/joneshf/wai-middleware-rollbar#readme"; + description = "Middleware that communicates to Rollbar"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-route" = callPackage ({ mkDerivation, base, bytestring, http-types, HUnit , test-framework, test-framework-hunit, text, wai, wai-test @@ -211338,6 +214424,46 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "websockets_0_12_3_1" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary + , blaze-builder, bytestring, case-insensitive, containers + , criterion, entropy, HUnit, network, QuickCheck, random, SHA + , streaming-commons, test-framework, test-framework-hunit + , test-framework-quickcheck2, text + }: + mkDerivation { + pname = "websockets"; + version = "0.12.3.1"; + sha256 = "019jkvmbs5wvjwczqy06spd6545mly08n5pqbsaacmff4xznkz39"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers entropy network random SHA + streaming-commons text + ]; + executableHaskellDepends = [ + 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 streaming-commons test-framework test-framework-hunit + test-framework-quickcheck2 text + ]; + benchmarkHaskellDepends = [ + attoparsec base base64-bytestring binary blaze-builder bytestring + case-insensitive containers criterion entropy network random SHA + text + ]; + doCheck = false; + homepage = "http://jaspervdj.be/websockets"; + description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "websockets-rpc" = callPackage ({ mkDerivation, aeson, async, base, bytestring, containers , exceptions, hashable, monad-control, MonadRandom, mtl, QuickCheck @@ -211477,6 +214603,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "weeder_0_1_13" = callPackage + ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq + , directory, extra, filepath, foundation, hashable, process, text + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "weeder"; + version = "0.1.13"; + sha256 = "0a0zfp1g5mh393v4d1js5a0fnkj03q5kzycsyp3x4nk37dnc67fy"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring cmdargs deepseq directory extra filepath + foundation hashable process text unordered-containers vector yaml + ]; + homepage = "https://github.com/ndmitchell/weeder#readme"; + description = "Detect dead code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "weigh" = callPackage ({ mkDerivation, base, bytestring-trie, containers, deepseq, mtl , process, random, split, template-haskell, temporary @@ -212419,8 +215566,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.39"; - sha256 = "0n7575l5sy4slzf0v15g7nlrxcq1lslgzzldsxlfaibk0j71xw08"; + version = "0.3.40"; + sha256 = "1ns6dy76m5sw4rzi98ah29g21car7hlkmbfxdiawwsaq0x4bn4ph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -212896,6 +216043,46 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wrecker_1_3_1_0" = callPackage + ({ mkDerivation, aeson, ansi-terminal, ansigraph, array + , authenticate-oauth, base, base64-bytestring, blaze-builder + , bytestring, case-insensitive, clock, clock-extras, connection + , containers, cookie, cryptonite, data-default, data-default-class + , deepseq, exceptions, fast-logger, filepath, http-client + , http-client-tls, http-types, immortal, lens, markdown-unlit + , memory, mime-types, network, network-uri, next-ref + , optparse-applicative, random, statistics, stm, stm-chans + , streaming-commons, tabular, tdigest, text, threads + , threads-extras, time, tls, transformers, unix + , unordered-containers, vector, vty, wreq + }: + mkDerivation { + pname = "wrecker"; + version = "1.3.1.0"; + sha256 = "0z0a9k88npw09n54mplg2aa98y4p8kmk14v8ks2dc2ilf24lrri7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal ansigraph array authenticate-oauth base + base64-bytestring blaze-builder bytestring case-insensitive clock + clock-extras connection containers cookie cryptonite data-default + data-default-class deepseq exceptions fast-logger filepath + http-client http-client-tls http-types immortal memory mime-types + network network-uri next-ref optparse-applicative random statistics + stm stm-chans streaming-commons tabular tdigest text threads + threads-extras time tls transformers unix unordered-containers + vector vty wreq + ]; + executableHaskellDepends = [ + base http-client http-client-tls lens markdown-unlit + optparse-applicative transformers wreq + ]; + homepage = "https://github.com/lorenzo/wrecker#readme"; + description = "An HTTP Performance Benchmarker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wrecker-ui" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , directory, distributed-process, distributed-process-async @@ -212909,8 +216096,8 @@ self: { }: mkDerivation { pname = "wrecker-ui"; - version = "3.0.0.0"; - sha256 = "0plzkb9bhsrd14h07f6rd9689hxx79kdr9gs5r5qsxsk3zpn4rs6"; + version = "3.1.1.0"; + sha256 = "0lsgbjn4fcvk5qaldhlskyz3vq9g6w7an0sqbvndx7r1hvpaznrh"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -212924,6 +216111,7 @@ self: { postgresql-simple postgresql-simple-url process resource-pool resourcet scotty stm temporary text time transformers wai-cors ]; + homepage = "https://github.com/seatgeek/wrecker-ui#readme"; description = "A web interface for Wrecker, the HTTP Performance Benchmarker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -212945,6 +216133,8 @@ self: { pname = "wreq"; version = "0.5.2.0"; sha256 = "06v70dpnh7lp1sr0i0fvl2b2cx0z57dfwi8i2fxva0gcdwan0fki"; + revision = "1"; + editedCabalFile = "01x430yrqiv02pq7h55h3y70hvz7n62882vnw1m53qqxp667i580"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -213019,6 +216209,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wreq-stringless_0_5_9_1" = callPackage + ({ mkDerivation, base, bytestring, text, utf8-string, wreq }: + mkDerivation { + pname = "wreq-stringless"; + version = "0.5.9.1"; + sha256 = "0dgjjybbc4nza1a0af2j8jxscyhlcwdspmvy8zsmcczzcdhx2b2h"; + libraryHaskellDepends = [ base bytestring text utf8-string wreq ]; + homepage = "https://github.com/j-keck/wreq-stringless#readme"; + description = "Simple wrapper to use wreq without Strings"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wright" = callPackage ({ mkDerivation, assertions, base, bed-and-breakfast, containers , filepath, lens @@ -214433,6 +217636,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit_1_7_1_2" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , data-default-class, deepseq, hspec, HUnit, monad-control + , resourcet, text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.7.1.2"; + sha256 = "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + conduit conduit-extra containers data-default-class deepseq + monad-control resourcet text transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers hspec HUnit + resourcet text transformers xml-types + ]; + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -215901,6 +219129,83 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yam-app" = callPackage + ({ mkDerivation, aeson, base, conduit, containers, ctrie + , data-default, directory, exceptions, fast-logger, monad-control + , monad-logger, mtl, persistent, persistent-sqlite, random + , resource-pool, resourcet, string-conversions, text, time + , transformers, unordered-containers, wai-logger, yaml + }: + mkDerivation { + pname = "yam-app"; + version = "0.1.11"; + sha256 = "0qbc7s5l030yilq8zlq5hszk6hgqjxp6yablap1ykm2211wipbq3"; + libraryHaskellDepends = [ + aeson base conduit containers ctrie data-default directory + exceptions fast-logger monad-control monad-logger mtl persistent + persistent-sqlite random resource-pool resourcet string-conversions + text time transformers unordered-containers wai-logger yaml + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme"; + description = "Yam App"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "yam-job" = callPackage + ({ mkDerivation, base, cron, yam-app }: + mkDerivation { + pname = "yam-job"; + version = "0.1.11"; + sha256 = "0hs46q1xwwx44f4zxhs4245cdnr9g4r2a67cm191n1wd86sfhrpc"; + libraryHaskellDepends = [ base cron yam-app ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-job#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "yam-servant" = callPackage + ({ mkDerivation, aeson, base, http-types, lens, servant + , servant-server, servant-swagger, servant-swagger-ui, swagger2 + , text, wai, wai-extra, warp, yam-app, yam-job + }: + mkDerivation { + pname = "yam-servant"; + version = "0.1.11"; + sha256 = "0z1my2jgcbvdx4v5zh66yw99vnck5rbi54s6adbp26v4szc8j40s"; + libraryHaskellDepends = [ + aeson base http-types lens servant servant-server servant-swagger + servant-swagger-ui swagger2 text wai wai-extra warp yam-app yam-job + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-app#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "yam-transaction-odbc" = callPackage + ({ mkDerivation, base, containers, persistent-odbc, yam-app }: + mkDerivation { + pname = "yam-transaction-odbc"; + version = "0.1.10"; + sha256 = "18nzdzzpykdp42sdsailhinxlrpwcrfys2n967ky9yizj7n8dcrx"; + libraryHaskellDepends = [ + base containers persistent-odbc yam-app + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-odbc#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "yam-transaction-postgresql" = callPackage + ({ mkDerivation, base, containers, persistent-postgresql, yam-app + }: + mkDerivation { + pname = "yam-transaction-postgresql"; + version = "0.1.11"; + sha256 = "1li9vmnnj9xw1j60gmjym9rxlljjic9w7bkxip22yhb6qnmidpc9"; + libraryHaskellDepends = [ + base containers persistent-postgresql yam-app + ]; + homepage = "https://github.com/leptonyu/yam/tree/master/yam-transaction-postgresql#readme"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "yamemo" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -215943,6 +219248,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) libyaml;}; + "yaml_0_8_28" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , conduit, containers, directory, filepath, hspec, HUnit, libyaml + , mockery, resourcet, scientific, semigroups, template-haskell + , temporary, text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "yaml"; + version = "0.8.28"; + sha256 = "0swgkzkfrwj0ac7lssn8rnrdfmh3lcsdn5fbq2iwv55di6jbc0pp"; + revision = "1"; + editedCabalFile = "0f8vb5v0xfpsc02zqh9pzgv4fir93sgijk342lz5k872gscfjn62"; + configureFlags = [ "-fsystem-libyaml" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring conduit containers directory + filepath resourcet scientific semigroups template-haskell text + transformers unordered-containers vector + ]; + libraryPkgconfigDepends = [ libyaml ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ + aeson base base-compat bytestring conduit directory hspec HUnit + mockery resourcet temporary text transformers unordered-containers + vector + ]; + homepage = "http://github.com/snoyberg/yaml/"; + description = "Support for parsing and rendering YAML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) libyaml;}; + "yaml-combinators" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, generics-sop , scientific, tasty, tasty-hunit, text, transformers @@ -219664,8 +223002,8 @@ self: { }: mkDerivation { pname = "zifter"; - version = "0.0.1.5"; - sha256 = "06bnj0zxxmspzw5rpc53hxksdd1h9nd6viwrvfmgj1fam1fhh856"; + version = "0.0.1.6"; + sha256 = "0bswk4z26v020qkcm09cjkjkvwxsx1mrzrf3kajhwwzpb8vzxbdh"; libraryHaskellDepends = [ ansi-terminal async base directory exceptions filepath optparse-applicative path path-io process safe stm validity @@ -219762,16 +223100,20 @@ self: { }) {}; "zifter-stack" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, path, path-io - , process, safe, zifter + ({ mkDerivation, base, Cabal, directory, filepath, hspec, path + , path-io, process, safe, stm, zifter }: mkDerivation { pname = "zifter-stack"; - version = "0.0.0.8"; - sha256 = "03grslbsd7x1gj6fw80vsmj2cyfvrfmlqqzcrx3j2rk0icax0nla"; + version = "0.0.0.10"; + sha256 = "1qsxim5rmj2s4k615390iqy4691ilrx5h75fd38ds599kvxgvwni"; libraryHaskellDepends = [ base Cabal directory filepath path path-io process safe zifter ]; + testHaskellDepends = [ + base Cabal directory filepath hspec path path-io process safe stm + zifter + ]; homepage = "http://cs-syd.eu"; description = "zifter-stack"; license = stdenv.lib.licenses.mit; @@ -219871,6 +223213,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zip;}; + "zip-archive_0_3_2" = callPackage + ({ mkDerivation, array, base, binary, bytestring, containers + , digest, directory, filepath, HUnit, mtl, old-time, pretty + , process, temporary, text, time, unix, zip, zlib + }: + mkDerivation { + pname = "zip-archive"; + version = "0.3.2"; + sha256 = "1k413av98vchpsqd3930w4sznih4jip98vbgyif86nbpji7mp44f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base binary bytestring containers digest directory filepath + mtl old-time pretty text time unix zlib + ]; + executableHaskellDepends = [ base bytestring directory ]; + testHaskellDepends = [ + base bytestring directory HUnit old-time process temporary time + unix + ]; + testToolDepends = [ zip ]; + homepage = "http://github.com/jgm/zip-archive"; + description = "Library for creating and modifying zip archives"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) zip;}; + "zip-conduit" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl @@ -219987,6 +223356,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "zippers_0_2_5" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, criterion, doctest + , lens, profunctors, semigroupoids, semigroups + }: + mkDerivation { + pname = "zippers"; + version = "0.2.5"; + sha256 = "11f0jx0dbm2y9y5hnpakdvk9fmsm3awr2lcxp46dyma6arr7f4id"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base lens profunctors semigroupoids semigroups + ]; + testHaskellDepends = [ base doctest ]; + benchmarkHaskellDepends = [ base criterion lens ]; + homepage = "http://github.com/ekmett/zippers/"; + description = "Traversal based zippers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "zippo" = callPackage ({ mkDerivation, base, mtl, yall }: mkDerivation { From a1366f43a0a8140791171fbe52dd351ae2d4da34 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 14 Jan 2018 16:10:39 +0100 Subject: [PATCH 28/54] git-annex: update hash for new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index f1d0b302b92..28f6b4fe803 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -80,7 +80,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1fd7lyrwr60dp55swc5iwl0mkkzmdzpmj9qmx1qca2r7y9wc5w5k"; + sha256 = "0vvh1k7i6y4bqy6fn8z5i6ndqv6x94hvk2zh5gw99na8kfri7sxq"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From 899714ae964c3e446c2de081bf007ef238c9f3d6 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Thu, 18 Jan 2018 07:03:50 -0500 Subject: [PATCH 29/54] hoogle: fix http-conduit dependency for new version 5.0.17 now requires http-conduit > 2.3. --- pkgs/development/haskell-modules/configuration-common.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 28f6b4fe803..66d0c89344d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -845,8 +845,11 @@ self: super: { # https://github.com/fpco/stackage/issues/3126 stack = doJailbreak super.stack; - # Hoogle needs a newer version than lts-10 provides. - hoogle = super.hoogle.override { haskell-src-exts = self.haskell-src-exts_1_20_1; }; + # Hoogle needs newer versions than lts-10 provides. + hoogle = super.hoogle.override { + haskell-src-exts = self.haskell-src-exts_1_20_1; + http-conduit = self.http-conduit_2_3_0; + }; # These packages depend on each other, forming an infinite loop. scalendar = markBroken (super.scalendar.override { SCalendar = null; }); From 8d027c1113efbe701ae10345dadf5cdcfc07a8db Mon Sep 17 00:00:00 2001 From: Kosyrev Serge Date: Wed, 17 Jan 2018 04:57:27 +0300 Subject: [PATCH 30/54] ghc841: GHC 8.4.1: nix-shell -p haskell.compiler.ghc841 --- pkgs/development/compilers/ghc/8.4.1.nix | 129 ++++++++++++++++++ .../configuration-ghc-8.4.x.nix | 44 ++++++ pkgs/top-level/haskell-packages.nix | 10 ++ 3 files changed, 183 insertions(+) create mode 100644 pkgs/development/compilers/ghc/8.4.1.nix create mode 100644 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix diff --git a/pkgs/development/compilers/ghc/8.4.1.nix b/pkgs/development/compilers/ghc/8.4.1.nix new file mode 100644 index 00000000000..b5db328a8a2 --- /dev/null +++ b/pkgs/development/compilers/ghc/8.4.1.nix @@ -0,0 +1,129 @@ +{ stdenv, targetPackages +, buildPlatform, hostPlatform, targetPlatform +, selfPkgs, cross ? null + +# build-tools +, bootPkgs, alex, happy +, autoconf, automake, coreutils, fetchgit, perl, python3 + +, libiconv ? null, ncurses + +, # If enabled, GHC will be built with the GPL-free but slower integer-simple + # library instead of the faster but GPLed integer-gmp library. + enableIntegerSimple ? false, gmp ? null + +, version ? "8.4.20180115" +}: + +assert !enableIntegerSimple -> gmp != null; + +let + inherit (bootPkgs) ghc; + + rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc"; + + # TODO(@Ericson2314) Make unconditional + targetPrefix = stdenv.lib.optionalString + (targetPlatform != hostPlatform) + "${targetPlatform.config}-"; +in +stdenv.mkDerivation (rec { + inherit version rev; + name = "${targetPrefix}ghc-${version}"; + + src = fetchgit { + url = "git://git.haskell.org/ghc.git"; + inherit rev; + sha256 = "06slymbsd7vsfp4hh40v7cxf7nmp0kvlni2wfq7ag5wlqh04slgs"; + }; + + postPatch = "patchShebangs ."; + + preConfigure = '' + echo ${version} >VERSION + echo ${rev} >GIT_COMMIT_ID + ./boot + sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure + '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export NIX_LDFLAGS+=" -no_dtrace_dof" + '' + stdenv.lib.optionalString enableIntegerSimple '' + echo "INTEGER_LIBRARY=integer-simple" > mk/build.mk + '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + sed 's|#BuildFlavour = quick-cross|BuildFlavour = perf-cross|' mk/build.mk.sample > mk/build.mk + ''; + + buildInputs = [ ghc perl autoconf automake happy alex python3 ]; + + enableParallelBuilding = true; + + configureFlags = [ + "CC=${stdenv.cc}/bin/cc" + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" + "--datadir=$doc/share/doc/ghc" + ] ++ stdenv.lib.optional (! enableIntegerSimple) [ + "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib" + ] ++ stdenv.lib.optional stdenv.isDarwin [ + "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + ]; + + # required, because otherwise all symbols from HSffi.o are stripped, and + # that in turn causes GHCi to abort + stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + + checkTarget = "test"; + + postInstall = '' + paxmark m $out/lib/${name}/bin/${if targetPlatform != hostPlatform then "ghc" else "{ghc,haddock}"} + + # Install the bash completion file. + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc + + # Patch scripts to include "readelf" and "cat" in $PATH. + for i in "$out/bin/"*; do + test ! -h $i || continue + egrep --quiet '^#!' <(head -n 1 $i) || continue + sed -i -e '2i export PATH="$PATH:${stdenv.lib.makeBinPath [ targetPackages.stdenv.cc.bintools coreutils ]}"' $i + done + ''; + + outputs = [ "out" "doc" ]; + + passthru = { + inherit bootPkgs targetPrefix; + } // stdenv.lib.optionalAttrs (targetPlatform != buildPlatform) { + crossCompiler = selfPkgs.ghc.override { + cross = targetPlatform; + bootPkgs = selfPkgs; + }; + }; + + meta = { + homepage = http://haskell.org/ghc; + description = "The Glasgow Haskell Compiler"; + maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + inherit (ghc.meta) license platforms; + }; + +} // stdenv.lib.optionalAttrs (cross != null) { + configureFlags = [ + "CC=${stdenv.cc}/bin/${cross.config}-cc" + "LD=${stdenv.cc.bintools}/bin/${cross.config}-ld" + "AR=${stdenv.cc.bintools}/bin/${cross.config}-ar" + "NM=${stdenv.cc.bintools}/bin/${cross.config}-nm" + "RANLIB=${stdenv.cc.bintools}/bin/${cross.config}-ranlib" + "--target=${cross.config}" + "--enable-bootstrap-with-devel-snapshot" + ] ++ + # fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ + stdenv.lib.optional (cross.config or null == "aarch64-apple-darwin14") "--disable-large-address-space"; + + configurePlatforms = []; + + passthru = { + inherit bootPkgs cross; + cc = "${stdenv.cc}/bin/${cross.config}-cc"; + ld = "${stdenv.cc}/bin/${cross.config}-ld"; + }; +}) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix new file mode 100644 index 00000000000..03e42463fee --- /dev/null +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -0,0 +1,44 @@ +{ pkgs, haskellLib }: + +with haskellLib; + +self: super: { + + # Use the latest LLVM. + inherit (pkgs) llvmPackages; + + # Disable GHC 8.4.x core libraries. + # + # Verify against: + # ls /nix/store/wnh3kxra586h9wvxrn62g4lmsri2akds-ghc-8.4.20180115/lib/ghc-8.4.20180115/ -1 | sort | grep -e '-' | grep -Ev '(txt|h|targets)$' + array = null; + base = null; + binary = null; + bytestring = null; + Cabal = null; + containers = null; + deepseq = null; + directory = null; + filepath = null; + bin-package-db = null; + ghc-boot = null; + ghc-boot-th = null; + ghc-compact = null; + ghci = null; + ghc-prim = null; + haskeline = null; + hpc = null; + integer-gmp = null; + mtl = null; + parsec = null; + pretty = null; + process = null; + stm = null; + template-haskell = null; + terminfo = null; + text = null; + time = null; + transformers = null; + unix = null; + xhtml = null; +} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cba1f9a54a2..0ecb5209779 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -78,6 +78,12 @@ in rec { sphinx = pkgs.python3Packages.sphinx; selfPkgs = packages.ghc822; }; + ghc841 = callPackage ../development/compilers/ghc/8.4.1.nix rec { + bootPkgs = packages.ghc821Binary; + inherit (bootPkgs) alex happy; + inherit buildPlatform targetPlatform; + selfPkgs = packages.ghc841; + }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec { bootPkgs = packages.ghc821Binary; inherit (bootPkgs) alex happy; @@ -136,6 +142,10 @@ in rec { ghc = compiler.ghc821Binary; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.2.x.nix { }; }; + ghc841 = callPackage ../development/haskell-modules { + ghc = compiler.ghc841; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.4.x.nix { }; + }; ghcHEAD = callPackage ../development/haskell-modules { ghc = compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; From cf199ff56cb76920b32469bf4e66db6583bdb030 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 19 Jan 2018 14:18:30 +0100 Subject: [PATCH 31/54] linuxPackages.openafs: 1.6.21.1 -> 1.6.22.1 (fixes build with kernel >=4.14) --- pkgs/servers/openafs-client/default.nix | 26 +++---------------------- 1 file changed, 3 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 661888c5c5c..232fb135bd8 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -3,39 +3,19 @@ stdenv.mkDerivation rec { name = "openafs-${version}-${kernel.version}"; - version = "1.6.21.1"; + version = "1.6.22.1"; src = fetchurl { url = "http://www.openafs.org/dl/openafs/${version}/openafs-${version}-src.tar.bz2"; - sha256 = "0nisxnfl8nllcfmi7mxj1gngkpxd4jp1wapbkhz07qwqynq9dn5f"; + sha256 = "19nfbksw7b34jc3mxjk7cbz26zg9k5myhzpv2jf0fnmznr47jqaw"; }; - nativeBuildInputs = [ autoconf automake flex yacc perl which ]; + nativeBuildInputs = [ autoconf automake flex yacc perl which ] ++ kernel.moduleBuildDependencies; buildInputs = [ ncurses ]; hardeningDisable = [ "pic" ]; - patches = [ - (fetchpatch { - name = "fix-stdint-include.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=c193e5cba18273a062d4162118c7055b54f7eb5e"; - sha256 = "1yc4gygcazwsslf6mzk1ai92as5jbsjv7212jcbb2dw83jydhc09"; - }) - # linux 4.14 - (fetchpatch { - name = "test-for-__vfs_write-rather-than-__vfs_read.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=929e77a886fc9853ee292ba1aa52a920c454e94b"; - sha256 = "0g4jxqzvyrjy2q7mhxc5ikhypj3ljw1wri4lipzm66crsvycp9x5"; - }) - # linux 4.14 - (fetchpatch { - name = "use-kernel_read-kernel_write-when-__vfs-variants-are-unavailable.patch"; - url = "http://git.openafs.org/?p=openafs.git;a=patch;h=5ee516b3789d3545f3d78fb3aba2480308359945"; - sha256 = "1vx55qb120y857mn1l00i58fj9cckschp86ch3g6hqrdc5q5bxv2"; - }) - ]; - preConfigure = '' ln -s "${kernel.dev}/lib/modules/"*/build $TMP/linux From 5640b08a883b8b8740b5ec59052c14d32218fb11 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 19 Jan 2018 14:24:08 +0100 Subject: [PATCH 32/54] linuxPackages.phc-intel: fix build with linux-4.14 --- pkgs/os-specific/linux/phc-intel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix index a766c2bb3b4..81db8a9f26d 100644 --- a/pkgs/os-specific/linux/phc-intel/default.nix +++ b/pkgs/os-specific/linux/phc-intel/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { name = "phc-intel-pack-${revbump}.tar.bz2"; }; - buildInputs = [ which ]; + nativeBuildInputs = [ which ] ++ kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From 2bd9f81abd43caaa28c01d9e565ae59cc784ddfa Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 19 Jan 2018 14:30:10 +0100 Subject: [PATCH 33/54] linuxPackages.v4l2loopback: fix compilation with linux-4.14 --- pkgs/os-specific/linux/v4l2loopback/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 57f4b9ab674..920c8c0bdee 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { export PATH=${kmod}/sbin:$PATH ''; + nativeBuildInputs = kernel.moduleBuildDependencies; buildInputs = [ kmod ]; makeFlags = [ From a4d3c86e05cb26f7c5799025f4247471533239c2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 19 Jan 2018 14:34:26 +0100 Subject: [PATCH 34/54] linuxPackages.vhba: use kernel.moduleBuildDependencies instead of hardcoding libelf --- pkgs/misc/emulators/cdemu/vhba.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix index 1dd34fa23c3..081846f78e3 100644 --- a/pkgs/misc/emulators/cdemu/vhba.nix +++ b/pkgs/misc/emulators/cdemu/vhba.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=$(out)" ]; - buildInputs = [ libelf ]; + nativeBuildInputs = kernel.moduleBuildDependencies; hardeningDisable = [ "pic" ]; From 3d5391c2561fc1d848fc4edd267c6a890457fbb5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Jan 2018 15:51:10 +0100 Subject: [PATCH 35/54] fetchFromGitHub: Revert to the original version fetchFromGitHub was intended as a simple wrapper around the common pattern 'fetchzip { url = https://github.com/${owner}/${repo}/archive/${rev}.zip"; ... }'. It was not intended to handle private repositories, submodules, other sites than github.com (!), etc. In particular, we don't want to use fetchgit because it's not reproducible. --- pkgs/top-level/all-packages.nix | 37 +++++---------------------------- 1 file changed, 5 insertions(+), 32 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a36547af80d..788d40747fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -203,38 +203,11 @@ with pkgs; fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; - fetchFromGitHub = { - owner, repo, rev, name ? "source", - fetchSubmodules ? false, private ? false, - githubBase ? "github.com", varPrefix ? null, - ... # For hash agility - }@args: assert private -> !fetchSubmodules; - let - baseUrl = "https://${githubBase}/${owner}/${repo}"; - passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; - varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; - # We prefer fetchzip in cases we don't need submodules as the hash - # is more stable in that case. - fetcher = if fetchSubmodules then fetchgit else fetchzip; - privateAttrs = lib.optionalAttrs private { - netrcPhase = '' - if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then - echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 - exit 1 - fi - cat > netrc < Date: Fri, 19 Jan 2018 23:05:41 +0800 Subject: [PATCH 36/54] supertuxkart: 0.9.2 -> 0.9.3 --- pkgs/games/super-tux-kart/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index e05f5a92a33..df5d7e7b4fa 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -8,33 +8,39 @@ let in stdenv.mkDerivation rec { name = "supertuxkart-${version}"; - version = "0.9.2"; + version = "0.9.3"; + srcs = [ (fetchFromGitHub { owner = "supertuxkart"; repo = "stk-code"; rev = version; - sha256 = "1zsc5nw8il8xwppk624jampfk6qhqzjnni8zicrhqix0xg07nxca"; + sha256 = "1smnanjjaj4yq2ywikv0l6xysh6n2h1cm549plbg5xdk9mx2sfia"; name = dir; }) (fetchsvn { url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "16503"; # 0.9.2 crashes with 16937. Refer to stk-code/doc/assets_version - sha256 = "0j1dy27gxm4hx26xddr2ak6vw0lim0nqmjnszfb4c61y92j12cqp"; + rev = "17448"; + sha256 = "0lxbb4k57gv4gj12l5hnvhwdycpzcxjwg7qdfwglj2bdvaxf9f21"; name = "stk-assets"; }) ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ cmake gettext libtool pkgconfig ]; + buildInputs = [ - cmake libtool libX11 libXrandr - openal freealut mesa libvorbis libogg gettext zlib freetype + openal freealut mesa libvorbis libogg zlib freetype curl fribidi bluez libjpeg libpng ]; enableParallelBuilding = true; + cmakeFlags = [ + "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs + "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 + ]; + sourceRoot = dir; meta = with stdenv.lib; { From 26734df1c69dc9e6a7efbf569e0d0ab8676fe41f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 19 Jan 2018 16:12:18 +0100 Subject: [PATCH 37/54] mapsplotlib: init at 1.0.6 --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7fa9e3f2dd..cd009bf1e6e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10065,6 +10065,24 @@ in { }; }; + mapsplotlib = buildPythonPackage rec { + name = "mapsplotlib-${version}"; + version = "1.0.6"; + + src = pkgs.fetchurl { + url = "mirror://pypi/m/mapsplotlib/${name}.tar.gz"; + sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp"; + }; + + propagatedBuildInputs = with self; [ matplotlib scipy pandas requests pillow ]; + + meta = { + description = "Custom Python plots on a Google Maps background"; + homepage = https://github.com/tcassou/mapsplotlib; + maintainers = [ maintainers.rob ]; + }; + }; + markdown = callPackage ../development/python-modules/markdown { }; markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; From ca016b63dce6a2605aa77d0ad6062289dae27e75 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Fri, 19 Jan 2018 16:20:53 +0100 Subject: [PATCH 38/54] mapsplotlib: disable for python3 --- 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 cd009bf1e6e..aa27d154255 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10069,6 +10069,8 @@ in { name = "mapsplotlib-${version}"; version = "1.0.6"; + disabled = isPy3k; + src = pkgs.fetchurl { url = "mirror://pypi/m/mapsplotlib/${name}.tar.gz"; sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp"; From dda4457eb1dc55a50fb21fb084a1ff1d28e205f8 Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Fri, 19 Jan 2018 17:13:23 +0100 Subject: [PATCH 39/54] pngquant: change platforms from linux to unix --- pkgs/tools/graphics/pngquant/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 93f57f95e3e..992e66965f8 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://pngquant.org/; description = "A tool to convert 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.gpl3; maintainers = [ maintainers.volth ]; }; From 3d2948e00968feceb35688be268402709fc466ea Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 19 Jan 2018 11:26:59 -0500 Subject: [PATCH 40/54] docker: Fix build after containerd update --- pkgs/applications/virtualization/docker/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c4c0adbb9bf..e5f5adff1d1 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -39,13 +39,6 @@ rec { hardeningDisable = [ "fortify" ]; buildInputs = [ removeReferencesTo go btrfs-progs ]; - - # This should go into the containerd derivation once 1.0.0 is out - preBuild = '' - export GOPATH=$(pwd)/vendor - mkdir $(pwd)/vendor/src - mv $(pwd)/vendor/{github.com,golang.org,google.golang.org} $(pwd)/vendor/src/ - '' + oldAttrs.preBuild; }); docker-tini = tini.overrideAttrs (oldAttrs: rec { From 87b2e17463ea05554d3317c43c821a9b116ace9a Mon Sep 17 00:00:00 2001 From: Maxim Dzabraev Date: Fri, 19 Jan 2018 19:19:52 +0300 Subject: [PATCH 41/54] jinja2_pluralize: init at 0.3.0 --- .../jinja2_pluralize/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/jinja2_pluralize/default.nix diff --git a/pkgs/development/python-modules/jinja2_pluralize/default.nix b/pkgs/development/python-modules/jinja2_pluralize/default.nix new file mode 100644 index 00000000000..5f80f4e4b20 --- /dev/null +++ b/pkgs/development/python-modules/jinja2_pluralize/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, jinja2, inflect }: + +buildPythonPackage rec { + pname = "jinja2_pluralize"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "071wnzzz20wjb0iw7grxgj1lb2f0kz50qyfbcq54rddr2x82sp6z"; + }; + + propagatedBuildInputs = [ + jinja2 + inflect + ]; + + meta = with stdenv.lib; { + description = "Jinja2 pluralize filters"; + homepage = https://github.com/audreyr/jinja2_pluralize; + license = licenses.bsd3; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index aa27d154255..1f9ab709afb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9471,6 +9471,8 @@ in { }; }; + jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + jmespath = buildPythonPackage rec { name = "jmespath-0.9.0"; From a451f97d2faa4a13564e57ebcb8f4fab0285e1e5 Mon Sep 17 00:00:00 2001 From: Maxim Dzabraev Date: Fri, 19 Jan 2018 19:22:37 +0300 Subject: [PATCH 42/54] pydocstyle: init at 0.3.2 --- .../python-modules/pydocstyle/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pydocstyle/default.nix diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix new file mode 100644 index 00000000000..fd1f0db0c1e --- /dev/null +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, snowballstemmer, configparser, + pytest, pytestpep8, mock, pathlib }: + +buildPythonPackage rec { + pname = "pydocstyle"; + version = "2.1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "15ssv8l6cvrmzgwcdzw76rnl4np3qf0dbwr1wsx76y0hc7lwsnsd"; + }; + + propagatedBuildInputs = [ snowballstemmer configparser ]; + + checkInputs = [ pytest pytestpep8 mock pathlib ]; + + meta = with stdenv.lib; { + description = "Python docstring style checker"; + homepage = https://github.com/PyCQA/pydocstyle/; + license = licenses.mit; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f9ab709afb..139ee6eec25 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -281,6 +281,8 @@ in { pydbus = callPackage ../development/python-modules/pydbus { }; + pydocstyle = callPackage ../development/python-modules/pydocstyle { }; + pyexiv2 = disabledIf isPy3k (callPackage ../development/python-modules/pyexiv2 {}); py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; From 16cc4ff070a95696f8fa9de6dc95a4bae98b22f0 Mon Sep 17 00:00:00 2001 From: Maxim Dzabraev Date: Fri, 19 Jan 2018 19:23:50 +0300 Subject: [PATCH 43/54] diff_cover: init at 1.0.2 --- .../python-modules/diff_cover/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/diff_cover/default.nix diff --git a/pkgs/development/python-modules/diff_cover/default.nix b/pkgs/development/python-modules/diff_cover/default.nix new file mode 100644 index 00000000000..b8286e7d6b1 --- /dev/null +++ b/pkgs/development/python-modules/diff_cover/default.nix @@ -0,0 +1,36 @@ +{ stdenv, buildPythonPackage, fetchPypi, jinja2, jinja2_pluralize, pygments, + six, inflect, mock, nose, coverage, pycodestyle, flake8, pyflakes, git, + pylint, pydocstyle, fetchpatch }: + +buildPythonPackage rec { + pname = "diff_cover"; + version = "1.0.2"; + + preCheck = '' + export LC_ALL=en_US.UTF-8; + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "1wbp0kfv2mjxwnq2jlqmwvb71fywwc4x4azxi7ll5dll6nhjyd61"; + }; + + patches = [ + (fetchpatch { + name = "tests-fix.patch"; + url = "https://github.com/Bachmann1234/diff-cover/commit/85c30959c8ed2aa3848f400095a2418f15bb7777.patch"; + sha256 = "0xni4syrxww9kdv8495f416vqgfdys4w2hgf5rdi35hy3ybfslh0"; + }) + ]; + + propagatedBuildInputs = [ jinja2 jinja2_pluralize pygments six inflect ]; + + checkInputs = [ mock nose coverage pycodestyle flake8 pyflakes pylint pydocstyle git ]; + + meta = with stdenv.lib; { + description = "Automatically find diff lines that need test coverage"; + homepage = https://github.com/Bachmann1234/diff-cover; + license = licenses.asl20; + maintainers = with maintainers; [ dzabraev ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 139ee6eec25..125d89fe800 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -205,6 +205,8 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; + diff_cover = callPackage ../development/python-modules/diff_cover { }; + emcee = callPackage ../development/python-modules/emcee { }; email_validator = callPackage ../development/python-modules/email-validator { }; From 77225a5a952f2c9dedbc3b9d2529120c6549819a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Jan 2018 18:32:10 +0100 Subject: [PATCH 44/54] Revert "fetchFromGitHub: Revert to the original version" This reverts commit 3d5391c2561fc1d848fc4edd267c6a890457fbb5. --- pkgs/top-level/all-packages.nix | 37 ++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788d40747fd..a36547af80d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -203,11 +203,38 @@ with pkgs; fetchCrate = callPackage ../build-support/rust/fetchcrate.nix { }; - fetchFromGitHub = { owner, repo, rev, sha256 }: fetchzip { - name = "source"; - url = "https://github.com/${owner}/${repo}/archive/${rev}.zip"; - inherit sha256; - }; + fetchFromGitHub = { + owner, repo, rev, name ? "source", + fetchSubmodules ? false, private ? false, + githubBase ? "github.com", varPrefix ? null, + ... # For hash agility + }@args: assert private -> !fetchSubmodules; + let + baseUrl = "https://${githubBase}/${owner}/${repo}"; + passthruAttrs = removeAttrs args [ "owner" "repo" "rev" "fetchSubmodules" "private" "githubBase" "varPrefix" ]; + varBase = "NIX${if varPrefix == null then "" else "_${varPrefix}"}_GITHUB_PRIVATE_"; + # We prefer fetchzip in cases we don't need submodules as the hash + # is more stable in that case. + fetcher = if fetchSubmodules then fetchgit else fetchzip; + privateAttrs = lib.optionalAttrs private { + netrcPhase = '' + if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then + echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + exit 1 + fi + cat > netrc < Date: Fri, 19 Jan 2018 18:39:53 +0100 Subject: [PATCH 45/54] CODEOWNERS cleanup I haven't worked on stdenv etc. in a long time. --- .github/CODEOWNERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2405f7d4efa..d0d757e8ccb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -12,17 +12,17 @@ # Libraries /lib @edolstra @nbp -/lib/systems @edolstra @nbp @ericson2314 +/lib/systems @nbp @ericson2314 # Nixpkgs Internals /default.nix @nbp /pkgs/top-level/default.nix @nbp @Ericson2314 /pkgs/top-level/impure.nix @nbp @Ericson2314 /pkgs/top-level/stage.nix @nbp @Ericson2314 -/pkgs/stdenv @edolstra -/pkgs/build-support/cc-wrapper @edolstra @Ericson2314 -/pkgs/build-support/bintools-wrapper @edolstra @Ericson2314 -/pkgs/build-support/setup-hooks @edolstra @Ericson2314 +/pkgs/stdenv +/pkgs/build-support/cc-wrapper @Ericson2314 +/pkgs/build-support/bintools-wrapper @Ericson2314 +/pkgs/build-support/setup-hooks @Ericson2314 # NixOS Internals /nixos/default.nix @nbp From 8ebb907d706cf5124079437681a925916eb17d5a Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 15 Oct 2017 22:34:20 -0400 Subject: [PATCH 46/54] perl: Add support for cross-compilation via perl-cross --- .../development/interpreters/perl/default.nix | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 62c63ef6c5c..14a4bac47f6 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurlBoot, enableThreading ? stdenv ? glibc }: +{ lib, stdenv, fetchurlBoot, buildPackages, enableThreading ? stdenv ? glibc }: with lib; @@ -19,7 +19,8 @@ let libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; libcInc = lib.getDev libc; libcLib = lib.getLib libc; - common = { version, sha256 }: stdenv.mkDerivation rec { + crossCompiling = stdenv.buildPlatform != stdenv.hostPlatform; + common = { version, sha256 }: stdenv.mkDerivation (rec { name = "perl-${version}"; src = fetchurlBoot { @@ -50,6 +51,8 @@ let pwd="$(type -P pwd)" substituteInPlace dist/PathTools/Cwd.pm \ --replace "/bin/pwd" "$pwd" + '' + stdenv.lib.optionalString crossCompiling '' + substituteInPlace cnf/configure_tool.sh --replace "cc -E -P" "cc -E" ''; # Build a thread-safe Perl with a dynamic libperls.o. We need the @@ -58,8 +61,10 @@ let # contains the string "perl", Configure would select $out/lib. # Miniperl needs -lm. perl needs -lrt. configureFlags = - [ "-de" - "-Dcc=cc" + (if crossCompiling + then [ "-Dlibpth=\"\"" "-Dglibpth=\"\"" ] + else [ "-de" "-Dcc=cc" ]) + ++ [ "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" "-Duseshrplib" @@ -69,14 +74,13 @@ let ++ optional stdenv.isSunOS "-Dcc=gcc" ++ optional enableThreading "-Dusethreads"; - configureScript = "${stdenv.shell} ./Configure"; + configureScript = stdenv.lib.optionalString (!crossCompiling) "${stdenv.shell} ./Configure"; - dontAddPrefix = true; + dontAddPrefix = !crossCompiling; - enableParallelBuilding = true; + enableParallelBuilding = !crossCompiling; - preConfigure = - '' + preConfigure = optionalString (!crossCompiling) '' configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" '' + optionalString (stdenv.isArm || stdenv.isMips) '' configureFlagsArray=(-Dldflags="-lm -lrt") @@ -121,7 +125,23 @@ let maintainers = [ maintainers.eelco ]; platforms = platforms.all; }; - }; + } // stdenv.lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { + crossVersion = "1.1.8"; + + perl-cross-src = fetchurlBoot { + url = "https://github.com/arsv/perl-cross/releases/download/${crossVersion}/perl-cross-${crossVersion}.tar.gz"; + sha256 = "072j491rpz2qx2sngbg4flqh4lx5865zyql7b9lqm6s1kknjdrh8"; + }; + + nativeBuildInputs = [ buildPackages.stdenv.cc ]; + + postUnpack = '' + unpackFile ${perl-cross-src} + cp -R perl-cross-${crossVersion}/* perl-${version}/ + ''; + + configurePlatforms = [ "build" "host" "target" ]; + }); in rec { perl = perl524; From 7314b1949aae9dc0ebf6105b2329bf1bb3161d51 Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Fri, 19 Jan 2018 20:18:03 +0000 Subject: [PATCH 47/54] i2pd: 2.15.0 -> 2.17.0 --- pkgs/tools/networking/i2pd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 66057e5c76e..f736ca089bf 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch, boost165, zlib, openssl }: stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.15.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02nyk76q2ag0495ph62i0jij27nxpy6qvryjp25wah8f69k7bgfs"; + sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; }; - buildInputs = [ boost zlib openssl ]; + buildInputs = [ boost165 zlib openssl ]; makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; installPhase = '' From 7ae8d2b5672a4378f252055fbc027e65115dbf13 Mon Sep 17 00:00:00 2001 From: jammerful Date: Fri, 19 Jan 2018 15:04:09 -0500 Subject: [PATCH 48/54] mono{48,50,54}: Fix libgdiplus path in dll config map --- pkgs/development/compilers/mono/generic-cmake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/mono/generic-cmake.nix b/pkgs/development/compilers/mono/generic-cmake.nix index de19e4b633e..7621bd56d47 100644 --- a/pkgs/development/compilers/mono/generic-cmake.nix +++ b/pkgs/development/compilers/mono/generic-cmake.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { postBuild = '' find . -name 'config' -type f | xargs \ sed -i -e "s@libX11.so.6@${libX11.out}/lib/libX11.so.6@g" \ - -e "s@/.*libgdiplus.so@${libgdiplus}/lib/libgdiplus.so@g" \ + -e 's#[^"]*libgdiplus[^"]*"#${libgdiplus}/lib/libgdiplus.so"#' \ ''; # Without this, any Mono application attempting to open an SSL connection will throw with From 98ede1e2aece1f4e5f6788a6500a321e6aff2371 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Fri, 19 Jan 2018 16:18:27 -0500 Subject: [PATCH 49/54] CODEOWNERS: Make @orivej a {cc,bintools}-wrapper codeowner --- .github/CODEOWNERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d0d757e8ccb..bac601fbf82 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -20,9 +20,9 @@ /pkgs/top-level/impure.nix @nbp @Ericson2314 /pkgs/top-level/stage.nix @nbp @Ericson2314 /pkgs/stdenv -/pkgs/build-support/cc-wrapper @Ericson2314 -/pkgs/build-support/bintools-wrapper @Ericson2314 -/pkgs/build-support/setup-hooks @Ericson2314 +/pkgs/build-support/cc-wrapper @Ericson2314 @orivej +/pkgs/build-support/bintools-wrapper @Ericson2314 @orivej +/pkgs/build-support/setup-hooks @Ericson2314 # NixOS Internals /nixos/default.nix @nbp From 4414b1b0a7ce85af01ed70254bf47b8e005e448e Mon Sep 17 00:00:00 2001 From: jammerful Date: Thu, 18 Jan 2018 13:50:25 -0500 Subject: [PATCH 50/54] xml-tooling-c: 1.6.0 -> 1.6.3 Resolves #33875 --- pkgs/development/libraries/xml-tooling-c/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index f2d7711c9f0..8e1d71fab3f 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "xml-tooling-c-${version}"; - version = "1.6.0"; + version = "1.6.3"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; - rev = "db08101c3854518a59096be95ed6564838381744"; - sha256 = "0rhzvxm4z3pm28kpk34hayhm12bjjms2kygv1z68vnz8ijzgcinq"; + rev = version; + sha256 = "09z2pp3yy3kqx22vwgxyi3s0vlpdv9camw8dpi3q8piff6zxak3q"; }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; From edd3180aa2ab06805cba48bcfafcb2aad1a6452d Mon Sep 17 00:00:00 2001 From: jammerful Date: Thu, 18 Jan 2018 13:52:00 -0500 Subject: [PATCH 51/54] opensaml-cpp: 2.6.0 -> 2.6.1 Resolves #33875 --- pkgs/development/libraries/opensaml-cpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opensaml-cpp/default.nix b/pkgs/development/libraries/opensaml-cpp/default.nix index c2c102ccf9b..659c4fb7cff 100644 --- a/pkgs/development/libraries/opensaml-cpp/default.nix +++ b/pkgs/development/libraries/opensaml-cpp/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "opensaml-cpp-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-opensaml.git"; - rev = "61193de29e4c9f1ccff7ed7e1f42c2748c62be77"; - sha256 = "1jlxa1f2qn0kd15fzjqp80apxn42v47wg3mx1vk424m31rhi00xr"; + rev = version; + sha256 = "0wjb6jyvh4hwpy1pvhh63i821746nqijysrd4vasbirkf4h6z7nx"; }; buildInputs = [ boost openssl log4shib xercesc xml-security-c xml-tooling-c zlib ]; From a42aef3bdc76644ddd9283005b13d3f58190177d Mon Sep 17 00:00:00 2001 From: jammerful Date: Thu, 18 Jan 2018 13:53:14 -0500 Subject: [PATCH 52/54] shibboleth-sp: 2.6.0 -> 2.6.1 Resolves #33875 --- pkgs/development/libraries/shibboleth-sp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/shibboleth-sp/default.nix b/pkgs/development/libraries/shibboleth-sp/default.nix index 219cda38bc2..74f861297d1 100644 --- a/pkgs/development/libraries/shibboleth-sp/default.nix +++ b/pkgs/development/libraries/shibboleth-sp/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "shibboleth-sp-${version}"; - version = "2.6.0"; + version = "2.6.1"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-sp.git"; - rev = "9ebba5c3a16d03769f436e383e4c4cdaa33f5509"; - sha256 = "1b5r4nd098lnjwr2g13f04ycqv5fvbrhpwg6fsdk8xy9cigvfzxj"; + rev = version; + sha256 = "01q13p7gc0janjfml6zs46na8qnval8hc833fk2wrnmi4w9xw4fd"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From b45a117bd37204f6a6307907bbe7c94f0eb70f35 Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Fri, 19 Jan 2018 23:47:00 +0000 Subject: [PATCH 53/54] i2pd: override boost derivation on the top-level --- pkgs/tools/networking/i2pd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index f736ca089bf..251268b6f30 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost165, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "1yl5h7mls50vkg7x5510mljmgsm02arqhcanwkrqw4ilwvcp1mgz"; }; - buildInputs = [ boost165 zlib openssl ]; + buildInputs = [ boost zlib openssl ]; makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788d40747fd..efb144813e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2737,7 +2737,9 @@ with pkgs; i2p = callPackage ../tools/networking/i2p {}; - i2pd = callPackage ../tools/networking/i2pd {}; + i2pd = callPackage ../tools/networking/i2pd { + boost = boost165; + }; i-score = libsForQt5.callPackage ../applications/audio/i-score { }; From b81c65ce0a4c671db405890bcefd7f17dcb3eb9c Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Sat, 20 Jan 2018 00:04:02 -0500 Subject: [PATCH 54/54] libsnark: init at 9e6b19ff --- .../libsnark/darwin-fix-clock-gettime.patch | 41 +++++++++++++++++++ .../libraries/libsnark/default.nix | 32 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 75 insertions(+) create mode 100644 pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch create mode 100644 pkgs/development/libraries/libsnark/default.nix diff --git a/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch b/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch new file mode 100644 index 00000000000..2eee84d1c4b --- /dev/null +++ b/pkgs/development/libraries/libsnark/darwin-fix-clock-gettime.patch @@ -0,0 +1,41 @@ +Adapted from https://github.com/zcash/libsnark/pull/10 + +diff --git a/depends/libff/libff/common/profiling.cpp b/depends/libff/libff/common/profiling.cpp +index f2a1985..319149c 100755 +--- a/depends/libff/libff/common/profiling.cpp ++++ b/depends/libff/libff/common/profiling.cpp +@@ -27,6 +27,13 @@ + #include + #endif + ++#ifdef __MACH__ ++#include ++#include ++#include ++#include ++#endif ++ + namespace libff { + + long long get_nsec_time() +@@ -42,10 +49,20 @@ long long get_nsec_cpu_time() + return 0; + #else + ::timespec ts; ++#ifdef __MACH__ ++ clock_serv_t cclock; ++ mach_timespec_t mts; ++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock); ++ clock_get_time(cclock, &mts); ++ mach_port_deallocate(mach_task_self(), cclock); ++ ts.tv_sec = mts.tv_sec; ++ ts.tv_nsec = mts.tv_nsec; ++#else + if ( ::clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) ) + throw ::std::runtime_error("clock_gettime(CLOCK_PROCESS_CPUTIME_ID) failed"); + // If we expected this to work, don't silently ignore failures, because that would hide the problem and incur an unnecessarily system-call overhead. So if we ever observe this exception, we should probably add a suitable #ifdef . + //TODO: clock_gettime(CLOCK_PROCESS_CPUTIME_ID) is not supported by native Windows. What about Cygwin? Should we #ifdef on CLOCK_PROCESS_CPUTIME_ID or on __linux__? ++#endif + return ts.tv_sec * 1000000000ll + ts.tv_nsec; + #endif + } diff --git a/pkgs/development/libraries/libsnark/default.nix b/pkgs/development/libraries/libsnark/default.nix new file mode 100644 index 00000000000..578053bbb42 --- /dev/null +++ b/pkgs/development/libraries/libsnark/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, boost, gmp, procps, fetchpatch, patchutils }: + +let + rev = "9e6b19ff15bc19fba5da1707ba18e7f160e5ed07"; + inherit (stdenv) lib; +in stdenv.mkDerivation rec { + name = "libsnark-pre${version}"; + version = stdenv.lib.substring 0 8 rev; + + buildInputs = [ cmake pkgconfig openssl boost gmp ] ++ lib.optional stdenv.hostPlatform.isLinux procps; + + cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "-DWITH_PROCPS=OFF" "-DWITH_SUPERCOP=OFF" ]; + + src = fetchFromGitHub { + inherit rev; + owner = "scipr-lab"; + repo = "libsnark"; + sha256 = "13f02qp2fmfhvxlp4xi69m0l8r5nq913l2f0zwdk7hl46lprfdca"; + fetchSubmodules = true; + }; + + patches = [ ./darwin-fix-clock-gettime.patch ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "C++ library for zkSNARKs"; + homepage = https://github.com/scipr-lab/libsnark; + license = licenses.mit; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7dedb00717..00f8d401482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9869,6 +9869,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon AudioToolbox; }; + libsnark = callPackage ../development/libraries/libsnark { }; + libsodium = callPackage ../development/libraries/libsodium { }; libsoup = callPackage ../development/libraries/libsoup { };