diff options
63 files changed, 2729 insertions, 3447 deletions
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index e0fbba897fa4..0935bf0cae71 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -148,11 +148,11 @@ in [ { hostNames = [ "myhost" "myhost.mydomain.com" "10.10.1.4" ]; - publicKeyFile = "./pubkeys/myhost_ssh_host_dsa_key.pub"; + publicKeyFile = ./pubkeys/myhost_ssh_host_dsa_key.pub; } { hostNames = [ "myhost2" ]; - publicKeyFile = "./pubkeys/myhost2_ssh_host_dsa_key.pub"; + publicKeyFile = ./pubkeys/myhost2_ssh_host_dsa_key.pub; } ] ''; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 01b4aca91731..645dfeab0193 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -22,8 +22,8 @@ let ); graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' - time_zone: ${config.time.timeZone} search_index: ${dataDir}/index + ${optionalString (!isNull config.time.timeZone) ''time_zone: ${config.time.timeZone}''} ${optionalString (cfg.api.finders != []) ''finders:''} ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} ${optionalString (cfg.api.functions != []) ''functions:''} @@ -536,7 +536,7 @@ in { environment = { PYTHONPATH = let aenv = pkgs.python.buildEnv.override { - extraLibs = [ cfg.api.package pkgs.cairo ] ++ cfg.api.finders; + extraLibs = [ cfg.api.package pkgs.cairo pkgs.pythonPackages.cffi ] ++ cfg.api.finders; }; in "${aenv}/${pkgs.python.sitePackages}"; GRAPHITE_API_CONFIG = graphiteApiConfig; diff --git a/nixos/modules/services/networking/dnschain.nix b/nixos/modules/services/networking/dnschain.nix index ab7bbb15ad4f..ee1cd3600039 100644 --- a/nixos/modules/services/networking/dnschain.nix +++ b/nixos/modules/services/networking/dnschain.nix @@ -158,7 +158,7 @@ in serviceConfig = { User = "dnschain"; Restart = "on-failure"; - ExecStart = "${pkgs.dnschain}/bin/dnschain"; + ExecStart = "${pkgs.nodePackages.dnschain}/bin/dnschain"; }; preStart = '' diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 1c3c7835d961..f9f2511f45dc 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -676,6 +676,7 @@ in '' ; Needed for PHP's mail() function. sendmail_path = sendmail -t -i + '' + optionalString (!isNull config.time.timeZone) '' ; Apparently PHP doesn't use $TZ. date.timezone = "${config.time.timeZone}" diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index c6f4bcd0f666..1c654667dfc7 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -13,6 +13,7 @@ let define('DB_HOST', '${config.dbHost}'); define('DB_CHARSET', 'utf8'); $table_prefix = '${config.tablePrefix}'; + define('AUTOMATIC_UPDATER_DISABLED', true); ${config.extraConfig} if ( !defined('ABSPATH') ) define('ABSPATH', dirname(__FILE__) . '/'); diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 4fd7de192d55..a22ef224580a 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -4,22 +4,28 @@ import ./make-test.nix ({ pkgs, ...} : nodes = { one = { config, pkgs, ... }: { + time.timeZone = "UTC"; services.graphite = { - web = { + web.enable = true; + api = { enable = true; + port = 8082; }; - carbon = { - enableCache = true; - }; + carbon.enableCache = true; + seyren.enable = true; + pager.enable = true; }; }; - }; + }; testScript = '' startAll; $one->waitForUnit("default.target"); $one->requireActiveUnit("graphiteWeb.service"); + $one->requireActiveUnit("graphiteApi.service"); + $one->requireActiveUnit("graphitePager.service"); $one->requireActiveUnit("carbonCache.service"); + $one->requireActiveUnit("seyren.service"); $one->succeed("echo \"foo 1 `date +%s`\" | nc -q0 localhost 2003"); $one->waitUntilSucceeds("curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo") ''; diff --git a/pkgs/applications/altcoins/bitcoin-unlimited.nix b/pkgs/applications/altcoins/bitcoin-unlimited.nix index 2ad8e3fb3500..9eb1e54b9093 100644 --- a/pkgs/applications/altcoins/bitcoin-unlimited.nix +++ b/pkgs/applications/altcoins/bitcoin-unlimited.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "bitcoinunlimited"; repo = "bitcoinunlimited"; rev = "v${version}"; - sha256 = "0rhk6xvzvzyfppg0pgq72nqgm2rmkiw0nhg3rwnzcvvj90nrz3da"; + sha256 = "17cmyns1908s2rqs0zwr05f3541nqm2pg08n2xn97g2k3yimdg5q"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 29e43a93c985..9acd8357cb71 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "hugin-2016.2.0"; + name = "hugin-2017.0.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl"; + sha256 = "02a6rlwp20jdn5jdsyg3c7liljr10c3jfdkxiv9mkf9jgyi6wr46"; }; buildInputs = [ diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix index fd88ea61ad86..8b24df1bee92 100644 --- a/pkgs/applications/misc/cli-visualizer/default.nix +++ b/pkgs/applications/misc/cli-visualizer/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, fftw, ncurses5, libpulseaudio, makeWrapper }: stdenv.mkDerivation rec { - version = "1.5"; + version = "1.6"; name = "cli-visualizer-${version}"; src = fetchFromGitHub { owner = "dpayne"; repo = "cli-visualizer"; rev = version; - sha256 = "18qv4ya64qmczq94dnynrnzn7pwhmzbn14r05qcvbbwv7r8gclzs"; + sha256 = "0mirp8bk398di5xyq95iprmdyvplfghxqmrfj7jdnpy554vx7ppc"; }; postPatch = '' diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix index ba04bd5c39de..3c4f409d18f1 100644 --- a/pkgs/applications/misc/hstr/default.nix +++ b/pkgs/applications/misc/hstr/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, readline, ncurses }: let - version = "1.22"; + version = "1.23"; in stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz"; - sha256 = "09rh510x8qc5jbpnfzazbv9wc3bqmf5asydcl2wijpqm5bi21iqp"; + sha256 = "1hnira256p7sdilx34mnkji7gi2jcl98zz4izqxsqmnzj8ghhzkv"; }; buildInputs = [ readline ncurses ]; diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index 1334f2317b9d..91e583e2af4e 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { name = "${pname}-${version}"; pname = "khal"; - version = "0.9.7"; + version = "0.9.8"; src = fetchPypi { inherit pname version; - sha256 = "0x1p62ff7ggb172rjr6sbdrjh1gl3ck3bwxsqlsix8i5wycwvnmv"; + sha256 = "1blx3gxnv7sj302biqphfw7i6ilzl2xlmvzp130n3113scg9w17y"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 37bbfef65bba..bfccc4bfcb6c 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -4,7 +4,7 @@ let - version = "5.4.0.1"; + version = "5.5.0.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -54,7 +54,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb"; - sha256 = "1idjgmn0kym7jml30xq6zrcp8qinx64kgnxlw8m0ys4z6zlw0c8z"; + sha256 = "1r65qlsjwp0n0fmlhvbp71h03b3x73r26jk9f4q687sjqnzmkvcr"; } else throw "Skype for linux is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index 0a93efd3990d..9cee31b01eb7 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, python3Packages }: stdenv.mkDerivation rec { - name = "bean-add-2017-09-13"; + name = "bean-add-2017-10-31"; src = fetchFromGitHub { owner = "simon-v"; repo = "bean-add"; - rev = "035f07a9e48a9dd23b49a27ba9c070ee9ddc4cc7"; - sha256 = "0lj8940bn2h8541am4x0sfqpfk5xfnyfdnf3jpajfgx6wyjm2frg"; + rev = "9ac64272a17e76f8292bd94deb5aee45c14130d2"; + sha256 = "1vcwbbi2jsf87yq8f2hyf7nz9br1973sb20qjnsx5fxlmcpn47jh"; }; propagatedBuildInputs = with python3Packages; [ python ]; diff --git a/pkgs/applications/office/beancount/default.nix b/pkgs/applications/office/beancount/default.nix index 70d5180191e9..efc61dba7a49 100644 --- a/pkgs/applications/office/beancount/default.nix +++ b/pkgs/applications/office/beancount/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchhg, pkgs, pythonPackages }: pythonPackages.buildPythonApplication rec { - version = "2.0b15"; + version = "2.0rc1"; name = "beancount-${version}"; namePrefix = ""; src = pkgs.fetchurl { url = "mirror://pypi/b/beancount/${name}.tar.gz"; - sha256 = "1dvnpgja4v4k5zagfsmdjavlib0z3r9r4z197yvj86szhzs0z86k"; + sha256 = "12vlkck4q3dax9866krp6963c6d845b7inkkwrlkk4njh84n71wf"; }; buildInputs = with pythonPackages; [ nose ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index b3c642de9b25..6358a340bb6e 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -13,7 +13,7 @@ }: let - version = "2.14.3"; + version = "2.15.0"; svn = subversionClient.override { perlBindings = true; }; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "078m0za5gyzcah5iaxdwx663yvdp8byvjc8rpzjzcrr4sl6rcc2k"; + sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/virtualization/xen/4.5.nix b/pkgs/applications/virtualization/xen/4.5.nix index 614122a3b24e..308913adf89c 100644 --- a/pkgs/applications/virtualization/xen/4.5.nix +++ b/pkgs/applications/virtualization/xen/4.5.nix @@ -32,13 +32,15 @@ let udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir alsaLib ]; + + xsa = import ./xsa-patches.nix { inherit fetchpatch; }; in callPackage (import ./generic.nix (rec { version = "4.5.5"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; + url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; sha256 = "1y74ms4yc3znf8jc3fgyq94va2y0pf7jh8m9pfqnpgklywqnw8g2"; }; @@ -183,227 +185,52 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = - [ ./0001-libxl-Spice-image-compression-setting-support-for-up.patch - ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch - ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch - (xsaPatch { - name = "190-4.5"; - sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; - }) - (xsaPatch { - name = "191-4.6"; - sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; - }) - (xsaPatch { - name = "192-4.5"; - sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; - }) - (xsaPatch { - name = "193-4.5"; - sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; - }) - (xsaPatch { - name = "195"; - sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; - }) - (xsaPatch { - name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; - sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; - }) - (xsaPatch { - name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; - sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; - }) - (xsaPatch { - name = "198"; - sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; - }) - (xsaPatch { - name = "200-4.6"; - sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; - }) - (xsaPatch { - name = "202-4.6"; - sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; - }) - (xsaPatch { - name = "204-4.5"; - sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; - }) - (xsaPatch { - name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; - sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; - }) - (xsaPatch { - name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; - sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; - }) - (xsaPatch { - name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; - sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; - }) - (xsaPatch { - name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; - sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; - }) - (xsaPatch { - name = "206-4.5/0005-oxenstored-refactor-request-processing"; - sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; - }) - (xsaPatch { - name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; - sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; - }) - (xsaPatch { - name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; - sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; - }) - (xsaPatch { - name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; - sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; - }) - (xsaPatch { - name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; - sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; - }) - (xsaPatch { - name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; - sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; - }) - (xsaPatch { - name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; - sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; - }) - (xsaPatch { - name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; - sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; - }) - (xsaPatch { - name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; - sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; - }) - (xsaPatch { - name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; - sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; - }) - (xsaPatch { - name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; - sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; - }) - (xsaPatch { - name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; - sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; - }) - (xsaPatch { - name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; - sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; - }) - (xsaPatch { - name = "206-4.5/0018-oxenstored-track-commit-history"; - sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; - }) - (xsaPatch { - name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; - sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; - }) - (xsaPatch { - name = "206-4.5/0020-oxenstored-allow-self-conflicts"; - sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; - }) - (xsaPatch { - name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; - sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; - }) - (xsaPatch { - name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; - sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; - }) - (xsaPatch { - name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; - sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; - }) - (xsaPatch { - name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; - sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; - }) - (xsaPatch { - name = "207"; - sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; - }) - (xsaPatch { - name = "212"; - sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; - }) - (xsaPatch { - name = "213-4.5"; - sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; - }) - (xsaPatch { - name = "214"; - sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; - }) - (xsaPatch { - name = "215"; - sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; - }) - (xsaPatch { - name = "217-4.5"; - sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; - }) - (xsaPatch { - name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; - sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; - }) - (xsaPatch { - name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; - }) - (xsaPatch { - name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; - }) - (xsaPatch { - name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; - sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; - }) - (xsaPatch { - name = "219-4.5"; - sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; - }) - (xsaPatch { - name = "220-4.5"; - sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; - }) - (xsaPatch { - name = "221"; - sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; - }) - (xsaPatch { - name = "222-1-4.6"; - sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; - }) - (xsaPatch { - name = "222-2-4.5"; - sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; - }) - (xsaPatch { - name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; - }) - (xsaPatch { - name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; - }) - (xsaPatch { - name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; - }) - (xsaPatch { - name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; - }) - ]; + patches = with xsa; flatten [ + ./0001-libxl-Spice-image-compression-setting-support-for-up.patch + ./0002-libxl-Spice-streaming-video-setting-support-for-upst.patch + ./0003-Add-qxl-vga-interface-support-for-upstream-qem.patch + XSA_190 + XSA_191 + XSA_192 + XSA_193 + XSA_195 + XSA_196 + XSA_198 + XSA_200 + XSA_202_45 + XSA_204_45 + XSA_206_45 + XSA_207 + XSA_212 + XSA_213_45 + XSA_214 + XSA_215 + XSA_217_45 + XSA_218_45 + XSA_219_45 + XSA_220_45 + XSA_221 + XSA_222_45 + XSA_223 + XSA_224_45 + XSA_227_45 + XSA_230 + XSA_231_45 + XSA_232 + XSA_233 + XSA_234_45 + XSA_235_45 + XSA_236_45 + XSA_237_45 + XSA_238_45 + XSA_239_45 + XSA_240_45 + XSA_241 + XSA_242 + XSA_243_45 + XSA_244_45 + XSA_245 + ]; # Fix build on Glibc 2.24. NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; diff --git a/pkgs/applications/virtualization/xen/4.8.nix b/pkgs/applications/virtualization/xen/4.8.nix index 3429545557ad..259dd72a960c 100644 --- a/pkgs/applications/virtualization/xen/4.8.nix +++ b/pkgs/applications/virtualization/xen/4.8.nix @@ -27,6 +27,8 @@ let inherit sha256; }); + xsa = import ./xsa-patches.nix { inherit fetchpatch; }; + qemuDeps = [ udev pciutils xorg.libX11 SDL pixman acl glusterfs spice_protocol usbredir alsaLib @@ -34,11 +36,11 @@ let in callPackage (import ./generic.nix (rec { - version = "4.8.1"; + version = "4.8.2"; src = fetchurl { - url = "http://bits.xensource.com/oss-xen/release/${version}/xen-${version}.tar.gz"; - sha256 = "158kb1w61jmwxi3fc560s4269hhpxrin9xhm60ljj52njhxias8x"; + url = "https://downloads.xenproject.org/release/xen/${version}/xen-${version}.tar.gz"; + sha256 = "1ydgwbn8ab0s16jrbi3wzaa6j0y3zk0j8pay458qcgayk3qc476b"; }; # Sources needed to build tools and firmwares. @@ -141,68 +143,22 @@ callPackage (import ./generic.nix (rec { ++ optional (withOVMF) "--with-system-ovmf=${OVMF.fd}/FV/OVMF.fd" ++ optional (withInternalOVMF) "--enable-ovmf"; - patches = - [ (xsaPatch { - name = "213-4.8"; - sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; - }) - (xsaPatch { - name = "214"; - sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; - }) - (xsaPatch { - name = "217"; - sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; - }) - (xsaPatch { - name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; - sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; - }) - (xsaPatch { - name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; - sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; - }) - (xsaPatch { - name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; - sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; - }) - (xsaPatch { - name = "219-4.8"; - sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; - }) - (xsaPatch { - name = "220-4.8"; - sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; - }) - (xsaPatch { - name = "221"; - sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; - }) - (xsaPatch { - name = "222-1"; - sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; - }) - (xsaPatch { - name = "222-2-4.8"; - sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; - }) - (xsaPatch { - name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; - sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; - }) - (xsaPatch { - name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; - sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; - }) - (xsaPatch { - name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; - sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; - }) - (xsaPatch { - name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; - sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; - }) - ]; + patches = with xsa; flatten [ + XSA_231 + XSA_232 + XSA_233 + XSA_234_48 + XSA_236 + XSA_237_48 + XSA_238 + XSA_239 + XSA_240_48 + XSA_241 + XSA_242 + XSA_243_48 + XSA_244 + XSA_245 + ]; # Fix build on Glibc 2.24. NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; diff --git a/pkgs/applications/virtualization/xen/xsa-patches.nix b/pkgs/applications/virtualization/xen/xsa-patches.nix new file mode 100644 index 000000000000..fd85c85f22bb --- /dev/null +++ b/pkgs/applications/virtualization/xen/xsa-patches.nix @@ -0,0 +1,774 @@ +{ fetchpatch }: + +let + xsaPatch = { name , sha256 }: (fetchpatch { + url = "https://xenbits.xen.org/xsa/xsa${name}.patch"; + inherit sha256; + }); +in rec { + # 4.5 + XSA_190 = (xsaPatch { + name = "190-4.5"; + sha256 = "0f8pw38kkxky89ny3ic5h26v9zsjj9id89lygx896zc3w1klafqm"; + }); + + # 4.5 + XSA_191 = (xsaPatch { + name = "191-4.6"; + sha256 = "1wl1ndli8rflmc44pkp8cw4642gi8z7j7gipac8mmlavmn3wdqhg"; + }); + + # 4.5 + XSA_192 = (xsaPatch { + name = "192-4.5"; + sha256 = "0m8cv0xqvx5pdk7fcmaw2vv43xhl62plyx33xqj48y66x5z9lxpm"; + }); + + # 4.5 + XSA_193 = (xsaPatch { + name = "193-4.5"; + sha256 = "0k9mykhrpm4rbjkhv067f6s05lqmgnldcyb3vi8cl0ndlyh66lvr"; + }); + + # 4.5 + XSA_195 = (xsaPatch { + name = "195"; + sha256 = "0m0g953qnjy2knd9qnkdagpvkkgjbk3ydgajia6kzs499dyqpdl7"; + }); + + # 4.5 + XSA_196 = [ + (xsaPatch { + name = "196-0001-x86-emul-Correct-the-IDT-entry-calculation-in-inject"; + sha256 = "0z53nzrjvc745y26z1qc8jlg3blxp7brawvji1hx3s74n346ssl6"; + }) + (xsaPatch { + name = "196-0002-x86-svm-Fix-injection-of-software-interrupts"; + sha256 = "11cqvr5jn2s92wsshpilx9qnfczrd9hnyb5aim6qwmz3fq3hrrkz"; + }) + ]; + + # 4.5 + XSA_198 = (xsaPatch { + name = "198"; + sha256 = "0d1nndn4p520c9xa87ixnyks3mrvzcri7c702d6mm22m8ansx6d9"; + }); + + # 4.5 + XSA_200 = (xsaPatch { + name = "200-4.6"; + sha256 = "0k918ja83470iz5k4vqi15293zjvz2dipdhgc9sy9rrhg4mqncl7"; + }); + + # 4.5 + XSA_202_45 = (xsaPatch { + name = "202-4.6"; + sha256 = "0nnznkrvfbbc8z64dr9wvbdijd4qbpc0wz2j5vpmx6b32sm7932f"; + }); + + # 4.8 + XSA_202 = (xsaPatch { + name = "202"; + sha256 = "0j1d5akcjgx8w2c6w6p9znv77fkmps0880m2xgpbgs1ra9grshm1"; + }); + + # 4.8 + XSA_203 = (xsaPatch { + name = "203"; + sha256 = "1s1q7xskvpg87ivwfaiqr0cj3ajdkhkhpmpikfkvq127h8hhmd8j"; + }); + + # 4.5 + XSA_204_45 = (xsaPatch { + name = "204-4.5"; + sha256 = "083z9pbdz3f532fnzg7n2d5wzv6rmqc0f4mvc3mnmkd0rzqw8vcp"; + }); + + # 4.8 + XSA_204 = (xsaPatch { + name = "204-4.8"; + sha256 = "0rs498s4w2alz3h6jhlr2y0ni630vhggmxbrd1p1p3gcv8p6zzrr"; + }); + + # 4.5 + XSA_206_45 = [ + (xsaPatch { + name = "206-4.5/0001-xenstored-apply-a-write-transaction-rate-limit"; + sha256 = "07vsm8mlbxh2s01ny2xywnm1bqhhxas1az31fzwb6f1g14vkzwm4"; + }) + (xsaPatch { + name = "206-4.5/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; + sha256 = "17pnvxjmhny22abwwivacfig4vfsy5bqlki07z236whc2y7yzbsx"; + }) + (xsaPatch { + name = "206-4.5/0003-oxenstored-refactor-putting-response-on-wire"; + sha256 = "0xf566yicnisliy82cydb2s9k27l3bxc43qgmv6yr2ir3ixxlw5s"; + }) + (xsaPatch { + name = "206-4.5/0004-oxenstored-remove-some-unused-parameters"; + sha256 = "16cqx9i0w4w3x06qqdk9rbw4z96yhm0kbc32j40spfgxl82d1zlk"; + }) + (xsaPatch { + name = "206-4.5/0005-oxenstored-refactor-request-processing"; + sha256 = "1g2hzlv7w03sqnifbzda85mwlz3bw37rk80l248180sv3k7k6bgv"; + }) + (xsaPatch { + name = "206-4.5/0006-oxenstored-keep-track-of-each-transaction-s-operatio"; + sha256 = "0n65yfxvpfd4cz95dpbwqj3nablyzq5g7a0klvi2y9zybhch9cmg"; + }) + (xsaPatch { + name = "206-4.5/0007-oxenstored-move-functions-that-process-simple-operat"; + sha256 = "0qllvbc9rnj7jhhlslxxs35gvphvih0ywz52jszj4irm23ka5vnz"; + }) + (xsaPatch { + name = "206-4.5/0008-oxenstored-replay-transaction-upon-conflict"; + sha256 = "0lixkxjfzciy9l0f980cmkr8mcsx14c289kg0mn5w1cscg0hb46g"; + }) + (xsaPatch { + name = "206-4.5/0009-oxenstored-log-request-and-response-during-transacti"; + sha256 = "09ph8ddcx0k7rndd6hx6kszxh3fhxnvdjsq13p97n996xrpl1x7b"; + }) + (xsaPatch { + name = "206-4.5/0010-oxenstored-allow-compilation-prior-to-OCaml-3.12.0"; + sha256 = "1y0m7sqdz89z2vs4dfr45cyvxxas323rxar0xdvvvivgkgxawvxj"; + }) + (xsaPatch { + name = "206-4.5/0011-oxenstored-comments-explaining-some-variables"; + sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; + }) + (xsaPatch { + name = "206-4.5/0012-oxenstored-handling-of-domain-conflict-credit"; + sha256 = "12zgid5y9vrhhpk2syxp0x01lzzr6447fa76n6rjmzi1xgdzpaf8"; + }) + (xsaPatch { + name = "206-4.5/0013-oxenstored-ignore-domains-with-no-conflict-credit"; + sha256 = "0v3g9pm60w6qi360hdqjcw838s0qcyywz9qpl8gzmhrg7a35avxl"; + }) + (xsaPatch { + name = "206-4.5/0014-oxenstored-add-transaction-info-relevant-to-history-"; + sha256 = "0vv3w0h5xh554i9v2vbc8gzm8wabjf2vzya3dyv5yzvly6ygv0sb"; + }) + (xsaPatch { + name = "206-4.5/0015-oxenstored-support-commit-history-tracking"; + sha256 = "1iv2vy29g437vj73x9p33rdcr5ln2q0kx1b3pgxq202ghbc1x1zj"; + }) + (xsaPatch { + name = "206-4.5/0016-oxenstored-only-record-operations-with-side-effects-"; + sha256 = "1cjkw5ganbg6lq78qsg0igjqvbgph3j349faxgk1p5d6nr492zzy"; + }) + (xsaPatch { + name = "206-4.5/0017-oxenstored-discard-old-commit-history-on-txn-end"; + sha256 = "0lm15lq77403qqwpwcqvxlzgirp6ffh301any9g401hs98f9y4ps"; + }) + (xsaPatch { + name = "206-4.5/0018-oxenstored-track-commit-history"; + sha256 = "1jh92p6vjhkm3bn5vz260npvsjji63g2imsxflxs4f3r69sz1nkd"; + }) + (xsaPatch { + name = "206-4.5/0019-oxenstored-blame-the-connection-that-caused-a-transa"; + sha256 = "17k264pk0fvsamj85578msgpx97mw63nmj0j9v5hbj4bgfazvj4h"; + }) + (xsaPatch { + name = "206-4.5/0020-oxenstored-allow-self-conflicts"; + sha256 = "15z3rd49q0pa72si0s8wjsy2zvbm613d0hjswp4ikc6nzsnsh4qy"; + }) + (xsaPatch { + name = "206-4.5/0021-oxenstored-do-not-commit-read-only-transactions"; + sha256 = "04wpzazhv90lg3228z5i6vnh1z4lzd08z0d0fvc4br6pkd0w4va8"; + }) + (xsaPatch { + name = "206-4.5/0022-oxenstored-don-t-wake-to-issue-no-conflict-credit"; + sha256 = "1shbrn0w68rlywcc633zcgykfccck1a77igmg8ydzwjsbwxsmsjy"; + }) + (xsaPatch { + name = "206-4.5/0023-oxenstored-transaction-conflicts-improve-logging"; + sha256 = "1086y268yh8047k1vxnxs2nhp6izp7lfmq01f1gq5n7jiy1sxcq7"; + }) + (xsaPatch { + name = "206-4.5/0024-oxenstored-trim-history-in-the-frequent_ops-function"; + sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; + }) + ]; + + # 4.8 + XSA_206 = [ + (xsaPatch { + name = "206-4.8/0001-xenstored-apply-a-write-transaction-rate-limit"; + sha256 = "1c81d93i3qx7l38f9af0sd84w5x51zvn262mzl25ilcklql4kzl6"; + }) + (xsaPatch { + name = "206-4.8/0002-xenstored-Log-when-the-write-transaction-rate-limit-"; + sha256 = "0b8iw409wi1x6p0swpnr51lcdlla1lgxjv5f910sj4wl96bca84q"; + }) + (xsaPatch { + name = "206-4.8/0003-oxenstored-comments-explaining-some-variables"; + sha256 = "1d3n0y9syya4kaavrvqn01d3wsn85gmw7qrbylkclznqgkwdsr2p"; + }) + (xsaPatch { + name = "206-4.8/0004-oxenstored-handling-of-domain-conflict-credit"; + sha256 = "020rw7hgc0dmhr4admz91kd99b4z1bdpji47nsy1255bjgvwc01k"; + }) + (xsaPatch { + name = "206-4.8/0005-oxenstored-ignore-domains-with-no-conflict-credit"; + sha256 = "1ilhcgyn803bxvfbqv0ihfrh9jfpp0lidkv7i4613f9v9vjm8q0h"; + }) + (xsaPatch { + name = "206-4.8/0006-oxenstored-add-transaction-info-relevant-to-history-"; + sha256 = "1dbd9pzda6hn9wj9pck44dlgz9nxvch3bzgrpaivanww8llxdfzz"; + }) + (xsaPatch { + name = "206-4.8/0007-oxenstored-support-commit-history-tracking"; + sha256 = "1jfr56c22fqkhj6fnv1ha7zsid86zm9l0nihpb8m932xgc4a6h9h"; + }) + (xsaPatch { + name = "206-4.8/0008-oxenstored-only-record-operations-with-side-effects-"; + sha256 = "1y845hj8krjdrirbd2jx4jqgnylwjv7bxnk7474lkld5kdnlbjyf"; + }) + (xsaPatch { + name = "206-4.8/0009-oxenstored-discard-old-commit-history-on-txn-end"; + sha256 = "1lcr9gz2b77x74sr1flfymyyz4xzs04iv88rc1633ibyqxmvk0lx"; + }) + (xsaPatch { + name = "206-4.8/0010-oxenstored-track-commit-history"; + sha256 = "1qwnivak4y038mpby75aaz0y70r0l3yc3hsz6wl5x0b74q6yy0ja"; + }) + (xsaPatch { + name = "206-4.8/0011-oxenstored-blame-the-connection-that-caused-a-transa"; + sha256 = "0p2w5ddyhc6d95dnlxzc5k77j063p02d53ab7m7ijfm7m6gknq8y"; + }) + (xsaPatch { + name = "206-4.8/0012-oxenstored-allow-self-conflicts"; + sha256 = "1571l81m30cbmqm4pk33q33p3dy58sfy2lnkl2wbgl2b3mkk657l"; + }) + (xsaPatch { + name = "206-4.8/0013-oxenstored-do-not-commit-read-only-transactions"; + sha256 = "15985wl635w22dddjyx5l97b5p6m55mzv5ygk7xr0jx7mi192f9x"; + }) + (xsaPatch { + name = "206-4.8/0014-oxenstored-don-t-wake-to-issue-no-conflict-credit"; + sha256 = "08672w4gaf2n3r8xy09h874gh5lg2vnrkjzq6xzvzdhdl092mipw"; + }) + (xsaPatch { + name = "206-4.8/0015-oxenstored-transaction-conflicts-improve-logging"; + sha256 = "0ck98ms0py8wjsc38pbx6222x7n6l90zckfa7m7nnszsyc0sxxad"; + }) + (xsaPatch { + name = "206-4.8/0016-oxenstored-trim-history-in-the-frequent_ops-function"; + sha256 = "014zs6i4gzrimn814k5i7gz66vbb0adkzr2qyai7i4fxc9h9r7w8"; + }) + ]; + + # 4.5 - 4.8 + XSA_207 = (xsaPatch { + name = "207"; + sha256 = "0wdlhijmw9mdj6a82pyw1rwwiz605dwzjc392zr3fpb2jklrvibc"; + }); + + # 4.8 + XSA_210 = (xsaPatch { + name = "210"; + sha256 = "02mykxqxnsrd0sr4ij022j8y7618wzi2a6j6j761vx8qgmh11xai"; + }); + + # 4.5 - 4.8 + XSA_212 = (xsaPatch { + name = "212"; + sha256 = "1ggjbbym5irq534a3zc86md9jg8imlpc9wx8xsadb9akgjrr1r8d"; + }); + + # 4.5 + XSA_213_45 = (xsaPatch { + name = "213-4.5"; + sha256 = "1vnqf89ydacr5bq3d6z2r33xb2sn5vsd934rncyc28ybc9rvj6wm"; + }); + + # 4.8 + XSA_213 = (xsaPatch { + name = "213-4.8"; + sha256 = "0ia3zr6r3bqy2h48fdy7p0iz423lniy3i0qkdvzgv5a8m80darr2"; + }); + + # 4.5 - 4.8 + XSA_214 = (xsaPatch { + name = "214"; + sha256 = "0qapzx63z0yl84phnpnglpkxp6b9sy1y7cilhwjhxyigpfnm2rrk"; + }); + + # 4.5 + XSA_215 = (xsaPatch { + name = "215"; + sha256 = "0sv8ccc5xp09f1w1gj5a9n3mlsdsh96sdb1n560vh31f4kkd61xs"; + }); + + # 4.5 + XSA_217_45 = (xsaPatch { + name = "217-4.5"; + sha256 = "067pgsfrb9py2dhm1pk9g8f6fs40vyfrcxhj8c12vzamb6svzmn4"; + }); + + # 4.6 - 4.8 + XSA_217 = (xsaPatch { + name = "217"; + sha256 = "1khs5ilif14dzcm7lmikjzkwsrfzlmir1rgrgzkc411gf18ylzmj"; + }); + + # 4.5 + XSA_218_45 = [ + (xsaPatch { + name = "218-4.5/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures"; + sha256 = "00y6j3yjxw0igpldsavikmhlxw711k2jsj1qx0s05w2k608gadkq"; + }) + (xsaPatch { + name = "218-4.5/0002-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0qbbfnnjlpdcd29mzmacfmi859k92c213l91q7w1rg2k6pzx928k"; + }) + (xsaPatch { + name = "218-4.5/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "1cndzvyhf41mk4my6vh3bk9jvh2y4gpmqdhvl9zhxhmppszslqkc"; + }) + (xsaPatch { + name = "218-4.5/0004-gnttab-correct-maptrack-table-accesses"; + sha256 = "02zpb0ffigijacqvyyjylwx3qpgibwslrka7mbxwnclf4s9c03a2"; + }) + ]; + + # 4.8 + XSA_218 = [ + (xsaPatch { + name = "218-4.8/0001-gnttab-fix-unmap-pin-accounting-race"; + sha256 = "0r363frai239r2wmwxi48kcr50gbk5l64nja0h9lppi3z2y3dkdd"; + }) + (xsaPatch { + name = "218-4.8/0002-gnttab-Avoid-potential-double-put-of-maptrack-entry"; + sha256 = "07wm06i7frv7bsaykakx3g9h0hfqv96zcadvwf6wv194dggq1plc"; + }) + (xsaPatch { + name = "218-4.8/0003-gnttab-correct-maptrack-table-accesses"; + sha256 = "0ad0irc3p4dmla8sp3frxbh2qciji1dipkslh0xqvy2hyf9p80y9"; + }) + ]; + + # 4.5 + XSA_219_45 = (xsaPatch { + name = "219-4.5"; + sha256 = "003msr5vhsc66scmdpgn0lp3p01g4zfw5vj86y5lw9ajkbaywdsm"; + }); + + # 4.8 + XSA_219 = (xsaPatch { + name = "219-4.8"; + sha256 = "16q7kiamy86x8qdvls74wmq5j72kgzgdilryig4q1b21mp0ij1jq"; + }); + + # 4.5 + XSA_220_45 = (xsaPatch { + name = "220-4.5"; + sha256 = "1dj9nn6lzxlipjb3nb7b9m4337fl6yn2bd7ap1lqrjn8h9zkk1pp"; + }); + + # 4.8 + XSA_220 = (xsaPatch { + name = "220-4.8"; + sha256 = "0214qyqx7qap5y1pdi9fm0vz4y2fbyg71gaq36fisknj35dv2mh5"; + }); + + # 4.5 - 4.8 + XSA_221 = (xsaPatch { + name = "221"; + sha256 = "1mcr1nqgxyjrkywdg7qhlfwgz7vj2if1dhic425vgd41p9cdgl26"; + }); + + # 4.5 + XSA_222_45 = [ + (xsaPatch { + name = "222-1-4.6"; + sha256 = "1g4dqm5qx4wqlv1520jpfiscph95vllcp4gqp1rdfailk8xi0mcf"; + }) + (xsaPatch { + name = "222-2-4.5"; + sha256 = "1hw8rhc7q4v309f4w11gxfsn5x1pirvxkg7s4kr711fnmvp9hkzd"; + }) + ]; + + # 4.8 + XSA_222 = [ + (xsaPatch { + name = "222-1"; + sha256 = "0x02x4kqwfw255638fh2zcxwig1dy6kadlmqim1jgnjgmrvvqas2"; + }) + (xsaPatch { + name = "222-2-4.8"; + sha256 = "1xhyp6q3c5l8djh965g1i8201m2wvhms8k886h4sn30hks38giin"; + }) + ]; + + # 4.5 - 4.8 + XSA_223 = (xsaPatch { + name = "223"; + sha256 = "0803gjgcbq9vaz2mq0v5finf1fq8iik1g4hqsjqhjxvspn8l70c5"; + }); + + # 4.5 + XSA_224_45 = [ + (xsaPatch { + name = "224-4.5/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1aislj66ss4cb3v2bh12mrqsyrf288d4h54rj94jjq7h1hnycw7h"; + }) + (xsaPatch { + name = "224-4.5/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "1j6fgm1ccb07gg0mi5qmdr0vqwwc3n12z433g1jrija2gbk1x8aq"; + }) + (xsaPatch { + name = "224-4.5/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "166kmicwx280fjqjvgigbmhabjksa0hhvqx5h4v6kjlcjpmxqy08"; + }) + (xsaPatch { + name = "224-4.5/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1skc0yj1zsn8xgyq1y57bdc0scvvlmd0ynrjwwf1zkias1wlilav"; + }) + ]; + + # 4.8 + XSA_224 = [ + (xsaPatch { + name = "224-4.8/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap"; + sha256 = "1k326yan5811qzyvpdfkv801a19nyd09nsqayi8gyh58xx9c21m4"; + }) + (xsaPatch { + name = "224-4.8/0002-gnttab-never-create-host-mapping-unless-asked-to"; + sha256 = "06nj1x59bbx9hrj26xmvbw8z805lfqhld9hm0ld0fs6dmcpqzcck"; + }) + (xsaPatch { + name = "224-4.8/0003-gnttab-correct-logic-to-get-page-references-during-m"; + sha256 = "0kmag6fdsskgplcvzqp341yfi6pgc14wvjj58bp7ydb9hdk53qx2"; + }) + (xsaPatch { + name = "224-4.8/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth"; + sha256 = "1ww80pi7jr4gjpymkcw8qxmr5as18b2asdqv35527nqprylsff9f"; + }) + ]; + + # 4.6 - 4.8 + XSA_225 = (xsaPatch { + name = "225"; + sha256 = "0lcp2bs0r849xnvhrdf8s821v36cqdbzk8lwz6chrjhjalk6ha2g"; + }); + + # 4.5 + XSA_226_45 = [ + (xsaPatch { + name = "226-4.5/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; + sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; + }) + (xsaPatch { + name = "226-4.5/0002-gnttab-fix-transitive-grant-handling"; + sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; + }) + ]; + + # 4.8 - 4.9 + XSA_226 = [ + (xsaPatch { + name = "226-4.9/0001-gnttab-dont-use-possibly-unbounded-tail-calls"; + sha256 = "1hx47ppv5q33cw4dwp82lgvv4fp28gx7rxijw0iaczsv8bvb8vcg"; + }) + (xsaPatch { + name = "226-4.9/0002-gnttab-fix-transitive-grant-handling"; + sha256 = "1gzp8m2zfihwlk71c3lqyd0ajh9h11pvkhzhw0mawckxy0qksvlc"; + }) + ]; + + # 4.5 + XSA_227_45 = (xsaPatch { + name = "227-4.5"; + sha256 = "1qfjfisgqm4x98qw54x2qrvgjnvvzizx9p1pjhcnsps9q6g1y3x8"; + }); + + # 4.8 - 4.9 + XSA_227 = (xsaPatch { + name = "227"; + sha256 = "0zdcm43i5n08rh7rrnb0fcssvd4fgawwmizsa16w2ak7pzvgmg94"; + }); + + # 4.8 + XSA_228_48 = (xsaPatch { + name = "228-4.8"; + sha256 = "085pnzwyv0rdb51hv5vhbhwfyxl0wg8sxcm912gjq8z7da5cv10n"; + }); + + # 4.9 + XSA_228 = (xsaPatch { + name = "228"; + sha256 = "0c9nvfpnr5ira7ha3fszhvvh71nsxrvmzrab56xwjhl2dbw2yy23"; + }); + + # 4.5 - 4.9 + XSA_230 = (xsaPatch { + name = "230"; + sha256 = "10x0j7wmzkrwycs1ng89fgjzvzh8vsdd4c5nb68b3j1azdx4ld83"; + }); + + # 4.5 + XSA_231_45 = (xsaPatch { + name = "231-4.5"; + sha256 = "06gwx2f1lg51dfk2b4zxp7wv9c4pxdi87pg2asvmxqc78ir7l5s6"; + }); + + # 4.8 - 4.9 + XSA_231 = (xsaPatch { + name = "231-4.9"; + sha256 = "09r8xxq2fd52wrk6i0y0sk3nbidfg6pzzrkx327hfmdjj76iyz3b"; + }); + + # 4.5 - 4.9 + XSA_232 = (xsaPatch { + name = "232"; + sha256 = "0n6irjpmraa3hbxxm64a1cplc6y6g07x7v2fmlpvn70ql3fs0220"; + }); + + # 4.5 - 4.9 + XSA_233 = (xsaPatch { + name = "233"; + sha256 = "1w3m8349cqav56av63w6jzvlsv4jw5rimwvskr9pq2rcbk2dx8kf"; + }); + + # 4.5 + XSA_234_45 = (xsaPatch { + name = "234-4.5"; + sha256 = "1ji6hbgybb4gbgz5l5fis9midnvjbddzam8d63377rkzdyb3yz9f"; + }); + + # 4.8 + XSA_234_48 = (xsaPatch { + name = "234-4.8"; + sha256 = "08n1pf7z5y67dmay1ap39bi81clgkx82fpmfn7jsh8k4aw94jrsa"; + }); + + # 4.9 + XSA_234 = (xsaPatch { + name = "234-4.9"; + sha256 = "1znmxg432is0virw8321gax8zqq2zcmi2pc5p2j31sixylixsvzx"; + }); + + # 4.5 + XSA_235_45 = (xsaPatch { + name = "235-4.5"; + sha256 = "0hhgnql2gji111020z4wiyzg23wqs6ymanb67rg11p4qad1fp3ff"; + }); + + # 4.8 - 4.9 + XSA_235 = (xsaPatch { + name = "235-4.9"; + sha256 = "1rj4jkmh79wm30jq9f8x65qv3al8l91zc3m5s23q0x6abn3pfb9z"; + }); + + # 4.5 + XSA_236_45 = (xsaPatch { + name = "236-4.5"; + sha256 = "0hcla86x81wykssd2967gblp7fzx61290p4ls4v0hcyxdg2bs2yz"; + }); + + # 4.8 - 4.9 + XSA_236 = (xsaPatch { + name = "236-4.9"; + sha256 = "0vqxy7mgflga05l33j3488fwxmdw3p9yxj4ylhk9n3nw8id72ghq"; + }); + + # 4.5 + XSA_237_45 = [ + (xsaPatch { + name = "237-4.5/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "0hjxs20jhls4i0iph45a0qpw4znkm04gv74jmwhw84gy4hrhzq3b"; + }) + (xsaPatch { + name = "237-4.5/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "0ki8nmbc2g1l9wnqsph45a2k4c6dk5s7jvdlxg3zznyiyxjcv8yn"; + }) + (xsaPatch { + name = "237-4.5/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1hdz83qrjaqnihz8ji186dypxiblbfpgyb01j9m5alhk4whjqvp1"; + }) + (xsaPatch { + name = "237-4.5/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "0csdfn9kzn1k94pg3fcwsgqw14wcd4myi1jkcq5alj1fmkhw4wmk"; + }) + (xsaPatch { + name = "237-4.5/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "14b73rkvbkd1a2gh9kp0zrvv2d3kfwkiv24fg9agh4hrf2w3nx7y"; + }) + ]; + + # 4.8 + XSA_237_48 = [ + (xsaPatch { + name = "237-4.8/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "0qjisp37lwi2611mp7fbbm1s7m0bx726rrg79dnxs2mj0skw59iv"; + }) + (xsaPatch { + name = "237-4.8/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "05q1dny13jrqhjfwak7r635mqp9chpibjvn8b7d90japc1nzpq62"; + }) + (xsaPatch { + name = "237-4.8/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; + }) + (xsaPatch { + name = "237-4.8/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "06nrq0bx3p9ipab2r1why6qm4g32dj0x5q24hfkwc6ih0l9xwf8h"; + }) + (xsaPatch { + name = "237-4.8/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "1nbg7bjw2hv55gnkhf6chkh35va6brs08acq1d5jxncl6kv0amc1"; + }) + ]; + + # 4.9 + XSA_237 = [ + (xsaPatch { + name = "237-4.9/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device"; + sha256 = "1cbl24mqxa62h0wgsnrpcs6y6vs53znzj7g8dfsbmf74xwrd4px6"; + }) + (xsaPatch { + name = "237-4.9/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s"; + sha256 = "0p60148j18b78pxz0dx5ymh1gyrhg2cgmxq0jxmbk090bc4jql35"; + }) + (xsaPatch { + name = "237-4.9/0003-x86-MSI-disallow-redundant-enabling"; + sha256 = "1907lv8nb2zhpb6k6jlw4m0hm0n0lyd69vfr3wpzbc56dn0w7jqd"; + }) + (xsaPatch { + name = "237-4.9/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error"; + sha256 = "0q95z5641amni53agimnzbspva53p0hz5wl16zaz2yhnjasj5pzr"; + }) + (xsaPatch { + name = "237-4.9/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook"; + sha256 = "0bnqx9w7ppgx8wxj2zw09z0rkv1jzn3r0bd76cz0r22wz29fsdp2"; + }) + ]; + + # 4.5 + XSA_238_45 = (xsaPatch { + name = "238-4.5"; + sha256 = "1x2fg5vfv5jc084h5gjm6fq0nxjpzvi96px3sqzz4pvsvy4y4i1z"; + }); + + # 4.8 - 4.9 + XSA_238 = (xsaPatch { + name = "238"; + sha256 = "1cbmg1bi5ajh7qbwsl92ynaxw2c3p7i24p3wds81r4n93r0y5dxk"; + }); + + # 4.5 + XSA_239_45 = (xsaPatch { + name = "239-4.5"; + sha256 = "06bi8q3973yajxsdj7pcqarvb56q2gisxdiy0cpbyffbmpkfv3h6"; + }); + + # 4.8 - 4.9 + XSA_239 = (xsaPatch { + name = "239"; + sha256 = "1a9r8j7167s43ds5i7v7mm4y970vjnbhhkrjzpmzlcx8kcz96vh3"; + }); + + # 4.5 + XSA_240_45 = [ + (xsaPatch { + name = "240-4.5/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "0pmf10mbnmb88y7mly8s2l0j88cg0ayhkcnmj1zbjrkjmpccv395"; + }) + (xsaPatch { + name = "240-4.5/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "19f096ra3xndvzkjjasx73p2g25hfkm905px0p3yakwll0qzd029"; + }) + ]; + + # 4.8 + XSA_240_48 = [ + (xsaPatch { + name = "240-4.8/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "0m44qhhqk2pdwqg8g28pypqrylq6iw00k9qrzf6qd0iza2y42kgj"; + }) + (xsaPatch { + name = "240-4.8/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "1jd720wvngj9wq3fprdhakxvqlff0jd8zcx2pd3vsn2qvjbvr2gf"; + }) + ]; + + # 4.9 + XSA_240 = [ + (xsaPatch { + name = "240-4.9/0001-x86-limit-linear-page-table-use-to-a-single-level"; + sha256 = "1759ni80aifakm44g4cc6pnmbcn1xjic8j66fvj0vibm0wqk6xck"; + }) + (xsaPatch { + name = "240-4.9/0002-x86-mm-Disable-PV-linear-pagetables-by-default"; + sha256 = "0g6dpi006p5cjxw5d8h33p0429fdmdm6nqzj0m63ralpqvns3ib5"; + }) + ]; + + # 4.5 - 4.8 + XSA_241 = (xsaPatch { + name = "241-4.8"; + sha256 = "16zb75kzs98f4mdxhbyczk5mbh9dvn6j3yhfafki34x1dfdnq4pj"; + }); + + # 4.9 + XSA_241_49 = (xsaPatch { + name = "241-4.9"; + sha256 = "0xlhin7wkhmlnbp9mqcbq3q4drdwb5la482ja9nwkhi8i867p6wc"; + }); + + # 4.5 - 4.9 + XSA_242 = (xsaPatch { + name = "242-4.9"; + sha256 = "0yx3x0i2wybsm7lzdffxa2mm866bjl4ipbb9vipnw77dyg705zpr"; + }); + + # 4.5 + XSA_243_45 = [ + (xsaPatch { + name = "243-4.6-1"; + sha256 = "1cqanpyysa7px0j645z4jw9yqsvv6cbh7yq1b86ap134axfifcan"; + }) + (xsaPatch { + name = "243-4.5-2"; + sha256 = "0wbcgw4m0nzm2902jnda2020l7bd5adkq8j5myi1zmsfzbq03hwn"; + }) + ]; + + # 4.8 + XSA_243_48 = (xsaPatch { + name = "243-4.8"; + sha256 = "1q60zn55l9wpq45nrxh0av59sjz0jg8pkjm1gkyywkdsgg4fg5z4"; + }); + + # 4.9 + XSA_243 = (xsaPatch { + name = "243"; + sha256 = "06fnbnh9zlsbkqih9ipnb7a8gly54m7lp17d854j1r370ad3c4yg"; + }); + + # 4.5 + XSA_244_45 = (xsaPatch { + name = "244-4.5"; + sha256 = "05ci3vdl1ywfjpzcvsy1k52whxjk8pxzj7dh3r94yqasr56i5v2l"; + }); + + # 4.8 - 4.9 + XSA_244 = (xsaPatch { + name = "244"; + sha256 = "10308xsgmhb0vg6fk0ql8v94zifv6dcv6vkaicryfp405yj2rzkm"; + }); + + # 4.5 - 4.9 + XSA_245 = [ + (xsaPatch { + name = "245/0001-xen-page_alloc-Cover-memory-unreserved-after-boot-in"; + sha256 = "12brsgbn7xwakalsn10afykgqmx119mqg6vjj3v2b1pnmf4ss0w8"; + }) + (xsaPatch { + name = "245/0002-xen-arm-Correctly-report-the-memory-region-in-the-du"; + sha256 = "1k6z5r7wnrswsczn2j3a1mc4nvxqm4ydj6n6rvgqizk2pszdkqg8"; + }) + ]; +} diff --git a/pkgs/build-support/fetchbzr/builder.sh b/pkgs/build-support/fetchbzr/builder.sh index af1257d3688c..e424fd92d51e 100644 --- a/pkgs/build-support/fetchbzr/builder.sh +++ b/pkgs/build-support/fetchbzr/builder.sh @@ -4,6 +4,6 @@ header "exporting \`$url' (revision $rev) into \`$out'" # Perform a lightweight checkout so that we don't end up importing # all the repository's history. -bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" +BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url" stopNest diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix index d2faf9c0eee4..8dbe8990937e 100644 --- a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -1,5 +1,5 @@ { - stdenv, fetchFromGitHub, fetchurl, standardPatch, + stdenv, fetchFromGitHub, fetchpatch, standardPatch, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, kguiaddons, liblxqt, libqtxdg, lxqt-common, lxqt-globalkeys, libsysstat, @@ -50,9 +50,10 @@ stdenv.mkDerivation rec { ]; patches = [ - (fetchurl { + (fetchpatch { url = https://github.com/lxde/lxqt-panel/commit/ec62109e0fa678875a9b10fc6f1975267432712d.patch; - sha256 = "1ywwk8gb6gbvs8z9gwgsnb13z1jvyvjij349nq7ij6iyhyld0jlr"; + name = "fix-compile-explicit-keyword.patch"; + sha256 = "1grda0dw175kbsfq90lr5qaf79akwikzxw85jhd5f339nnramp81"; }) ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2b050dd613f5..7bb62e1ccd05 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -98,7 +98,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "1143qcsljp66v0xvq2a2nqji24890rnmxcmwnxw8xj818gqk0p3m"; + sha256 = "0iz0yz0bwkmpza5qahsxr9plg1ylmkv7znp1a8f0z65px7f300an"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8de2749004e5..93d8180bd0a7 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -37,7 +37,7 @@ core-packages: - ghcjs-base-0 default-package-overrides: - # LTS Haskell 9.10 + # LTS Haskell 9.11 - abstract-deque ==0.3 - abstract-deque-tests ==0.3 - abstract-par ==0.3.3 @@ -323,7 +323,7 @@ default-package-overrides: - bytestring-strict-builder ==0.4.5 - bytestring-tree-builder ==0.2.7.1 - bytestring-trie ==0.2.4.1 - - bzlib-conduit ==0.2.1.4 + - bzlib-conduit ==0.2.1.5 - c2hs ==0.28.2 - Cabal ==1.24.2.0 - cabal-dependency-licenses ==0.2.0.0 @@ -669,7 +669,7 @@ default-package-overrides: - expiring-cache-map ==0.0.6.1 - explicit-exception ==0.1.9 - exp-pairs ==0.1.5.2 - - extensible ==0.4.5 + - extensible ==0.4.6 - extensible-effects ==1.11.1.0 - extensible-exceptions ==0.1.1.4 - extra ==1.5.3 @@ -686,6 +686,7 @@ default-package-overrides: - fclabels ==2.0.3.2 - fdo-notify ==0.3.1 - feature-flags ==0.1.0.1 + - fedora-haskell-tools ==0.3 - feed ==0.3.12.0 - FenwickTree ==0.1.2.1 - fft ==0.1.8.6 @@ -790,7 +791,7 @@ default-package-overrides: - gi-soup ==2.4.14 - git ==0.2.0 - github ==0.16.0 - - github-release ==1.0.6 + - github-release ==1.0.7 - github-types ==0.2.1 - github-webhook-handler ==0.0.8 - github-webhook-handler-snap ==0.0.7 @@ -948,7 +949,7 @@ default-package-overrides: - haddock-api ==2.17.4 - haddock-library ==1.4.3 - haddock-test ==0.0.1 - - hailgun ==0.4.1.5 + - hailgun ==0.4.1.6 - hailgun-simple ==0.1.0.0 - hakyll ==4.9.8.0 - hakyll-favicon ==0.1.0 @@ -1024,12 +1025,12 @@ default-package-overrides: - hebrew-time ==0.1.1 - hedgehog ==0.5 - hedgehog-quickcheck ==0.1 - - hedis ==0.9.10 + - hedis ==0.9.11 - here ==1.2.11 - heredoc ==0.2.0.0 - heterocephalus ==1.0.5.0 - hex ==0.1.2 - - hexml ==0.3.2 + - hexml ==0.3.3 - hexpat ==0.20.13 - hexstring ==0.11.1 - hformat ==0.3.1.0 @@ -1090,8 +1091,8 @@ default-package-overrides: - hsebaysdk ==0.4.0.0 - hse-cpp ==0.2 - hsemail ==2 - - hset ==2.2.0 - HSet ==0.0.1 + - hset ==2.2.0 - hsexif ==0.6.1.4 - hs-GeoIP ==0.3 - hsignal ==0.2.7.5 @@ -1207,7 +1208,7 @@ default-package-overrides: - inline-c ==0.5.6.1 - inline-c-cpp ==0.1.0.0 - inline-java ==0.6.5 - - inline-r ==0.9.0.1 + - inline-r ==0.9.0.2 - insert-ordered-containers ==0.2.1.0 - instance-control ==0.1.2.0 - integer-logarithms ==1.0.2 @@ -1232,10 +1233,10 @@ default-package-overrides: - ip6addr ==0.5.3 - iproute ==1.7.1 - IPv6Addr ==1.0.1 - - IPv6DB ==0.2.2 + - IPv6DB ==0.2.3 - irc ==0.6.1.0 - irc-client ==0.4.4.4 - - irc-conduit ==0.2.2.3 + - irc-conduit ==0.2.2.4 - irc-ctcp ==0.1.3.0 - irc-dcc ==2.0.1 - islink ==0.1.0.0 @@ -1283,7 +1284,7 @@ default-package-overrides: - kraken ==0.0.3 - l10n ==0.1.0.1 - labels ==0.3.3 - - lackey ==0.4.3 + - lackey ==0.4.4 - lame ==0.1.1 - language-c ==0.6.1 - language-c-quote ==0.12.1 @@ -1349,7 +1350,7 @@ default-package-overrides: - lmdb ==0.2.5 - loch-th ==0.2.1 - log ==0.9.0.1 - - log-base ==0.7.3.0 + - log-base ==0.7.4.0 - log-domain ==0.11.2 - log-elasticsearch ==0.9.1.0 - logfloat ==0.13.3.3 @@ -1630,14 +1631,14 @@ default-package-overrides: - perf ==0.1.2 - persistable-record ==0.5.1.1 - persistable-types-HDBC-pg ==0.0.1.5 - - persistent ==2.7.0 + - persistent ==2.7.1 - persistent-mongoDB ==2.6.0 - - persistent-mysql ==2.6.1 + - persistent-mysql ==2.6.2.1 - persistent-mysql-haskell ==0.3.0.0 - - persistent-postgresql ==2.6.1 + - persistent-postgresql ==2.6.2 - persistent-redis ==2.5.2 - persistent-refs ==0.4 - - persistent-sqlite ==2.6.2 + - persistent-sqlite ==2.6.3 - persistent-template ==2.5.3 - pgp-wordlist ==0.1.0.2 - pg-transact ==0.1.0.1 @@ -1646,7 +1647,7 @@ default-package-overrides: - picoparsec ==0.1.2.3 - picosat ==0.1.4 - pid1 ==0.1.2.0 - - pinboard ==0.9.12.5 + - pinboard ==0.9.12.6 - pinch ==0.3.2.0 - pinchot ==0.24.0.0 - pipes ==4.3.6 @@ -1735,8 +1736,8 @@ default-package-overrides: - prompt ==0.1.1.2 - protobuf ==0.2.1.1 - protobuf-simple ==0.1.0.4 - - protocol-buffers ==2.4.4 - - protocol-buffers-descriptor ==2.4.4 + - protocol-buffers ==2.4.5 + - protocol-buffers-descriptor ==2.4.5 - proto-lens ==0.2.1.0 - proto-lens-arbitrary ==0.1.1.1 - proto-lens-combinators ==0.1.0.7 @@ -1752,7 +1753,7 @@ default-package-overrides: - publicsuffix ==0.20170508 - pure-io ==0.2.1 - pureMD5 ==2.1.3 - - purescript-bridge ==0.11.1.0 + - purescript-bridge ==0.11.1.1 - pusher-http-haskell ==1.2.0.1 - pwstore-fast ==2.4.4 - QuasiText ==0.1.2.6 @@ -1783,7 +1784,7 @@ default-package-overrides: - rank-product ==0.2.0.1 - Rasterific ==0.7.2.1 - rasterific-svg ==0.3.3 - - ratel ==0.3.5 + - ratel ==0.3.6 - ratel-wai ==0.2.0 - rattletrap ==2.5.0 - rawfilepath ==0.2.4 @@ -1852,7 +1853,7 @@ default-package-overrides: - result ==0.2.6.0 - rethinkdb ==2.2.0.10 - rethinkdb-client-driver ==0.0.25 - - retry ==0.7.4.2 + - retry ==0.7.4.3 - rev-state ==0.1.2 - rfc5051 ==0.1.0.3 - rng-utils ==0.2.1 @@ -1921,16 +1922,16 @@ default-package-overrides: - servant-mock ==0.8.2 - servant-purescript ==0.8.0.1 - servant-ruby ==0.2.1.0 - - servant-server ==0.11 + - servant-server ==0.11.0.1 - servant-static-th ==0.1.0.6 - servant-subscriber ==0.6.0.0 - servant-swagger ==1.1.3.1 - - servant-swagger-ui ==0.2.4.3.0.20 + - servant-swagger-ui ==0.2.4.3.4.0 - servant-yaml ==0.1.0.0 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - serversession-frontend-yesod ==1.0 - - servius ==1.2.0.2 + - servius ==1.2.0.3 - set-cover ==0.0.8 - setenv ==0.1.1.3 - setlocale ==1.0.0.5 @@ -2251,7 +2252,7 @@ default-package-overrides: - typography-geometry ==1.0.0.1 - tz ==0.1.3.0 - tzdata ==0.1.20170320.0 - - ua-parser ==0.7.4 + - ua-parser ==0.7.4.1 - uglymemo ==0.1.0.1 - unbound ==0.5.1 - unbounded-delays ==0.1.1.0 @@ -2357,7 +2358,7 @@ default-package-overrides: - wai-routes ==0.10.0 - wai-routing ==0.13.0 - wai-session ==0.3.2 - - wai-session-postgresql ==0.2.1.0 + - wai-session-postgresql ==0.2.1.1 - wai-slack-middleware ==0.2.0 - waitra ==0.0.4.0 - wai-transformers ==0.0.7 @@ -2802,6 +2803,7 @@ dont-distribute-packages: aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-tiled: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] affection: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3258,6 +3260,7 @@ dont-distribute-packages: cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-upload: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2arch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal2doap: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3409,6 +3412,7 @@ dont-distribute-packages: clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clang-compilation-database: [ i686-linux, x86_64-linux, x86_64-darwin ] clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3564,6 +3568,7 @@ dont-distribute-packages: Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] + conkin: [ i686-linux, x86_64-linux, x86_64-darwin ] conlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] Conscript: [ i686-linux, x86_64-linux, x86_64-darwin ] consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4229,6 +4234,7 @@ dont-distribute-packages: filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] + filepath-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] filepather: [ i686-linux, x86_64-linux, x86_64-darwin ] FilePather: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4335,7 +4341,9 @@ dont-distribute-packages: free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] + freelude: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4831,6 +4839,7 @@ dont-distribute-packages: haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-eigen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5020,6 +5029,7 @@ dont-distribute-packages: Hermes: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] hermit: [ i686-linux, x86_64-linux, x86_64-darwin ] + herms: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] herringbone: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5752,6 +5762,7 @@ dont-distribute-packages: karakuri: [ i686-linux, x86_64-linux, x86_64-darwin ] karps: [ i686-linux, x86_64-linux, x86_64-darwin ] katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] + katip-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5943,6 +5954,7 @@ dont-distribute-packages: libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] libvirt-hs: [ "x86_64-darwin" ] + libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libxml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5964,6 +5976,7 @@ dont-distribute-packages: linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -5988,6 +6001,7 @@ dont-distribute-packages: liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] + liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6129,6 +6143,7 @@ dont-distribute-packages: mandulia: [ i686-linux, x86_64-linux, x86_64-darwin ] mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] manifold-random: [ i686-linux, x86_64-linux, x86_64-darwin ] + manifolds-core: [ i686-linux, x86_64-linux, x86_64-darwin ] manifolds: [ i686-linux, x86_64-linux, x86_64-darwin ] mappy: [ i686-linux, x86_64-linux, x86_64-darwin ] marionetta: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6252,6 +6267,7 @@ dont-distribute-packages: mmtl: [ i686-linux, x86_64-linux, x86_64-darwin ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + modern-uri: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] modular-prelude-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6314,6 +6330,7 @@ dont-distribute-packages: mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] monoid-owns: [ i686-linux, x86_64-linux, x86_64-darwin ] + monoid-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] monoidplus: [ i686-linux, x86_64-linux, x86_64-darwin ] monoids: [ i686-linux, x86_64-linux, x86_64-darwin ] monte-carlo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6324,6 +6341,7 @@ dont-distribute-packages: morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + motor: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] movie-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6673,6 +6691,7 @@ dont-distribute-packages: paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + parameterized: [ i686-linux, x86_64-linux, x86_64-darwin ] paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -6877,6 +6896,7 @@ dont-distribute-packages: postgresql-typed-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] PostgreSQL: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] postmark-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7047,6 +7067,7 @@ dont-distribute-packages: rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] rails-session: [ i686-linux, x86_64-linux, x86_64-darwin ] rainbow-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + Raincat: [ i686-linux, x86_64-linux, x86_64-darwin ] raketka: [ i686-linux, x86_64-linux, x86_64-darwin ] rakhana: [ i686-linux, x86_64-linux, x86_64-darwin ] rakuten: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7175,6 +7196,7 @@ dont-distribute-packages: reify: [ i686-linux, x86_64-linux, x86_64-darwin ] relation: [ i686-linux, x86_64-linux, x86_64-darwin ] relational-postgresql8: [ i686-linux, x86_64-linux, x86_64-darwin ] + relational-record-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] remark: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7236,6 +7258,7 @@ dont-distribute-packages: rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] + rhine: [ i686-linux, x86_64-linux, x86_64-darwin ] rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] riak: [ i686-linux, x86_64-linux, x86_64-darwin ] RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7323,6 +7346,7 @@ dont-distribute-packages: safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] + sajson: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] saltine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7392,6 +7416,7 @@ dont-distribute-packages: sdl2-cairo-image: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-gfx: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdl2-mixer: [ i686-linux, x86_64-linux, x86_64-darwin ] sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -7762,6 +7787,7 @@ dont-distribute-packages: step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + STLinkUSB: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8354,6 +8380,7 @@ dont-distribute-packages: wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-make-assets: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-brotli: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8435,6 +8462,7 @@ dont-distribute-packages: WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] wild-bind-task-x11: [ "x86_64-darwin" ] + windns: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] winerror: [ i686-linux, x86_64-linux, x86_64-darwin ] winio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8450,6 +8478,7 @@ dont-distribute-packages: woffex: [ i686-linux, x86_64-linux, x86_64-darwin ] wolf: [ i686-linux, x86_64-linux, x86_64-darwin ] WordAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] + wordchoice: [ i686-linux, x86_64-linux, x86_64-darwin ] Wordlint: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -8509,6 +8538,7 @@ dont-distribute-packages: xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] xkbcommon: [ "x86_64-darwin" ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + xleb: [ i686-linux, x86_64-linux, x86_64-darwin ] xls: [ "x86_64-darwin" ] xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b9b9e75c859e..cc0d8deb1f53 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1835,8 +1835,8 @@ self: { }: mkDerivation { pname = "Blogdown"; - version = "0.2.2"; - sha256 = "18lxj5ka4jfaz1ig6x6qkdzlil99i3bcy4cqpbsccvyvhbax323c"; + version = "0.2.3"; + sha256 = "0xdlcx82nfm74n88fghbg5f6fnjvrajpsz52hrc4bl5afxx63bpx"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -2230,10 +2230,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "CSPM-CoreLanguage"; - version = "0.3.0.3"; - sha256 = "0vr6zpdz5lnpkyzwhig72pv8ncvqdjyp1nn76zpx3v6xlpzrs3q2"; + version = "0.3.1.0"; + sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a FDR-compatible CSP core-language"; + description = "Definition of a CSP core-language"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2243,8 +2243,8 @@ self: { }: mkDerivation { pname = "CSPM-FiringRules"; - version = "0.4.3.0"; - sha256 = "0rdggf00zq51j4af6rhk4ix8rbpd82piy2al4m6ymziwflv3b70m"; + version = "0.4.4.0"; + sha256 = "11j4f9za74x9f0l8jbf7mvjnmd6gyx02zb31jjrhza3y4hpcj412"; libraryHaskellDepends = [ base containers CSPM-CoreLanguage mtl parallel-tree-search QuickCheck random tree-monad @@ -2255,16 +2255,16 @@ self: { }) {}; "CSPM-Frontend" = callPackage - ({ mkDerivation, alex, array, base, containers, dlist, either - , ghc-prim, mtl, parsec2, prettyclass, syb, transformers + ({ mkDerivation, alex, array, base, containers, dlist, either, mtl + , parsec, prettyclass, syb, transformers }: mkDerivation { pname = "CSPM-Frontend"; - version = "0.10.0.0"; - sha256 = "0wmfk9givv604ajzkg60586lz08xqcx60bnqgslpfzkh458mz9z3"; + version = "0.12.1.0"; + sha256 = "17i5app854vb4mghf9l0laldbgraqbq08w36hh61j5n161ypb1s5"; libraryHaskellDepends = [ - array base containers dlist either ghc-prim mtl parsec2 prettyclass - syb transformers + array base containers dlist either mtl parsec prettyclass syb + transformers ]; libraryToolDepends = [ alex ]; description = "A CSP-M parser compatible with FDR-2.91"; @@ -2278,8 +2278,8 @@ self: { }: mkDerivation { pname = "CSPM-Interpreter"; - version = "0.7.0.0"; - sha256 = "0shf0bb4zqnxvclsavvxnsy697xbl5q1xjqww8makps6dirwk0qn"; + version = "0.7.1.0"; + sha256 = "01byczl4109mwmxflmnflxxh4pnfj4anqsfgng5q664a8rjzqfwy"; libraryHaskellDepends = [ array base containers CSPM-CoreLanguage CSPM-Frontend mtl prettyclass syb @@ -2290,15 +2290,13 @@ self: { }) {}; "CSPM-ToProlog" = callPackage - ({ mkDerivation, array, base, containers, CSPM-Frontend, ghc-prim - , pretty - }: + ({ mkDerivation, array, base, containers, CSPM-Frontend, pretty }: mkDerivation { pname = "CSPM-ToProlog"; - version = "0.5.2.0"; - sha256 = "0qy2zdxgdm9vacm2ickf1lvyj6wrcnpifaxgh25apg9j9v6g0h12"; + version = "0.5.5.0"; + sha256 = "1jr4q8jyai53g4yps1377q7wv9c52mg50yikycyirrpz46giiy2r"; libraryHaskellDepends = [ - array base containers CSPM-Frontend ghc-prim pretty + array base containers CSPM-Frontend pretty ]; description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; @@ -2308,22 +2306,22 @@ self: { "CSPM-cspm" = callPackage ({ mkDerivation, base, cmdargs, containers, CSPM-CoreLanguage , CSPM-FiringRules, CSPM-Frontend, CSPM-Interpreter, CSPM-ToProlog - , hslua, parallel, pretty, prettyclass, syb, transformers, xml + , hslua, parallel, prettyclass, syb, transformers, xml }: mkDerivation { pname = "CSPM-cspm"; - version = "0.8.0.0"; - sha256 = "1lhfq8gjls2g3xwskwa7vx1kj6n83b4msx4fc6769li4r2xn1bc9"; + version = "0.8.1.0"; + sha256 = "0brgzzhkqk8pvdniqwzcfwwr9v7y3kw3zdhsw053lxs0dcb191n0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; executableHaskellDepends = [ base cmdargs containers CSPM-CoreLanguage CSPM-FiringRules - CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty + CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel prettyclass syb transformers xml ]; description = "cspm command line tool for analyzing CSPM specifications"; @@ -6077,8 +6075,8 @@ self: { }: mkDerivation { pname = "GLUtil"; - version = "0.9.1.1"; - sha256 = "13536fari7askp70zp7arzbk16vwgz42lw7anwxnhi9gpq2hjy5y"; + version = "0.9.2"; + sha256 = "04k0i27igqzvxmyp2yy5gvd9agymmxwxnnkqxkiv0qjhk1kj8p8r"; libraryHaskellDepends = [ array base bytestring containers directory filepath hpp JuicyPixels linear OpenGL OpenGLRaw transformers vector @@ -9351,8 +9349,8 @@ self: { }: mkDerivation { pname = "Hastodon"; - version = "0.1.0"; - sha256 = "012b8f2jb297bnx7sgsvz0vw0ic0xmlrr0b7fs65y6ycll6ih2zw"; + version = "0.2.0"; + sha256 = "1ybchvkcv9n4wp8r4xassmgw1z0kdscmkccg3rbhz72lwp3m13zz"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types MissingH text ]; @@ -10258,36 +10256,6 @@ self: { }: mkDerivation { pname = "IPv6DB"; - version = "0.2.2"; - sha256 = "117qn9h25wi0q8nnj10yj33spqizcsf0inb7n4xpbccg60x9i51k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text - unordered-containers vector - ]; - executableHaskellDepends = [ - aeson base bytestring fast-logger hedis http-types IPv6Addr mtl - optparse-applicative text unordered-containers vector wai - wai-logger warp - ]; - testHaskellDepends = [ - aeson base hspec http-client http-types vector - ]; - homepage = "http://ipv6db.cybervisible.com"; - description = "A RESTful Web Service for IPv6-related data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "IPv6DB_0_2_3" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger - , hedis, hspec, http-client, http-types, IPv6Addr, mtl - , optparse-applicative, text, unordered-containers, vector, wai - , wai-logger, warp - }: - mkDerivation { - pname = "IPv6DB"; version = "0.2.3"; sha256 = "0j51v7y475wdrhjwrqrmlh6574l032vh7zsdhxqx723f7iswjimf"; isLibrary = true; @@ -12662,31 +12630,33 @@ self: { }) {}; "MutationOrder" = callPackage - ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, base, bimaps - , BiobaseXNA, bytestring, cereal, cereal-vector, cmdargs - , containers, deepseq, directory, DPutils, file-embed, filepath - , FormalGrammars, log-domain, parallel, PrimitiveArray + ({ mkDerivation, ADPfusion, ADPfusionSet, aeson, attoparsec, base + , bimaps, BiobaseXNA, bytestring, bytestring-trie, cereal + , cereal-vector, cmdargs, containers, deepseq, directory, DPutils + , errors, file-embed, filemanip, filepath, FormalGrammars, hashable + , lens, log-domain, mtl, OrderedBits, parallel, PrimitiveArray , PrimitiveArray-Pretty, QuickCheck, serialize-instances - , ShortestPathProblems, tasty, tasty-quickcheck, tasty-th, text - , unordered-containers, vector, vector-strategies + , ShortestPathProblems, split, tasty, tasty-quickcheck, tasty-th + , text, unordered-containers, vector, vector-strategies , ViennaRNA-bindings, zlib }: mkDerivation { pname = "MutationOrder"; - version = "0.0.0.2"; - sha256 = "0bzk2n84j2w1j11b8pi5505kdad3fzr4m86qwkwc9kmv2l25j680"; + version = "0.0.1.0"; + sha256 = "0zk0cwjapsinnadwk8ss5cv3g81c6cz1dcqq47g53bfi0m9aly9q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ADPfusion ADPfusionSet aeson base bimaps BiobaseXNA bytestring - cereal cereal-vector containers deepseq directory DPutils filepath - FormalGrammars log-domain parallel PrimitiveArray - PrimitiveArray-Pretty serialize-instances ShortestPathProblems text - unordered-containers vector vector-strategies ViennaRNA-bindings - zlib + ADPfusion ADPfusionSet aeson attoparsec base bimaps BiobaseXNA + bytestring bytestring-trie cereal cereal-vector containers deepseq + directory DPutils errors filemanip filepath FormalGrammars hashable + lens log-domain mtl OrderedBits parallel PrimitiveArray + PrimitiveArray-Pretty serialize-instances ShortestPathProblems + split text unordered-containers vector vector-strategies + ViennaRNA-bindings zlib ]; executableHaskellDepends = [ - base bytestring cmdargs file-embed filepath + base bytestring cmdargs directory errors file-embed filepath ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th vector @@ -15171,7 +15141,7 @@ self: { homepage = "http://raincat.bysusanlin.com/"; description = "A puzzle game written in Haskell with a cat in lead role"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Random123" = callPackage @@ -15872,6 +15842,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "STLinkUSB" = callPackage + ({ mkDerivation, base, binary, bytestring, transformers, usb + , vector + }: + mkDerivation { + pname = "STLinkUSB"; + version = "0.1.0"; + sha256 = "17rqwr9f0g9p4i7qw4gih1g7wj2y7d7bdma55warp82v0v996ypr"; + libraryHaskellDepends = [ + base binary bytestring transformers usb vector + ]; + description = "STLink USB interface in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "STMonadTrans" = callPackage ({ mkDerivation, array, base, Cabal, mtl }: mkDerivation { @@ -17478,8 +17464,8 @@ self: { }: mkDerivation { pname = "TeX-my-math"; - version = "0.201.0.0"; - sha256 = "0lrv0wybagc1zka9nq78qrdaygl4wbhkllw3w79cnmk1bagslxs4"; + version = "0.201.1.0"; + sha256 = "13rf0q74kk8lmgwfxicgf2d83b1jnvyq623pykm5z4g3cnap4nn4"; libraryHaskellDepends = [ base decimal-literals dumb-cas hashable haskell-src-meta HaTeX template-haskell text unordered-containers vector-space void @@ -18330,8 +18316,8 @@ self: { }: mkDerivation { pname = "Villefort"; - version = "0.1.1.14"; - sha256 = "020ialav8dxbzkyra8sjip397l50j7d3gy3m44jf4wgiyk3d9jpj"; + version = "0.1.2.1"; + sha256 = "1iabmpf31vb493xp8ypmai15ld4jbf0zchjnmf6hwfs58w92v27d"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -18674,14 +18660,14 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; - "Win32_2_6_0_0" = callPackage + "Win32_2_6_1_0" = callPackage ({ mkDerivation, advapi32, base, bytestring, filepath, gdi32, imm32 , msimg32, shell32, shfolder, shlwapi, unbuildable, user32, winmm }: mkDerivation { pname = "Win32"; - version = "2.6.0.0"; - sha256 = "1swrahwg89c6001cprzfx9fi64kndzmfvwbr34k2f00izv39fn6l"; + version = "2.6.1.0"; + sha256 = "1qwwznnnqnr6zqvjzwr35bkvzrvjf7v90j4qkhinzs8p0yx4b97b"; libraryHaskellDepends = [ base bytestring filepath unbuildable ]; librarySystemDepends = [ advapi32 gdi32 imm32 msimg32 shell32 shfolder shlwapi user32 winmm @@ -19856,6 +19842,8 @@ self: { pname = "accelerate-blas"; version = "0.1.0.1"; sha256 = "0rjcga34ipml402gikwvdxnpdjrmh9vnhd8wvcv109gs1ih6pafd"; + revision = "2"; + editedCabalFile = "1bxh38hyn7lq73z1dqg8rsbdblvy3551lp08jlm2h8p9b8bsriia"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -21980,6 +21968,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "aeson-tiled" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, hspec, text + , vector + }: + mkDerivation { + pname = "aeson-tiled"; + version = "0.0.0.1"; + sha256 = "147rm19czz8bvzmjj4mmcvjyz02mr3cisyprzdfpx1q5msi7aghk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers text vector + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ aeson base hspec ]; + homepage = "https://github.com/schell/aeson-tiled#readme"; + description = "Aeson instances for the Tiled map editor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "aeson-toolkit" = callPackage ({ mkDerivation, aeson, base, bytestring, failure, hspec, text }: mkDerivation { @@ -22426,8 +22435,8 @@ self: { }: mkDerivation { pname = "aivika"; - version = "5.3"; - sha256 = "0apx1i3v5p416wa9d0s8qacras3p137f9djbyv5miz5n7yhmlfi3"; + version = "5.3.1"; + sha256 = "1qgccxz77fa3j6vakg14z81wqw3259zrgg3xvfmrizshxnp1vh54"; libraryHaskellDepends = [ array base binary containers deepseq mtl mwc-random random vector ]; @@ -22459,8 +22468,8 @@ self: { }: mkDerivation { pname = "aivika-distributed"; - version = "0.7.4.2"; - sha256 = "12igx82kzbsg9zick5r9nai2zdds33pkfgp0zm9kdr4a04qz58z1"; + version = "0.8"; + sha256 = "1ggr95d6na41sllnz6a8lnscb63v04b8x466hw6658r8vxai0560"; libraryHaskellDepends = [ aivika aivika-transformers base binary containers distributed-process exceptions mtl mwc-random random stm time @@ -22558,15 +22567,16 @@ self: { }) {}; "aivika-lattice" = callPackage - ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl - , mwc-random, random + ({ mkDerivation, aivika, aivika-transformers, array, base + , containers, mtl, mwc-random, random }: mkDerivation { pname = "aivika-lattice"; - version = "0.3"; - sha256 = "1770w2jbfyvcrdsvlh00l7861ckxk37yk4qc27fmigd060gbz552"; + version = "0.4"; + sha256 = "0fczcyg9bmijjwzh4x2kgs5q0x5swz17b51cv298ka4cmbqbhmgv"; libraryHaskellDepends = [ - aivika aivika-transformers base containers mtl mwc-random random + aivika aivika-transformers array base containers mtl mwc-random + random ]; homepage = "http://www.aivikasoft.com"; description = "Nested discrete event simulation module for the Aivika library using lattice"; @@ -25249,7 +25259,6 @@ self: { ]; description = "Generic Haskell AMQP Consumer"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -26130,25 +26139,25 @@ self: { "apiary" = callPackage ({ mkDerivation, aeson, base, blaze-builder, blaze-html - , blaze-markup, bytestring, bytestring-read, case-insensitive - , data-default-class, directory, exceptions, hashable, http-date - , http-types, HUnit, mime-types, monad-control, mtl, process - , resourcet, stringsearch, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, time, transformers, transformers-base - , types-compat, unix-compat, unordered-containers, vault, wai - , wai-extra, web-routing + , blaze-markup, bytestring, bytestring-lexing, case-insensitive + , data-default-class, directory, exceptions, ghc-prim, hashable + , hetero-dict, http-date, http-types, HUnit, mime-types + , monad-control, mtl, primitive, process, resourcet, stringsearch + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , time, transformers, transformers-base, unix-compat + , unordered-containers, vault, wai, wai-extra }: mkDerivation { pname = "apiary"; - version = "2.0.2"; - sha256 = "155mkd7fdy32vhpl3njwa4v5r720w1y436i3laz9nysxnjaqk85r"; + version = "2.1.2"; + sha256 = "03b3rhjpjfinj1xnkngipz09d1j1dijy25s0z0a5mvygahlf9kvc"; libraryHaskellDepends = [ aeson base blaze-builder blaze-html blaze-markup bytestring - bytestring-read case-insensitive data-default-class exceptions - hashable http-date http-types mime-types monad-control mtl process - resourcet stringsearch template-haskell text time transformers - transformers-base types-compat unix-compat unordered-containers - vault wai wai-extra web-routing + bytestring-lexing case-insensitive data-default-class exceptions + ghc-prim hashable hetero-dict http-date http-types mime-types + monad-control mtl primitive process resourcet stringsearch + template-haskell text time transformers transformers-base + unix-compat unordered-containers vault wai wai-extra ]; testHaskellDepends = [ aeson base bytestring directory http-types HUnit mtl tasty @@ -26164,18 +26173,16 @@ self: { ({ mkDerivation, apiary, apiary-session, authenticate, base , blaze-builder, bytestring, cereal, data-default-class , http-client, http-client-tls, http-types, monad-control - , resourcet, text, types-compat, wai, web-routing + , resourcet, text, wai }: mkDerivation { pname = "apiary-authenticate"; - version = "1.4.0"; - sha256 = "01yivdslscbri4gy19mma794v9v2gnf94wlvms8p1flrcw6xpns0"; - revision = "5"; - editedCabalFile = "0jndacr6vcnh14d7bd10v9jl2qcpzfwr223j7x1f6zza70r2p5rl"; + version = "1.5.1"; + sha256 = "0j28iv0am45a104cpc6jd1gv1j7nqwbjji892d0q9g90wlf2r5p8"; libraryHaskellDepends = [ apiary apiary-session authenticate base blaze-builder bytestring cereal data-default-class http-client http-client-tls http-types - monad-control resourcet text types-compat wai web-routing + monad-control resourcet text wai ]; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; @@ -26190,10 +26197,8 @@ self: { }: mkDerivation { pname = "apiary-clientsession"; - version = "1.4.0"; - sha256 = "1z96c4zfyyvrihr1al9zp6pwv4wxkfq02a1z63bxxrrfglrs3fx6"; - revision = "3"; - editedCabalFile = "06kcmwm1mrvqmbl510ni2j1rdsrzhs81xsjia5wlyhn4jr4192ag"; + version = "1.5.1"; + sha256 = "1cxxc3nn05k2v0mr2lnhhjwigykx5jws23mik3znq259r18wjjk7"; libraryHaskellDepends = [ apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault @@ -26206,17 +26211,14 @@ self: { "apiary-cookie" = callPackage ({ mkDerivation, apiary, base, blaze-builder, blaze-html - , bytestring, cookie, time, types-compat, wai, web-routing + , bytestring, cookie, time, wai }: mkDerivation { pname = "apiary-cookie"; - version = "1.4.0"; - sha256 = "017bxqavv4w5r2ghgmyhljqa4fyzl02v2sjwxi056s3phgrlrkrx"; - revision = "4"; - editedCabalFile = "0qc5nzjak8zb5i3kavz7hi1qy6ywalsrgj2wrxdb53jwac76gigc"; + version = "1.5.1"; + sha256 = "1lci1vim94nk3ah72wa9iy1vza3gnf3c05jp10bnv0khy131mghy"; libraryHaskellDepends = [ - apiary base blaze-builder blaze-html bytestring cookie time - types-compat wai web-routing + apiary base blaze-builder blaze-html bytestring cookie time wai ]; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; @@ -26228,10 +26230,8 @@ self: { ({ mkDerivation, apiary, base, blaze-builder, wai-extra }: mkDerivation { pname = "apiary-eventsource"; - version = "1.4.0"; - sha256 = "0xh1pm1l59n4c48vbk3ls42fxh4lzr6p8k8rmij1hl58zrkgbjd7"; - revision = "2"; - editedCabalFile = "15fc0hdrcic1nk62znn3dcq6dp00d0msl38kb7pdapvkpnyh1z0g"; + version = "1.5.1"; + sha256 = "0dkvj03ay44m49pmm96y9nvyqlrw91kyw0pzm6wraspagbvs57nm"; libraryHaskellDepends = [ apiary base blaze-builder wai-extra ]; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; @@ -26281,18 +26281,15 @@ self: { "apiary-logger" = callPackage ({ mkDerivation, apiary, base, data-default-class, fast-logger , lifted-base, monad-control, monad-logger, transformers - , transformers-base, types-compat + , transformers-base }: mkDerivation { pname = "apiary-logger"; - version = "1.4.0"; - sha256 = "0pf030sn4mf05avl11hs9kz6qi9667s2vavn3wsxp1anl9bghk48"; - revision = "4"; - editedCabalFile = "1qs3fxaiybyb4g9d4w393yxwsxr4b6wzg5va7qmlqpcavr9l1224"; + version = "1.5.1"; + sha256 = "19a8qiv0dygxmznjpr46s3wihryi83qj6d12nzr7d0n7j36ja2d8"; libraryHaskellDepends = [ apiary base data-default-class fast-logger lifted-base monad-control monad-logger transformers transformers-base - types-compat ]; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; @@ -26323,17 +26320,15 @@ self: { "apiary-mongoDB" = callPackage ({ mkDerivation, apiary, base, bson, data-default-class , lifted-base, monad-control, mongoDB, resource-pool, text, time - , transformers, types-compat + , transformers }: mkDerivation { pname = "apiary-mongoDB"; - version = "1.4.0"; - sha256 = "1srnkyw1i0vjarwqg13cmnwc0x0ab5m8scax9wd4scsmblpa75wd"; - revision = "2"; - editedCabalFile = "1pk0axkr5zrlbyqskznh050ahvpnccdpa0ixfn3i5sw26nnva4ny"; + version = "1.5.1"; + sha256 = "1liiyk2w2v18455ydbxz7k5d58f29sgmlagxikkgsplbdm3m5mz0"; libraryHaskellDepends = [ apiary base bson data-default-class lifted-base monad-control - mongoDB resource-pool text time transformers types-compat + mongoDB resource-pool text time transformers ]; homepage = "https://github.com/philopon/apiary"; description = "mongoDB support for apiary web framework"; @@ -26344,18 +26339,15 @@ self: { "apiary-persistent" = callPackage ({ mkDerivation, apiary, apiary-logger, base, monad-control , monad-logger, persistent, resource-pool, resourcet, transformers - , transformers-base, types-compat, web-routing + , transformers-base }: mkDerivation { pname = "apiary-persistent"; - version = "1.4.0"; - sha256 = "00jaiykbxj1lh8qgv4y0ma9awaj1ymrjskwr9ra5pmka1mrwbih9"; - revision = "3"; - editedCabalFile = "17i3l8aj2k1hzlmyf2h4jl5savbrdvnvz2i8riwcmwfqgnmcfdc2"; + version = "1.5.1"; + sha256 = "03vd0vjz72dd8ngi5n9dziplpxdysql5gxgiqfn825fzc75c9pn4"; libraryHaskellDepends = [ apiary apiary-logger base monad-control monad-logger persistent - resource-pool resourcet transformers transformers-base types-compat - web-routing + resource-pool resourcet transformers transformers-base ]; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; @@ -26385,16 +26377,12 @@ self: { }) {}; "apiary-session" = callPackage - ({ mkDerivation, apiary, base, types-compat, wai, web-routing }: + ({ mkDerivation, apiary, base, wai }: mkDerivation { pname = "apiary-session"; - version = "1.4.0"; - sha256 = "0jnppjykcrzdvlsli2ycyc11874dfqhwayny5p3x8nx9hnwxhk23"; - revision = "3"; - editedCabalFile = "04yrlp26dbhhybqvviajmd85vrcdbscmbw4nmag32wfnz5xdb0qr"; - libraryHaskellDepends = [ - apiary base types-compat wai web-routing - ]; + version = "1.5.0"; + sha256 = "01z4r0sfm562wssfpqs3yzgwrprh8jzp0xsck4z099pwjknfi4i4"; + libraryHaskellDepends = [ apiary base wai ]; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -26402,18 +26390,12 @@ self: { }) {}; "apiary-websockets" = callPackage - ({ mkDerivation, apiary, base, wai-websockets, web-routing - , websockets - }: + ({ mkDerivation, apiary, base, wai-websockets, websockets }: mkDerivation { pname = "apiary-websockets"; - version = "1.4.0"; - sha256 = "0nslzy0s24jn58jd1q4z2gf0h7n1y2xks7cw86i9ybdph697wpp1"; - revision = "2"; - editedCabalFile = "1s8mpk1h6a6yxmwivclawwn20s2zs094cvbphl8ymil8mm505n3j"; - libraryHaskellDepends = [ - apiary base wai-websockets web-routing websockets - ]; + version = "1.5.0"; + sha256 = "0z43lqjz51r3mw92drjkrl3m8na7ldick76vqas0dr17v1d4qdsw"; + libraryHaskellDepends = [ apiary base wai-websockets websockets ]; homepage = "https://github.com/philopon/apiary"; description = "websockets support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -28914,8 +28896,8 @@ self: { ({ mkDerivation, attoparsec, base, ip }: mkDerivation { pname = "attoparsec-ip"; - version = "0.0.0"; - sha256 = "08hgjmi9nlgg9qavsh5sl0s52yzh7vk6c933dgx9k16vk456r2y4"; + version = "0.0.1"; + sha256 = "0aananvfa7h9d73yf1c69zw5b3s3m67qhfmfrzdbifw3wj5cm9cd"; libraryHaskellDepends = [ attoparsec base ip ]; testHaskellDepends = [ base ]; homepage = "https://github.com/athanclark/attoparsec-ip#readme"; @@ -29074,8 +29056,8 @@ self: { }: mkDerivation { pname = "attoparsec-uri"; - version = "0.0.2"; - sha256 = "096w3zb9a0fcqcnzl7lb9n27hgbaj6f5n93vll7rih972657h0my"; + version = "0.0.3"; + sha256 = "1n89gkgnd8zp7ggklv98y58hk3f45l20wr3m1avcpk9a42ig186n"; libraryHaskellDepends = [ attoparsec attoparsec-ip base bytedump ip strict text vector ]; @@ -34841,6 +34823,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bizzlelude-js" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "bizzlelude-js"; + version = "1.0.4"; + sha256 = "1wp1542cjcypz339f9b5qxcgf1ppilbxgi8861s5d9p89zrgimij"; + libraryHaskellDepends = [ base containers text ]; + homepage = "http://github.com/TheBizzle"; + description = "A lousy Prelude replacement by a lousy dude"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bk-tree" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -35993,8 +35987,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.10.0.0"; - sha256 = "1f7vfh9pcg6za8rcdpq1lbvyn2z7plcb70d5r1xj330akvl626jw"; + version = "0.10.1.0"; + sha256 = "024qd9dmgqsa3q5xykc0bbvgay9hp9qwl9xixkgjpa5li68rd54c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -36184,8 +36178,8 @@ self: { ({ mkDerivation, base, bytestring, HUnit }: mkDerivation { pname = "boolean-list"; - version = "0.1.0.1"; - sha256 = "0xz0p3simx0vzvpjcmlqw7hnx0v3fiz25q8d9n7iw6z72c1920mc"; + version = "0.1.0.2"; + sha256 = "1vqn1igmsgq6nry9bpz5vhggbm3j8kc3p6d6wy16nf94z10nq3qs"; libraryHaskellDepends = [ base bytestring HUnit ]; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; @@ -37140,6 +37134,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "buffer"; + version = "0.5.0.1"; + sha256 = "09dwscqkdppmiprz8k0rfxkwf7qd8b6md8iviqmxw3wamm9qx7dl"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/buffer"; + description = "Simple mutable low-level buffer for IO"; + license = stdenv.lib.licenses.mit; + }) {}; + "buffer-builder" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances @@ -37494,8 +37508,8 @@ self: { }: mkDerivation { pname = "bustle"; - version = "0.6.1"; - sha256 = "18qg8fwmdq0lrfz7gyyzv6f4ch24sm925ykxb68rr996wxnmlbm2"; + version = "0.6.2"; + sha256 = "099awz60hp9bpc8d27zkb3vm8r5bqp2y358drj6bzas5gqlg67bf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -38132,8 +38146,8 @@ self: { }: mkDerivation { pname = "bzlib-conduit"; - version = "0.2.1.4"; - sha256 = "07gxnbr65pl70lssgcxbajc0id9x4p3p8mc0hfi9lgf8rh270w1d"; + version = "0.2.1.5"; + sha256 = "1bv78qr6fbf6lg1dx06g3r2904fjnpvb87mlqv6np2kpyzjc11an"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bindings-DSL bytestring conduit conduit-extra data-default mtl @@ -39107,6 +39121,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "cabal-toolkit" = callPackage + ({ mkDerivation, base, binary, bytestring, Cabal, containers + , template-haskell + }: + mkDerivation { + pname = "cabal-toolkit"; + version = "0.0.1"; + sha256 = "0rlr2zcm4pmiknw7z4jgn1n1wd9wr056g5hbv7jcr3l709b1753j"; + libraryHaskellDepends = [ + base binary bytestring Cabal containers template-haskell + ]; + homepage = "https://github.com/TerrorJack/cabal-toolkit#readme"; + description = "Helper functions for writing custom Setup.hs scripts."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-uninstall" = callPackage ({ mkDerivation, base, directory, filepath, mtl, process }: mkDerivation { @@ -42191,8 +42222,8 @@ self: { }: mkDerivation { pname = "chatwork"; - version = "0.1.1.2"; - sha256 = "050a0vhv59svdgja4lc8jxcyxqbrd9zr14hwbrnk7hzk9dxvd0wz"; + version = "0.1.1.3"; + sha256 = "0g7995g5i49mxd0qhdb2l1l1yz047yqwnmzk9f6xvqv5fqy5c6p5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42378,6 +42409,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "checkers_0_4_9" = callPackage + ({ mkDerivation, array, base, QuickCheck, random, semigroupoids }: + mkDerivation { + pname = "checkers"; + version = "0.4.9"; + sha256 = "1vpyyhvq1xkq8pxz2xpmw14yldn8ks95zaijpqxdzsmq4v3sy83a"; + libraryHaskellDepends = [ + array base QuickCheck random semigroupoids + ]; + description = "Check properties on standard classes and data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "checkmate" = callPackage ({ mkDerivation, base, bytestring, containers, diff-parse , directory, file-embed, filepath, github, hlint, hspec @@ -42676,13 +42721,14 @@ self: { }) {}; "chronologique" = callPackage - ({ mkDerivation, base, hourglass, hspec, QuickCheck, time }: + ({ mkDerivation, base, hourglass, hspec, QuickCheck, time, vector + }: mkDerivation { pname = "chronologique"; - version = "0.2.1.0"; - sha256 = "13lrngxfbsfsmqph8slh8zn7hvvihbwzc6cna315kjzhi3a3mwbm"; - libraryHaskellDepends = [ base hourglass time ]; - testHaskellDepends = [ base hourglass hspec QuickCheck ]; + version = "0.3.0.0"; + sha256 = "1pgggmsmb3ah15iqkib9d9ms0vs4j3945a7mbih0zra4xha39dg9"; + libraryHaskellDepends = [ base hourglass time vector ]; + testHaskellDepends = [ base hourglass hspec QuickCheck vector ]; description = "Time to manipulate time"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -42690,16 +42736,16 @@ self: { "chronos" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, hashable , HUnit, primitive, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, vector + , test-framework-hunit, test-framework-quickcheck2, text, torsor + , vector }: mkDerivation { pname = "chronos"; - version = "0.4"; - sha256 = "0lc7qb1ky15sxmvndfjcmmy6j913ncnzq0hjx9mbqljvg7di0yal"; - revision = "1"; - editedCabalFile = "1mk6kn0gs7azv7c9bcal8k6zzlpska0x9akk91la2xvg298sy6a5"; + version = "1.0"; + sha256 = "135fb54lac1rqb7ql0810f22a41whmswckhjbmb1xysryv0gv05k"; libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive text vector + aeson attoparsec base bytestring hashable primitive text torsor + vector ]; testHaskellDepends = [ attoparsec base bytestring HUnit QuickCheck test-framework @@ -43390,6 +43436,7 @@ self: { homepage = "https://github.com/lambdageek/clang-compilation-database"; description = "JSON Compilation Database Format encoding and decoding"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clang-pure" = callPackage @@ -45306,8 +45353,8 @@ self: { ({ mkDerivation, array, base, bytestring, text }: mkDerivation { pname = "cndict"; - version = "0.8.2"; - sha256 = "0pc6rph99mxy5cbrxrysxq5q01vn2k2ax3c00pv9sw7inn4inh0p"; + version = "0.8.3"; + sha256 = "1vci3z74jsxfhbbz122mcbcdh6n2371i0l803vgd8ndzawhs13m4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base bytestring text ]; homepage = "https://github.com/Lemmih/cndict"; @@ -46019,8 +46066,8 @@ self: { }: mkDerivation { pname = "colour-space"; - version = "0.1.3.0"; - sha256 = "06ainna4nrqd9an0s0hvcrqw18g55v0fqw4a6p00g5kw53729qyq"; + version = "0.1.4.0"; + sha256 = "0sr341chqhngm7ihyy3ym3w345sk101gznw80iksjwxjg3iiqxmq"; libraryHaskellDepends = [ base colour constrained-categories JuicyPixels linear linearmap-category manifolds semigroups vector-space @@ -47471,6 +47518,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "concurrent-buffer" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, criterion + , quickcheck-instances, rerebase, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "concurrent-buffer"; + version = "0.1"; + sha256 = "0qrnsp98x42blvngixm9wzk9cnwk335s5axslwrl6hq8pawx2ycd"; + libraryHaskellDepends = [ base base-prelude bug bytestring ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ bug criterion rerebase ]; + homepage = "https://github.com/nikita-volkov/concurrent-buffer"; + description = "Concurrent expanding buffer"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-dns-cache" = callPackage ({ mkDerivation, array, async, base, bytestring, containers, dns , hspec, iproute, lifted-base, monad-control, network, psqueues @@ -48565,6 +48632,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "conkin" = callPackage + ({ mkDerivation, base, data-default, doctest, markdown-unlit + , pretty-show + }: + mkDerivation { + pname = "conkin"; + version = "1.0.2"; + sha256 = "1843mlmf09jgdj6hd7jzn81pwd4biimrc4rxaki9s2df2qd2zr6r"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default doctest markdown-unlit pretty-show + ]; + homepage = "http://github.com/rampion/conkin"; + description = "Tools for functors from Hask^k to Hask"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "conlogger" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -50806,8 +50891,8 @@ self: { }: mkDerivation { pname = "creatur"; - version = "5.9.20"; - sha256 = "08cvagp0v98s8x99cdq86yk1i33fcpgxq3zdm414lf6cpjq80qa1"; + version = "5.9.23"; + sha256 = "04f66vjl1bpfgsf0j5dpz7wjvkvw22ia0f1d375mzhp5xmv4qw46"; libraryHaskellDepends = [ array base binary bytestring cereal cond directory exceptions filepath gray-extended hdaemonize hsyslog MonadRandom mtl @@ -51872,8 +51957,8 @@ self: { }: mkDerivation { pname = "cryptoids"; - version = "0.3.0.0"; - sha256 = "1n8mr80n1hmld02n1a97nsxh3x8fmnqmbpnnvjawkq1mj768nbc4"; + version = "0.4.0.0"; + sha256 = "1km63vgckjsxxrkd45w7c5gc3d5hk6dg6f0y4z4c8wajz4ddp1a3"; libraryHaskellDepends = [ base binary bytestring cryptoids-types cryptonite directory exceptions filepath memory @@ -52565,8 +52650,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.8.0.0"; - sha256 = "0zlasd6c3da462qaffj9z44546551b2cvs0wv0f23739x4i929z9"; + version = "0.8.0.1"; + sha256 = "0raaydjcnicg38kxy1mjpxb0k57q5nnzb7p38i8x5ify30bzxw0w"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -54183,14 +54268,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse_1_2_0_2" = callPackage + "data-diverse_1_2_0_3" = callPackage ({ mkDerivation, base, containers, criterion, deepseq, ghc-prim , hspec, tagged }: mkDerivation { pname = "data-diverse"; - version = "1.2.0.2"; - sha256 = "0h0wifwckybn0py6xndaj1fp0sld28aca4qgclw07qsyfd9rnc9x"; + version = "1.2.0.3"; + sha256 = "0mc9xzh0hja8zvgwnfa65hdwirqzggbw1k07fspgzs699wj9dh6r"; libraryHaskellDepends = [ base containers deepseq ghc-prim tagged ]; @@ -54215,13 +54300,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-diverse-lens_0_5_0_0" = callPackage - ({ mkDerivation, base, data-diverse, hspec, lens, tagged }: + "data-diverse-lens_0_5_1_0" = callPackage + ({ mkDerivation, base, data-diverse, hspec, lens, profunctors + , tagged + }: mkDerivation { pname = "data-diverse-lens"; - version = "0.5.0.0"; - sha256 = "1can16ndkff8c3dfn585hdbg8zw805icax01hfm0ys3rvypwn4vq"; - libraryHaskellDepends = [ base data-diverse lens tagged ]; + version = "0.5.1.0"; + sha256 = "0c1hrz9b8a01vphfqmlfgx3mh6ci8hd5wwr8iwpkv6z7ps7sp9kd"; + libraryHaskellDepends = [ + base data-diverse lens profunctors tagged + ]; testHaskellDepends = [ base data-diverse hspec lens tagged ]; homepage = "https://github.com/louispan/data-diverse-lens#readme"; description = "Isos & Lens for Data.Diverse.Many and Prisms for Data.Diverse.Which"; @@ -56941,18 +57030,17 @@ self: { hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "dejafu_0_9_0_0" = callPackage + "dejafu_0_9_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions - , leancheck, mtl, random, ref-fd, semigroups, transformers - , transformers-base + , leancheck, random, ref-fd, transformers, transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.9.0.0"; - sha256 = "0n2qj6kaldg006pjz5aj0wjigr3dd7vgbl35fgsz3fx9j64ydi72"; + version = "0.9.0.1"; + sha256 = "18i21basz8d50axa1ccgz9djghd95iazv4k7x499fff1nak39147"; libraryHaskellDepends = [ - base concurrency containers deepseq exceptions leancheck mtl random - ref-fd semigroups transformers transformers-base + base concurrency containers deepseq exceptions leancheck random + ref-fd transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Systematic testing for Haskell concurrency"; @@ -57448,16 +57536,20 @@ self: { }) {}; "derive-topdown" = callPackage - ({ mkDerivation, base, mtl, primitive, syb, template-haskell - , th-expand-syns, transformers + ({ mkDerivation, base, binary, derive, haskell-src, mtl, primitive + , QuickCheck, syb, template-haskell, th-expand-syns, transformers }: mkDerivation { pname = "derive-topdown"; - version = "0.0.0.7"; - sha256 = "1r566bcp0qqwwbndwbbfnczxwmlyl9dfnsysnija7v8fn46z30ni"; + version = "0.0.0.9"; + sha256 = "0jvmdwd1dif8hxb45s2fw96pca1hm41p5cac68in1pkpsvq7z6cf"; libraryHaskellDepends = [ base mtl primitive syb template-haskell th-expand-syns transformers ]; + testHaskellDepends = [ + base binary derive haskell-src mtl primitive QuickCheck syb + template-haskell th-expand-syns transformers + ]; homepage = "https://github.com/HaskellZhangSong/derive-topdown"; description = "Help Haskellers derive class instances for composited data types"; license = stdenv.lib.licenses.bsd3; @@ -59671,8 +59763,8 @@ self: { }: mkDerivation { pname = "diskhash"; - version = "0.0.2.1"; - sha256 = "1kgjwcggi33jw1k1s462cya6hydcz7ka9pkqk2lgdcxwlw9fy9kb"; + version = "0.0.2.3"; + sha256 = "08g484knhw96mlk5qa6cx1cm9kblxrz8979c9xcvmidgj44phb8z"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring directory HUnit QuickCheck test-framework @@ -61379,15 +61471,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dotenv_0_5_1_0" = callPackage + "dotenv_0_5_1_1" = callPackage ({ mkDerivation, base, base-compat, exceptions, hspec , hspec-megaparsec, megaparsec, optparse-applicative, process, text , transformers }: mkDerivation { pname = "dotenv"; - version = "0.5.1.0"; - sha256 = "1cgx9q8gdfvkv3vr10yafa0vls2iil5kr5nqdbn4n9xf8m5p3dn1"; + version = "0.5.1.1"; + sha256 = "1i4892xc2d05qnswcyf40ww5idjd1m3wwqz9wxwhph1jqzvsgc9b"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -62332,15 +62424,14 @@ self: { }: mkDerivation { pname = "dumb-cas"; - version = "0.1.0.0"; - sha256 = "0jrxphgxm6f7wzrn8vzfz0i6scz2xz72yja5i2bmkf185gqvhpjz"; - revision = "1"; - editedCabalFile = "0wzq73i209fa8apj34lc851cgg6047kimxkl9ykv8l9nspg22faq"; + version = "0.1.1.0"; + sha256 = "1crzw0axgamjhxrm2ggdqw45jw80avp227bwc1v0c7lmb4cmkr3p"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers ]; testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/leftaroundabout/dumb-cas"; description = "A computer “algebra” system that knows nothing about algebra, at the core"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -62388,8 +62479,8 @@ self: { ({ mkDerivation, base, transformers, transformers-base }: mkDerivation { pname = "dunai"; - version = "0.1.1.0"; - sha256 = "1smzf6m5l2ma500r9d51iia994lq8wvq2ryf3gijz3fyll6f5ibn"; + version = "0.2.0.0"; + sha256 = "1h6rw4h300hbmv05immhzxzf5yb9kc5zsykifdysi40l4fbx7rkc"; libraryHaskellDepends = [ base transformers transformers-base ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; @@ -62951,12 +63042,16 @@ self: { }) {}; "eap" = callPackage - ({ mkDerivation, base, binary, bytestring }: + ({ mkDerivation, base, binary, bytestring, cryptonite, memory, mtl + , pretty-hex + }: mkDerivation { pname = "eap"; - version = "0.1.0.0"; - sha256 = "118nayxnc8xwyhx622wvgr3l35v90481j50m43x2zfkwish23dir"; - libraryHaskellDepends = [ base binary bytestring ]; + version = "0.9.0.1"; + sha256 = "0z7ab3i16424gpxwjhc4x7c55yhvzx5qjm80f2klpf94zz4w37ab"; + libraryHaskellDepends = [ + base binary bytestring cryptonite memory mtl pretty-hex + ]; homepage = "https://github.com/erickg/eap#readme"; description = "Extensible Authentication Protocol (EAP)"; license = stdenv.lib.licenses.bsd3; @@ -67868,8 +67963,8 @@ self: { }: mkDerivation { pname = "expressions"; - version = "0.1.3"; - sha256 = "0b3f9h0s7ayijkpqk929pgw6lxszbq94c9y69wsfcs7h7awd792h"; + version = "0.1.4"; + sha256 = "1dxkg5yc2njq7dpv7vgkmrs73x5np5w1ahi79my6ysamnc2w8a04"; libraryHaskellDepends = [ attoparsec base containers lattices singletons text transformers ]; @@ -67887,8 +67982,8 @@ self: { }: mkDerivation { pname = "expressions-z3"; - version = "0.1.0"; - sha256 = "1ma1g8b25466cpk8fyaf6fajp330wvnd44h2ddjvm9hkgaa8s82x"; + version = "0.1.1"; + sha256 = "0hk8qhkvlh4v210k7d845krg31px72ma44fmwahbycn6pgy32659"; libraryHaskellDepends = [ base containers expressions singletons transformers z3 ]; @@ -67976,17 +68071,18 @@ self: { "extensible" = callPackage ({ mkDerivation, base, comonad, constraints, deepseq, ghc-prim - , lens, monad-skeleton, mtl, primitive, profunctors, QuickCheck - , semigroups, StateVar, tagged, template-haskell, transformers + , hashable, lens, monad-skeleton, mtl, primitive, profunctors + , QuickCheck, semigroups, StateVar, tagged, template-haskell + , transformers, vector }: mkDerivation { pname = "extensible"; - version = "0.4.5"; - sha256 = "10cs47fdl79dasq5afbj5b47ybmvfsx589bwy6y3qcmlwybjnmlj"; + version = "0.4.6"; + sha256 = "0khi212qc834qnrssbn4xcfiypi2m7x8gwpwvpd6sbi6hi6c052v"; libraryHaskellDepends = [ - base comonad constraints deepseq ghc-prim monad-skeleton mtl - primitive profunctors QuickCheck semigroups StateVar tagged - template-haskell transformers + base comonad constraints deepseq ghc-prim hashable monad-skeleton + mtl primitive profunctors QuickCheck semigroups StateVar tagged + template-haskell transformers vector ]; testHaskellDepends = [ base lens QuickCheck template-haskell ]; homepage = "https://github.com/fumieval/extensible"; @@ -68532,6 +68628,28 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "fast-builder_0_0_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , deepseq, ghc-prim, process, QuickCheck, scientific, stm + , template-haskell, text, true-name, unordered-containers, vector + }: + mkDerivation { + pname = "fast-builder"; + version = "0.0.1.0"; + sha256 = "09s0jyiv1ch8cbgwfaxn5mmn9w7ik661h2g6d5znxr0nsi0bp2n1"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + testHaskellDepends = [ base bytestring process QuickCheck stm ]; + benchmarkHaskellDepends = [ + aeson base bytestring containers criterion deepseq ghc-prim + scientific template-haskell text true-name unordered-containers + vector + ]; + homepage = "http://github.com/takano-akio/fast-builder"; + description = "Fast ByteString Builder"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fast-digits" = callPackage ({ mkDerivation, base, criterion, digits, integer-gmp, QuickCheck , smallcheck, tasty, tasty-quickcheck, tasty-smallcheck @@ -69264,6 +69382,22 @@ self: { license = "GPL"; }) {}; + "fedora-haskell-tools" = callPackage + ({ mkDerivation, base, directory, filepath, process, time, unix }: + mkDerivation { + pname = "fedora-haskell-tools"; + version = "0.3"; + sha256 = "0ml5laiwkpd68j87px57jdvjc90pw1ma41gsc06h1qjlhnvhhill"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath process time unix + ]; + homepage = "https://github.com/fedora-haskell/fedora-haskell-tools"; + description = "Building and tracking tools for Fedora Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "fedora-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hlint , HsOpenSSL, hspec, http-streams, io-streams, lens, text @@ -69717,8 +69851,8 @@ self: { }: mkDerivation { pname = "ffmpeg-light"; - version = "0.12.0"; - sha256 = "0cv8jq2if0pv40yp8inl3slsgs3z1rncffjgs2522qimq123rxcz"; + version = "0.12.0.1"; + sha256 = "1ikyhdkr3pvkpmqw7j4xgz07bnxnvckld8kd06191kgqlvr2k764"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70218,6 +70352,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "filepath-crypto" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , cryptoids, cryptoids-types, encoding, exceptions, filepath, sandi + , template-haskell + }: + mkDerivation { + pname = "filepath-crypto"; + version = "0.0.0.2"; + sha256 = "1i6y0bpyndghkfip2l0ijk9mnhia0fjmd6skzl1a3dbh5pibf7fd"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive cryptoids cryptoids-types + encoding exceptions filepath sandi template-haskell + ]; + description = "Reversable and secure encoding of object ids as filepaths"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "filepath-io-access" = callPackage ({ mkDerivation, base, base-io-access, filepath }: mkDerivation { @@ -72808,6 +72960,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "fortytwo" = callPackage + ({ mkDerivation, ansi-terminal, async, base, doctest, hspec + , process, text + }: + mkDerivation { + pname = "fortytwo"; + version = "1.0.2"; + sha256 = "15imj5ps040iz5abfnzjpgfq726j9c28bwwg06zbf07ji74dz190"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-terminal base text ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ async base doctest hspec process ]; + homepage = "https://github.com/gianlucaguarini/fortytwo#readme"; + description = "Interactive terminal prompt"; + license = stdenv.lib.licenses.mit; + }) {}; + "forward-chan" = callPackage ({ mkDerivation, base, SafeSemaphore, stm, unagi-chan }: mkDerivation { @@ -73424,14 +73594,15 @@ self: { }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.2.0"; - sha256 = "1km43gdngrjbyd6z8v6nfj25aybb4xdkxdnfizkd9sbkdqyxkbk8"; + version = "0.1.4.0"; + sha256 = "057l1fnkqyqnjbhzjz2jjlcrsmkcv2gd16gb5n3j99crw97s62xj"; libraryHaskellDepends = [ base lens linear MemoTrie vector vector-space ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -73492,6 +73663,7 @@ self: { homepage = "https://github.com/clintonmead/freelude#readme"; description = "A generalisation of the Category->Functor->Applicative->Monad hierarchy and more"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freenect" = callPackage @@ -74758,6 +74930,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fuzzyset" = callPackage + ({ mkDerivation, base, base-unicode-symbols, data-default, hspec + , ieee754, lens, text, text-metrics, unordered-containers, vector + }: + mkDerivation { + pname = "fuzzyset"; + version = "0.1.0.2"; + sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz"; + libraryHaskellDepends = [ + base base-unicode-symbols data-default lens text text-metrics + unordered-containers vector + ]; + testHaskellDepends = [ + base base-unicode-symbols hspec ieee754 lens text + unordered-containers + ]; + homepage = "https://github.com/laserpants/fuzzyset-haskell"; + description = "Fuzzy set for approximate string matching"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fuzzytime" = callPackage ({ mkDerivation, base, cmdargs, directory, old-time, process }: mkDerivation { @@ -75051,23 +75244,22 @@ self: { }) {}; "gauge" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, basement, bytestring - , code-page, containers, deepseq, directory, foundation, HUnit - , math-functions, mwc-random, optparse-applicative, QuickCheck - , statistics, tasty, tasty-hunit, tasty-quickcheck, vector + ({ mkDerivation, base, basement, bytestring, code-page, containers + , deepseq, directory, HUnit, math-functions, mwc-random, tasty + , tasty-hunit, vector }: mkDerivation { pname = "gauge"; - version = "0.1.0"; - sha256 = "10hxx7n8hpcivi0g34w85dsvfx4l926rv1b6s88hyhpwj4qyvxb5"; + version = "0.1.3"; + sha256 = "1i97f00haj4832s2arbnqq19dpna54ygmchvnqkq00hsxk38cyc0"; libraryHaskellDepends = [ - ansi-wl-pprint base basement code-page containers deepseq - foundation math-functions mwc-random optparse-applicative vector + base basement code-page containers deepseq math-functions + mwc-random vector ]; testHaskellDepends = [ - base bytestring deepseq directory foundation HUnit QuickCheck - statistics tasty tasty-hunit tasty-quickcheck vector + base bytestring deepseq directory HUnit tasty tasty-hunit ]; + benchmarkHaskellDepends = [ base ]; homepage = "https://github.com/vincenthz/hs-gauge"; description = "small framework for performance measurement and analysis"; license = stdenv.lib.licenses.bsd3; @@ -75393,29 +75585,108 @@ self: { }) {inherit (pkgs) gegl;}; "gelatin" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , file-embed, FontyFruity, gl, GLFW-b, JuicyPixels, lens, linear - , time, vector + ({ mkDerivation, base, bytestring, containers, lens, linear, mtl + , transformers, vector }: mkDerivation { pname = "gelatin"; - version = "0.0.0.3"; - sha256 = "07ixnrhgqfqgb8cfm5qik17vx893jrjk7lq6342lpczpks22a58q"; + version = "0.1.0.0"; + sha256 = "08y9wsym19rgwr6k44n8pxffwi1fna3nmg4bq5cc7in5zj1ihfbv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector - ]; - executableHaskellDepends = [ - async base bytestring containers directory file-embed FontyFruity - gl GLFW-b JuicyPixels lens linear time vector + base bytestring containers lens linear mtl transformers vector ]; - description = "An experimental real time renderer"; + executableHaskellDepends = [ base linear mtl vector ]; + homepage = "https://github.com/schell/gelatin"; + description = "A graphics description language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gelatin-freetype2" = callPackage + ({ mkDerivation, base, containers, either, freetype2, gelatin + , gelatin-gl, mtl, transformers + }: + mkDerivation { + pname = "gelatin-freetype2"; + version = "0.1.0.0"; + sha256 = "0nr5xsxwg73liyr572jv1vzj5bjk3qhkkk7j6g0kqf2h31yxgqhr"; + libraryHaskellDepends = [ + base containers either freetype2 gelatin gelatin-gl mtl + transformers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/schell/gelatin/gelatin-freetype2#readme"; + description = "FreeType2 based text rendering for the gelatin realtime rendering system"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-fruity" = callPackage + ({ mkDerivation, base, FontyFruity, gelatin, linear, vector }: + mkDerivation { + pname = "gelatin-fruity"; + version = "0.1.0.0"; + sha256 = "0yp3z4sz52f21zvdy1xmd0bvpicbnv4wa53937rq1vw2jv60xx2r"; + libraryHaskellDepends = [ base FontyFruity gelatin linear vector ]; + homepage = "https://github.com/schell/gelatin-fruity#readme"; + description = "Gelatin's support for rendering TTF outlines, using FontyFruity"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "gelatin-gl" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, either + , filepath, gelatin, gelatin-shaders, gl, JuicyPixels, lens, linear + , mtl, template-haskell, transformers, vector + }: + mkDerivation { + pname = "gelatin-gl"; + version = "0.1.0.0"; + sha256 = "1x9a3wb878d1nrlxj2rciw4xz93gn3m326zciqnn5dg31fwqs396"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring containers directory either filepath gelatin + gelatin-shaders gl JuicyPixels lens linear mtl template-haskell + transformers vector + ]; + executableHaskellDepends = [ base gelatin lens linear mtl vector ]; + homepage = "https://github.com/schell/gelatin/gelatin-gl"; + description = "OpenGL rendering routines for the gelatin-picture graphics EDSL"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-sdl2" = callPackage + ({ mkDerivation, base, either, filepath, gelatin-gl, mtl, sdl2 + , transformers + }: + mkDerivation { + pname = "gelatin-sdl2"; + version = "0.1.1.0"; + sha256 = "0gnn5b06q6fsbblrjghyzn46dby2skm5r9ys6pl6fhp7pa3c924n"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base gelatin-gl mtl sdl2 transformers ]; + executableHaskellDepends = [ base either filepath sdl2 ]; + homepage = "https://github.com/schell/gelatin"; + description = "An SDL2 backend for the gelatin renderer"; + license = stdenv.lib.licenses.mit; + }) {}; + + "gelatin-shaders" = callPackage + ({ mkDerivation, base, bytestring, filepath, gelatin }: + mkDerivation { + pname = "gelatin-shaders"; + version = "0.1.0.0"; + sha256 = "001ifyyv85b9gb5l4hf21b5dqakg4f7n3bil5a1abb4vcj2zmpfr"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base bytestring filepath gelatin ]; + homepage = "https://github.com/schell/gelatin-shaders#readme"; + description = "Gelatin's OpenGL shaders"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gemstone" = callPackage ({ mkDerivation, array, base, bitmap, bitmap-opengl, containers , FTGL, lens, linear, OpenGL, random, SDL, SDL-image, stb-image @@ -77644,14 +77915,14 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_5_5" = callPackage + "ghc-typelits-natnormalise_0_5_6" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty , tasty-hunit, template-haskell }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5.5"; - sha256 = "1dr0568hfxrjhvpgl624zghnvinfg7wwn9x36lrnxr4cl7najqk5"; + version = "0.5.6"; + sha256 = "07rrc3aw00i36z6xgp2jik9wqi0d8byzy48dy8jj089vp7s6birb"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; @@ -79185,7 +79456,7 @@ self: { "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive + , bloomfilter, bup, byteable, bytestring, 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 @@ -79204,8 +79475,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20171018"; - sha256 = "17armwygz44wphv6hqpyjggh4ybarhy3a2ypnsrc1ifhpq3rf15d"; + version = "6.20171026"; + sha256 = "0i44cfxp5wy6y527l9jbj83ilkxilp4jm7106q70czls0hnx6yij"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -79214,10 +79485,6 @@ self: { ]; isLibrary = false; isExecutable = true; - setupHaskellDepends = [ - base bytestring Cabal data-default directory exceptions filepath - hslogger IfElse process split unix unix-compat - ]; executableHaskellDepends = [ aeson async aws base blaze-builder bloomfilter byteable bytestring case-insensitive clientsession concurrent-output conduit @@ -79717,27 +79984,6 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.0.6"; - sha256 = "1ixs76y5cb1dkrvl8i13a7s9xgs3170w3sjx6bhj05fi6wvz3n8z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring http-client http-client-tls http-types - mime-types optparse-generic text unordered-containers uri-templater - ]; - executableHaskellDepends = [ base ]; - homepage = "https://github.com/tfausak/github-release#readme"; - description = "Upload files to GitHub releases"; - license = stdenv.lib.licenses.mit; - }) {}; - - "github-release_1_0_7" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client - , http-client-tls, http-types, mime-types, optparse-generic, text - , unordered-containers, uri-templater - }: - mkDerivation { - pname = "github-release"; version = "1.0.7"; sha256 = "17v9rpl6nljf2xa16s3zi6dr8w8385pxdsa1ksyzn84kpq58kdn9"; isLibrary = true; @@ -79750,7 +79996,6 @@ self: { homepage = "https://github.com/tfausak/github-release#readme"; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "github-tools" = callPackage @@ -85459,13 +85704,13 @@ self: { ({ mkDerivation, base, cairo, containers, filepath, gtk }: mkDerivation { pname = "gulcii"; - version = "0.2.0.3"; - sha256 = "0g86vgy0fhvmqvg1v1hxn6vrdcbq0n69fa0ysxvw7126ijrm5l29"; + version = "0.3"; + sha256 = "1crx9kz4s8by509x1k60m89jmmn7gfhi46d05q44ikhk5zkxycws"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; - homepage = "http://code.mathr.co.uk/gulcii"; + homepage = "https://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -87501,25 +87746,6 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.5"; - sha256 = "0hi9a8aa10n14ipk4g8ksrf175z92kkwk0d9n3qzn835fkj5kkyr"; - libraryHaskellDepends = [ - aeson base bytestring email-validate exceptions filepath - http-client http-client-tls http-types tagsoup text time - transformers - ]; - homepage = "https://bitbucket.org/robertmassaioli/hailgun"; - description = "Mailgun REST api interface for Haskell"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hailgun_0_4_1_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, email-validate - , exceptions, filepath, http-client, http-client-tls, http-types - , tagsoup, text, time, transformers - }: - mkDerivation { - pname = "hailgun"; version = "0.4.1.6"; sha256 = "0hkz666vd02iknkxv0l60l3ara0yaszc6583sry0shk2cd74lv06"; libraryHaskellDepends = [ @@ -87530,7 +87756,6 @@ self: { homepage = "https://bitbucket.org/robertmassaioli/hailgun"; description = "Mailgun REST api interface for Haskell"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hailgun-send" = callPackage @@ -90687,23 +90912,25 @@ self: { }) {}; "haskell-compression" = callPackage - ({ mkDerivation, base, bimap, booleanlist, bytestring, containers + ({ mkDerivation, base, bimap, boolean-list, bytestring, containers }: mkDerivation { pname = "haskell-compression"; - version = "0.2"; - sha256 = "0z0jhz5m70qrs2w3q58xghgv279yjvhfdspy5pqpss87jm1fm3ab"; + version = "0.3"; + sha256 = "1yksgwhxpfl47d6zrqdx5bdxyya9vd3kr1g33pz19qfqsvfcqlhp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bimap booleanlist bytestring containers + base bimap boolean-list bytestring containers + ]; + executableHaskellDepends = [ + base bimap boolean-list bytestring containers ]; - executableHaskellDepends = [ base bimap bytestring containers ]; homepage = "http://xy30.com"; description = "compress files"; license = stdenv.lib.licenses.gpl3; - broken = true; - }) {booleanlist = null;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; "haskell-conll" = callPackage ({ mkDerivation, base, containers, lens, pretty-show, protolude @@ -93337,8 +93564,8 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.69.3"; - sha256 = "1yjsdvb3y6ly29anvh14bvfan1fplc9brb6i68ipcz9a7jk9l1jf"; + version = "0.69.4"; + sha256 = "1s7phsg20h15p2dnri6viy5k6c4n42gchy684dv3r30qrwwvv0ni"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95446,23 +95673,42 @@ self: { }) {}; "heavy-logger" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, fast-logger, hsyslog - , monad-control, monad-logger, mtl, template-haskell, text - , text-format-heavy, transformers-base + ({ mkDerivation, attoparsec, base, bytestring, containers + , data-default, fast-logger, hsyslog, lifted-base, monad-control + , monad-logger, mtl, stm, template-haskell, text, text-format-heavy + , th-lift, th-lift-instances, thread-local-storage + , transformers-base }: mkDerivation { pname = "heavy-logger"; - version = "0.1.0.0"; - sha256 = "0wnvgjbhwscmq0wm7arlwpqj5dsrshaqhnx5nvlcvjkzrhcpxlpp"; + version = "0.3.1.0"; + sha256 = "0cmanxnahxgk52ffpni0zx4z22vdrh6r5my4llvsdd94bpfmxpi4"; libraryHaskellDepends = [ - attoparsec base bytestring fast-logger hsyslog monad-control - monad-logger mtl template-haskell text text-format-heavy - transformers-base + attoparsec base bytestring containers data-default fast-logger + hsyslog lifted-base monad-control monad-logger mtl stm + template-haskell text text-format-heavy th-lift th-lift-instances + thread-local-storage transformers-base ]; description = "Full-weight logging based on fast-logger"; license = stdenv.lib.licenses.bsd3; }) {}; + "heavy-logger-amazon" = callPackage + ({ mkDerivation, amazonka-core, base, binary, heavy-logger + , template-haskell, text + }: + mkDerivation { + pname = "heavy-logger-amazon"; + version = "0.1.0.0"; + sha256 = "18wcnpnjmv841ac3kvnyk0s9rrgfwvlgv950s1znnjdmi3qc0bjk"; + libraryHaskellDepends = [ + amazonka-core base binary heavy-logger template-haskell text + ]; + homepage = "https://github.com/portnov/heavy-logger-amazon#readme"; + description = "heavy-logger compatibility with amazonka-core logging"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hebrew-time" = callPackage ({ mkDerivation, base, HUnit, QuickCheck, test-framework , test-framework-hunit, test-framework-quickcheck2, time @@ -95562,30 +95808,6 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.10"; - sha256 = "1z8vl3ql5nyl4jg3pzghsbi1ld9a047zbwz6fgzgk1lvspa0pcd3"; - libraryHaskellDepends = [ - async base bytestring bytestring-lexing deepseq mtl network - resource-pool scanner stm text time unordered-containers vector - ]; - testHaskellDepends = [ - async base bytestring 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; - }) {}; - - "hedis_0_9_11" = callPackage - ({ mkDerivation, async, base, bytestring, bytestring-lexing - , deepseq, HUnit, mtl, network, resource-pool, scanner - , slave-thread, stm, test-framework, test-framework-hunit, text - , time, unordered-containers, vector - }: - mkDerivation { - pname = "hedis"; version = "0.9.11"; sha256 = "1ya5jpf57zs66hqvr58xyj0k7jq5cmdci1yxzwj19cag1wfq47rb"; libraryHaskellDepends = [ @@ -95600,7 +95822,6 @@ self: { 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 @@ -96374,6 +96595,7 @@ self: { homepage = "https://github.com/JackKiefer/herms"; description = "A command-line manager for delicious kitchen recipes"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hero-club-five-tenets" = callPackage @@ -96699,8 +96921,8 @@ self: { ({ mkDerivation, base, bytestring, extra }: mkDerivation { pname = "hexml"; - version = "0.3.2"; - sha256 = "0vyv45s6nqhbgkzxcgx1ihmif0d7sxmfafqc2xcmcm2vg4jb7ls4"; + version = "0.3.3"; + sha256 = "1lhwhv75s71bqdclvfawhg9ss9z5icg9rpihkjfss4yzhxhcrvf4"; libraryHaskellDepends = [ base bytestring extra ]; testHaskellDepends = [ base bytestring ]; homepage = "https://github.com/ndmitchell/hexml#readme"; @@ -101147,20 +101369,20 @@ self: { license = stdenv.lib.licenses.isc; }) {inherit (pkgs) openssl;}; - "hoopl_3_10_2_1" = callPackage + "hoopl_3_10_2_2" = callPackage ({ mkDerivation, base, containers, filepath, mtl, parsec , test-framework, test-framework-hunit }: mkDerivation { pname = "hoopl"; - version = "3.10.2.1"; - sha256 = "1c20ahr12dlapajzgb7mhxb1m8q1485amwmvzmsgy7l7x2ls41kw"; + version = "3.10.2.2"; + sha256 = "15rbb9a8mza3zv8h3p237zhmy29bxc4k48ik27kzzj7islb16yq9"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers filepath mtl parsec test-framework test-framework-hunit ]; - homepage = "http://ghc.cs.tufts.edu/hoopl/"; + homepage = "https://github.com/haskell/hoopl"; description = "A library to support dataflow analysis and optimization"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -102350,8 +102572,8 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.4"; - sha256 = "0vijl65rxir61nwx7sdgy6lcwgskyks3cdgcqd814smnavh6nhdn"; + version = "2.4.5"; + sha256 = "0f4h9b5c6s523967hkqg6wz57g350awa26r2y2wlfr4f39qgjwx3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -102731,6 +102953,29 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libb2;}; + "hs-brotli" = callPackage + ({ mkDerivation, base, brotli, brotlidec, brotlienc, bytestring + , ghc-prim, libbrotlidec, libbrotlienc, QuickCheck + , quickcheck-instances, tasty-quickcheck + }: + mkDerivation { + pname = "hs-brotli"; + version = "0.1.0.0"; + sha256 = "083l7bbjlxh629a9m88mfp087f09gwsmzs9vmpxrqffw23zrnclf"; + libraryHaskellDepends = [ base bytestring ghc-prim ]; + librarySystemDepends = [ brotlidec brotlienc ]; + libraryPkgconfigDepends = [ libbrotlidec libbrotlienc ]; + testHaskellDepends = [ + base brotli bytestring QuickCheck quickcheck-instances + tasty-quickcheck + ]; + homepage = "https://github.com/iand675/brotli#readme"; + description = "Compression and decompression in the brotli format"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {brotli = null; brotlidec = null; brotlienc = null; + libbrotlidec = null; libbrotlienc = null;}; + "hs-captcha" = callPackage ({ mkDerivation, base, bytestring, gd, random }: mkDerivation { @@ -103382,8 +103627,8 @@ self: { ({ mkDerivation, base, bytestring, unix }: mkDerivation { pname = "hsI2C"; - version = "0.1.2"; - sha256 = "0ma8klvyv4rnfxkag99vm4nvw77yppcv63p6829b4ynsa9vyv9rn"; + version = "0.1.3"; + sha256 = "0p77xndqpqfyjw9y7q791pysrpz3zkimw8mcxyfl4yrh34sammx9"; libraryHaskellDepends = [ base bytestring unix ]; description = "I2C access for Haskell and Linux"; license = stdenv.lib.licenses.bsd3; @@ -108910,15 +109155,15 @@ self: { }) {}; "hw-conduit" = callPackage - ({ mkDerivation, array, base, bytestring, conduit, criterion, hspec - , mmap, time, vector, word8 + ({ mkDerivation, array, base, bytestring, conduit + , conduit-combinators, criterion, hspec, mmap, time, vector, word8 }: mkDerivation { pname = "hw-conduit"; - version = "0.2.0.2"; - sha256 = "052sgj1bny2d2j4gsmfj7mx9jcnkac7b0rsz7310nv2rc9h46sbl"; + version = "0.2.0.3"; + sha256 = "19fwlgnpc17h305nmaygd5w9p5yv9jm25jgc440r9frqzw7if83a"; libraryHaskellDepends = [ - array base bytestring conduit time word8 + array base bytestring conduit conduit-combinators time word8 ]; testHaskellDepends = [ base bytestring conduit hspec ]; benchmarkHaskellDepends = [ @@ -109115,20 +109360,20 @@ self: { "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache - , containers, errors, hashable, hspec, http-client, mtl, pure-zlib - , QuickCheck, semigroups, servant, servant-client, text + , containers, errors, hashable, hspec, http-client, http-types, mtl + , pure-zlib, QuickCheck, semigroups, servant, servant-client, text , transformers, unordered-containers }: mkDerivation { pname = "hw-kafka-avro"; - version = "1.2.0"; - sha256 = "0v2l7g524wz45mnqdqrs33qbb1psm33jlfl1hlnd22dxfw7mhdhl"; + version = "1.3.0"; + sha256 = "0lryr18gcmgfxa10gmd5y43l62x684ahpzk53wx5z5qww0chy7fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable - http-client mtl pure-zlib semigroups servant servant-client text - transformers unordered-containers + http-client http-types mtl pure-zlib semigroups servant + servant-client text transformers unordered-containers ]; executableHaskellDepends = [ aeson avro base binary bytestring cache containers errors hashable @@ -109153,8 +109398,8 @@ self: { }: mkDerivation { pname = "hw-kafka-client"; - version = "2.0.3"; - sha256 = "0xdkkasjql0la376kmb8zljndfbcxyizf9rqj02nlb1np8gs6apq"; + version = "2.0.4"; + sha256 = "0mqrxczjr822hccmrdsmy98mw10jdmiiq94vdibkqrh618hs4fd5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111855,6 +112100,8 @@ self: { pname = "imagesize-conduit"; version = "1.1"; sha256 = "06dc0453l7n3g05pg118y4smlzkl6p56zazpi4dr41dkg12pii9i"; + revision = "1"; + editedCabalFile = "1gq749v6558zkvvn8iqkd4iqv4giiysxjqb2kncarnhghkkbgbaf"; libraryHaskellDepends = [ base bytestring conduit conduit-extra exceptions ]; @@ -113111,8 +113358,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.9.0.1"; - sha256 = "1by27qjsgwaws7nf3lslml7n58j2fk478pinflk10jji5zcs4nz9"; + version = "0.9.0.2"; + sha256 = "1swxdilr1l7h3pk313fyjgpg58g20v6560j9g4cxz0gakqqhb3jc"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions mtl pretty primitive process reflection setenv @@ -114665,8 +114912,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.2.3"; - sha256 = "06gklbipbjg0n2c3iqh753v9njd602r3lj4rmq1155kx0bxlwhmg"; + version = "0.2.2.4"; + sha256 = "118ksbf8kh0bmwk5m32qv609kggwssm3a56zc14f8bg67bkdkrc4"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls profunctors text time tls transformers @@ -117857,8 +118104,8 @@ self: { }: mkDerivation { pname = "justified-containers"; - version = "0.2.0.0"; - sha256 = "0fsr9j4qnlffhkgbz50lwy3f18d619risxfl44wgfgr9b722xj8r"; + version = "0.2.0.1"; + sha256 = "0k2vw8d37hkjj786kx52hjs7qlmmv4hr8bp9dd2rskgsnwjizmw2"; libraryHaskellDepends = [ base containers roles ]; testHaskellDepends = [ base containers ghc-prim hspec QuickCheck should-not-typecheck @@ -118469,14 +118716,14 @@ self: { ({ mkDerivation, aeson, async, base, bloodhound, bytestring , containers, criterion, deepseq, enclosed-exceptions, exceptions , http-client, http-types, katip, lens, lens-aeson - , quickcheck-instances, retry, rng-utils, scientific, stm - , stm-chans, tagged, tasty, tasty-hunit, tasty-quickcheck, text - , time, transformers, unordered-containers, uuid, vector + , quickcheck-instances, random, retry, scientific, stm, stm-chans + , tagged, tasty, tasty-hunit, tasty-quickcheck, text, time + , transformers, unordered-containers, uuid, vector }: mkDerivation { pname = "katip-elasticsearch"; - version = "0.4.0.1"; - sha256 = "0w1iprf3lpnbgil3gzpka5akjc8kl3l6g2knizddjb6xvszy564q"; + version = "0.4.0.3"; + sha256 = "0aji0738dz7i0lry30y6rpfbhvcpc79mfqc77nlvaplb3plw0m51"; libraryHaskellDepends = [ aeson async base bloodhound bytestring enclosed-exceptions exceptions http-client http-types katip retry scientific stm @@ -118489,9 +118736,10 @@ self: { unordered-containers vector ]; benchmarkHaskellDepends = [ - aeson base bloodhound criterion deepseq rng-utils text + aeson base bloodhound criterion deepseq random text unordered-containers uuid ]; + homepage = "https://github.com/Soostone/katip"; description = "ElasticSearch scribe for the Katip logging framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -118512,6 +118760,7 @@ self: { homepage = "https://github.com/iconnect/katip-syslog#readme"; description = "Syslog Katip Scribe"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katt" = callPackage @@ -119986,8 +120235,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.4.3"; - sha256 = "07n5acnrwy991qsx0bg1hbpxky0nxwybnh1zs08n4jmbl10rvsrs"; + version = "0.4.4"; + sha256 = "0p689g86rim4hqw0chn6p22yr9vcb4xcl44aiv6lzqb8fnwzyadx"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -121872,8 +122121,8 @@ self: { ({ mkDerivation, base, HUnit, parsec, wl-pprint }: mkDerivation { pname = "language-webidl"; - version = "0.1.4.0"; - sha256 = "06px2m4zf1b14lx7nx0m21gmxqskfyk7a777j7sbqd3dwsrbl834"; + version = "0.2.0.0"; + sha256 = "1h93a19y8109mwxl795hi0xdb3jy1z9w2ks3sc6g673kv04pw0pf"; libraryHaskellDepends = [ base parsec wl-pprint ]; testHaskellDepends = [ base HUnit ]; description = "Parser and Pretty Printer for WebIDL"; @@ -124160,24 +124409,26 @@ self: { }) {}; "libssh2" = callPackage - ({ mkDerivation, base, bytestring, c2hs, libssh2, network, ssh2 + ({ mkDerivation, base, bytestring, c2hs, libssh2, network, select , syb, time }: mkDerivation { pname = "libssh2"; - version = "0.2.0.4"; - sha256 = "1abdd5k4pnfxpg1kg1kvmwgwv946zlndhnydhhphad2ah3d2pkjf"; + version = "0.2.0.5"; + sha256 = "0l224pd8bb9d29043qdy40dbknnhmwnjc95r3yyc93lhwd5fsqma"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring network syb time ]; - librarySystemDepends = [ ssh2 ]; + libraryHaskellDepends = [ + base bytestring network select syb time + ]; + librarySystemDepends = [ libssh2 ]; libraryPkgconfigDepends = [ libssh2 ]; libraryToolDepends = [ c2hs ]; homepage = "https://github.com/portnov/libssh2-hs"; description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libssh2; ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "libssh2-conduit" = callPackage ({ mkDerivation, base, conduit, libssh2, monad-control, stm @@ -124280,7 +124531,7 @@ self: { homepage = "http://redmine.iportnov.ru/projects/libvirt-hs"; description = "FFI bindings to libvirt virtualization API (http://libvirt.org)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libvirt;}; "libvorbis" = callPackage @@ -125012,8 +125263,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "1.3"; - sha256 = "0bszi1k27ag4yk31zxkn3jk3cqh1xzdcscm4nb6k4n0psf0qm2rp"; + version = "2.0"; + sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w"; libraryHaskellDepends = [ base sbv ]; homepage = "http://github.com/LeventErkok/linearEqSolver"; description = "Use SMT solvers to solve linear systems over integers and rationals"; @@ -125027,8 +125278,10 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.3.2.0"; - sha256 = "0g93h1sl6djyf0r6295a7iayjnwjwmk8w7m06gi3vqr2srwjk4s5"; + version = "0.3.4.0"; + sha256 = "0idmaw25cz7lk3kr9n0jri776j0qajrlc9j1aki0brvx6p6yh2dp"; + revision = "1"; + editedCabalFile = "0vrx3ws23qg1ygh1ksvgrpz92nhnr1nmrwy8a3ax08n8jcx2nrrw"; libraryHaskellDepends = [ base constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core semigroups tagged transformers vector @@ -125037,6 +125290,7 @@ self: { homepage = "https://github.com/leftaroundabout/linearmap-family"; description = "Native, complete, matrix-free linear algebra"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearscan" = callPackage @@ -125625,6 +125879,7 @@ self: { homepage = "https://github.com/ucsd-progsys/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -126968,8 +127223,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.7.3.0"; - sha256 = "15bf0ly3fl2k7dqn5vskafsihil5lb7ij96vw0nsb3dil80f54qk"; + version = "0.7.4.0"; + sha256 = "06rzvh3g294hpwpxw2syvywrw3rms1chjxqhki8b97ml1nlfnrs0"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -129094,22 +129349,23 @@ self: { "madlang" = callPackage ({ mkDerivation, ansi-wl-pprint, base, Cabal, composition-prelude , containers, criterion, directory, file-embed, hspec - , hspec-megaparsec, http-client, megaparsec, MonadRandom, mtl - , optparse-applicative, process, random-shuffle, recursion-schemes - , tar, template-haskell, text, zip-archive, zlib + , hspec-megaparsec, http-client, http-client-tls, megaparsec + , MonadRandom, mtl, optparse-applicative, process, random-shuffle + , recursion-schemes, tar, template-haskell, text, th-lift-instances + , titlecase, zip-archive, zlib }: mkDerivation { pname = "madlang"; - version = "3.0.0.1"; - sha256 = "0zh935qpaq3w0qdijbmpyf71yvjigygks7ryxfcw9q9hivypvxgj"; + version = "3.1.1.13"; + sha256 = "0qmgd368brmmibqlimv254i20ayxw96ipnwcfid4q3pdml9javn4"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal directory file-embed process ]; + setupHaskellDepends = [ base Cabal directory process ]; libraryHaskellDepends = [ ansi-wl-pprint base composition-prelude containers directory - file-embed http-client megaparsec MonadRandom mtl + file-embed http-client http-client-tls megaparsec MonadRandom mtl optparse-applicative random-shuffle recursion-schemes tar - template-haskell text zip-archive zlib + template-haskell text th-lift-instances titlecase zip-archive zlib ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec hspec-megaparsec text ]; @@ -129471,6 +129727,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "makefile_1_1_0_0" = callPackage + ({ mkDerivation, attoparsec, base, doctest, Glob, QuickCheck, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "makefile"; + version = "1.1.0.0"; + sha256 = "01swnw8fp2cx5z5xim9apia3yw48six61mhf6p3g0gp99w4i4ypd"; + libraryHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base doctest Glob QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + homepage = "http://github.com/nmattia/mask"; + description = "Simple Makefile parser and generator"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mallard" = callPackage ({ mkDerivation, base, byteable, bytestring, cryptohash, exceptions , fgl, file-embed, hashable, hasql, hasql-optparse-applicative @@ -129982,8 +130257,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.4.1.0"; - sha256 = "0493y21sq56hj99ny10nn9kbgq2525ij79rmq5x2p1dx30gk16m5"; + version = "0.4.4.0"; + sha256 = "1qihbyhmf9abyb7fh4gf6qxwbk2a1jwnxdpnjinfi3x87xasvajj"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -129995,20 +130270,26 @@ self: { }) {}; "manifolds" = callPackage - ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, free, free-vector-spaces, lens, linear + ({ mkDerivation, base, call-stack, comonad, constrained-categories + , containers, deepseq, free, free-vector-spaces, lens, linear , linearmap-category, manifolds-core, MemoTrie, number-show - , semigroups, tagged, transformers, vector, vector-space, void + , placeholders, pragmatic-show, semigroups, tagged, tasty + , tasty-hunit, tasty-quickcheck, transformers, vector, vector-space + , void }: mkDerivation { pname = "manifolds"; - version = "0.4.1.0"; - sha256 = "1vmgcv0yy72a29w15sg0z3z885vjhfpapgabilqbvh7dpxfv43x1"; + version = "0.4.4.0"; + sha256 = "1wsqar82w0sqspihyvkd9jndw2q6818nci82clqgxb1dawyna5vx"; libraryHaskellDepends = [ - base comonad constrained-categories containers deepseq free - free-vector-spaces lens linear linearmap-category manifolds-core - MemoTrie number-show semigroups tagged transformers vector - vector-space void + base call-stack comonad constrained-categories containers deepseq + free free-vector-spaces lens linear linearmap-category + manifolds-core MemoTrie number-show placeholders pragmatic-show + semigroups tagged transformers vector vector-space void + ]; + testHaskellDepends = [ + base constrained-categories containers lens linearmap-category + pragmatic-show tasty tasty-hunit tasty-quickcheck vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -130017,15 +130298,16 @@ self: { }) {}; "manifolds-core" = callPackage - ({ mkDerivation, base, tagged, vector-space }: + ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.4.1.0"; - sha256 = "041b4mjrl800vlyg1ibfmmyp87ad2mak6171s2mlc4mwsi4xrl4g"; - libraryHaskellDepends = [ base tagged vector-space ]; + version = "0.4.4.0"; + sha256 = "00b24ry943f6m46wkbxh8452q9xswcn2ri9c511r9bsinhzg653q"; + libraryHaskellDepends = [ base call-stack tagged vector-space ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "map-exts" = callPackage @@ -133119,8 +133401,8 @@ self: { }: mkDerivation { pname = "milena"; - version = "0.5.1.0"; - sha256 = "0vfypwp503ab91hca5mmclgxxy0ggzd9g90h7jaj5vxrij7ya5ly"; + version = "0.5.2.0"; + sha256 = "06gx1j9bxzxnagsymgr0nzhs1s6jsr14mhh2qx38h85n5g12zpvb"; libraryHaskellDepends = [ base bytestring cereal containers digest lens lifted-base monad-control mtl murmur-hash network random resource-pool @@ -133130,6 +133412,7 @@ self: { base bytestring lens mtl network QuickCheck semigroups tasty tasty-hspec tasty-quickcheck ]; + homepage = "https://github.com/adamflott/milena.git#readme"; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134077,6 +134360,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "modern-uri" = callPackage + ({ mkDerivation, base, bytestring, containers, contravariant + , criterion, deepseq, exceptions, hspec, hspec-megaparsec + , megaparsec, profunctors, QuickCheck, template-haskell, text + , weigh + }: + mkDerivation { + pname = "modern-uri"; + version = "0.1.0.0"; + sha256 = "04k6v2mdkwdwvphfhhm7dwgy12n3kwxi02azkpzng0qa24vb1w1r"; + libraryHaskellDepends = [ + base bytestring containers contravariant deepseq exceptions + megaparsec profunctors QuickCheck template-haskell text + ]; + testHaskellDepends = [ + base bytestring hspec hspec-megaparsec megaparsec QuickCheck text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq megaparsec text weigh + ]; + homepage = "https://github.com/mrkkrp/modern-uri"; + description = "Modern library for working with URIs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "modify-fasta" = callPackage ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split @@ -135973,15 +136282,23 @@ self: { }) {}; "monoid-statistics" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, math-functions, QuickCheck, tasty + , tasty-quickcheck, vector, vector-th-unbox + }: mkDerivation { pname = "monoid-statistics"; - version = "0.3.1"; - sha256 = "0gfdjmx457r580lc40vpg8fkzd8n971b5vam96v6kzssg2cznqy3"; - libraryHaskellDepends = [ base ]; - homepage = "https://bitbucket.org/Shimuuar/monoid-statistics"; + version = "1.0.0"; + sha256 = "0n3q8izk197lrkvm6hmdzg7dl1mzji2z09b1wkz02pm4y0gganv3"; + libraryHaskellDepends = [ + base math-functions vector vector-th-unbox + ]; + testHaskellDepends = [ + base math-functions QuickCheck tasty tasty-quickcheck + ]; + homepage = "https://github.com/Shimuuar/monoid-statistics"; description = "Monoids for calculation of statistics of sample"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monoid-subclasses" = callPackage @@ -136343,6 +136660,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "motor" = callPackage + ({ mkDerivation, base, CTRex, indexed, indexed-extras, reflection + }: + mkDerivation { + pname = "motor"; + version = "0.1.0.0"; + sha256 = "00jr7dlnm22cvjwprclizcbm4kw2i84zzzd7n6im9li00w1a2iwy"; + libraryHaskellDepends = [ + base CTRex indexed indexed-extras reflection + ]; + testHaskellDepends = [ base CTRex indexed indexed-extras ]; + description = "Type-safe effectful state machines in Haskell"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mount" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -141433,8 +141766,8 @@ self: { }: mkDerivation { pname = "ngx-export"; - version = "0.9.0.0"; - sha256 = "099q24f9879sdwqa0jnlsamvpz1jbyryn90w7jp7np68avbhv9bf"; + version = "0.9.1.2"; + sha256 = "1428pkzj7kam7ya21fb3qchq95lvp6dp9dnh5qj41nkw9x5dz517"; libraryHaskellDepends = [ async base binary bytestring monad-loops template-haskell unix ]; @@ -141490,8 +141823,8 @@ self: { }: mkDerivation { pname = "nice-html"; - version = "0.2.0"; - sha256 = "0lkqqfp6x3w9lxh1jgm6c07pyfz1yr7drkr15s1m9vwvdh7mj24v"; + version = "0.3.0"; + sha256 = "1ns6qrzm9lwbgjcr7mw58g0qivbqac4yxisvbfy9j2cq3dqzm6d3"; libraryHaskellDepends = [ base bifunctors blaze-markup bytestring data-default-class deepseq free recursion-schemes template-haskell text transformers vector @@ -142663,6 +142996,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "numbered-semigroups" = callPackage + ({ mkDerivation, base, call-stack, semigroups }: + mkDerivation { + pname = "numbered-semigroups"; + version = "0.1.0.0"; + sha256 = "100r6k3cwycl75mj9g1x4w4qv064v8bdaan5rsj2vnvx4w1jrhp2"; + libraryHaskellDepends = [ base call-stack semigroups ]; + homepage = "https://github.com/leftaroundabout/numbered-semigroups"; + description = "A sequence of semigroups, for composing stuff in multiple spatial directions"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "numbering" = callPackage ({ mkDerivation, base, containers, vector }: mkDerivation { @@ -143435,6 +143780,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "octane_0_20_3" = callPackage + ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers + , data-default-class, file-embed, http-client, http-client-tls + , overloaded-records, rattletrap, text + }: + mkDerivation { + pname = "octane"; + version = "0.20.3"; + sha256 = "0rjvl7f3sa8i7a1svhh4phc2r2zjjwi1p3cajnwzms7kasmcqfjp"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed overloaded-records rattletrap text + ]; + executableHaskellDepends = [ + aeson base bimap binary bytestring containers data-default-class + file-embed http-client http-client-tls overloaded-records + rattletrap text + ]; + homepage = "https://github.com/tfausak/octane#readme"; + description = "Parse Rocket League replays"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "octohat" = callPackage ({ mkDerivation, aeson, base, base-compat, base16-bytestring , base64-bytestring, bytestring, containers, cryptohash, dotenv @@ -146472,6 +146843,54 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "pandoc_2_0_0_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, 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.0.0.1"; + sha256 = "1wq21vsg9afv8lxk6rmmmb57437q7gv1qs4ymbzd1mvxkvzx0hwh"; + configureFlags = [ "-fhttps" "-f-trypandoc" ]; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + 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 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 unordered-containers vector xml yaml + zip-archive zlib + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring containers Diff directory executable-path filepath + hslua pandoc-types process QuickCheck tasty tasty-golden + tasty-hunit tasty-quickcheck temporary text zip-archive + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion text time + ]; + doCheck = false; + homepage = "http://pandoc.org"; + description = "Conversion between markup formats"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils @@ -146510,20 +146929,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_11_1_1" = callPackage + "pandoc-citeproc_0_11_1_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 + , 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.11.1.1"; - sha256 = "00732amji7xlrkxzlwc5rzkq6saxjlvwlvinhkw4hyh1w0d74qwj"; + version = "0.11.1.2"; + sha256 = "0lv1j035f5c0dd0n772ivav6kwzfxvnk6zcxmmhmkc3s9r9716sd"; 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 @@ -146769,8 +147189,8 @@ self: { }: mkDerivation { pname = "pandoc-stylefrommeta"; - version = "0.1.0.1"; - sha256 = "1lzjia4fl2s6aak00cb79sq5n85wyfcdn5xjanl7x9xr07rv2641"; + version = "0.1.1.0"; + sha256 = "0blgccnzyignq14y94cnascjxlk6088wwpxifwm45rnn0hs786vf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -147543,6 +147963,20 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "parameterized" = callPackage + ({ mkDerivation, base, data-diverse, hspec, transformers }: + mkDerivation { + pname = "parameterized"; + version = "0.2.0.0"; + sha256 = "0z40b6cja2c4y177w6iwg8dijlpk5zwrf5yfwppc5y6n57g260z7"; + libraryHaskellDepends = [ base data-diverse transformers ]; + testHaskellDepends = [ base data-diverse hspec transformers ]; + homepage = "https://github.com/louispan/parameterized#readme"; + description = "Extensible records and polymorphic variants"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "parameterized-data" = callPackage ({ mkDerivation, base, template-haskell, type-level }: mkDerivation { @@ -148212,13 +148646,13 @@ self: { }) {}; "partial-semigroup" = callPackage - ({ mkDerivation, base, hedgehog }: + ({ mkDerivation, base, doctest, hedgehog }: mkDerivation { pname = "partial-semigroup"; - version = "0.2.0.1"; - sha256 = "0k3b66wlhi280wk3q5ilmcn93m4rch1ily8f3z79lpxjjlraz7lw"; + version = "0.3.0.2"; + sha256 = "0r2rhcq73lb18j03h5nk7j6vzv9qxjnw8zsir3zy6cynkv4w35zd"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hedgehog ]; + testHaskellDepends = [ base doctest hedgehog ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "A partial binary associative operator"; license = stdenv.lib.licenses.asl20; @@ -148228,8 +148662,8 @@ self: { ({ mkDerivation, base, hedgehog, partial-semigroup }: mkDerivation { pname = "partial-semigroup-hedgehog"; - version = "0.2.0.1"; - sha256 = "1c4rbf1x6llgprx0rgil71z3306ky9x59sl8db1z6hg9ykriv4n2"; + version = "0.3.0.1"; + sha256 = "0i1p3277qv05jrshj3f61l9ag10dlh0hbwx550achlff3blfqhdr"; libraryHaskellDepends = [ base hedgehog partial-semigroup ]; homepage = "https://github.com/chris-martin/partial-semigroup"; description = "Property testing for partial semigroups using Hedgehog"; @@ -148240,8 +148674,8 @@ self: { ({ mkDerivation, partial-semigroup-hedgehog }: mkDerivation { pname = "partial-semigroup-test"; - version = "0.2.0.1"; - sha256 = "1cdlwjq7bbbq7yz5flzjkj0kp5s991nwsjq52xiqhmlzbim598s4"; + version = "0.3.0.1"; + sha256 = "006dlck7dr1xs2wwd233bm87mf619dlwnb66xlcfp82ksdmnfl6n"; libraryHaskellDepends = [ partial-semigroup-hedgehog ]; doHaddock = false; homepage = "https://github.com/chris-martin/partial-semigroup"; @@ -149855,8 +150289,8 @@ self: { }: mkDerivation { pname = "persistent"; - version = "2.7.0"; - sha256 = "1snywd1qaj572m0nqdadqm9i86n0mhz8gcwwnaf35kk2sd8lvg6f"; + version = "2.7.1"; + sha256 = "079r6b1rvvwgagznxwf4j5i29jpqrvnck545ig004v2853r6x2f2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -150042,8 +150476,8 @@ self: { }: mkDerivation { pname = "persistent-mysql"; - version = "2.6.1"; - sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57"; + version = "2.6.2.1"; + sha256 = "0rk3rplz8y0b9macvb19w7m7ljnkq4gkmrjrdqdqcpga6ih357ik"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger mysql mysql-simple persistent @@ -150079,7 +150513,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-mysql-haskell_0_3_4_1" = callPackage + "persistent-mysql-haskell_0_3_5" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , io-streams, monad-control, monad-logger, mysql-haskell, network , persistent, persistent-template, resource-pool, resourcet, text @@ -150087,8 +150521,8 @@ self: { }: mkDerivation { pname = "persistent-mysql-haskell"; - version = "0.3.4.1"; - sha256 = "0w80z2098rh3svxncyaa4jrqdcdgzrfrzq4p981g34cs7kysfmn2"; + version = "0.3.5"; + sha256 = "0sc6hw112d8jk1rflyrmcc8gkjddl41bbw6hksyv7a5w6sc7z33n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150147,8 +150581,8 @@ self: { }: mkDerivation { pname = "persistent-postgresql"; - version = "2.6.1"; - sha256 = "0w7qssz4avq82vzs40kf82gkjdkcxqbkrfq6kz39x9m3za9b9pqc"; + version = "2.6.2"; + sha256 = "0140cki5c5aj21qg2cvqm5a511l6n4zbx3vb94hpfr1bs9nmfjam"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-control monad-logger persistent postgresql-libpq @@ -150261,8 +150695,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.6.2"; - sha256 = "1gw5p531187dqchi7384q3irh9n8p7prs172zpq9r1l1ziqw8dk1"; + version = "2.6.3"; + sha256 = "0wgj8v6wkqvj60klmxlmhgmbl6yp3i425v95p8s45wm96phpzn9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151252,32 +151686,6 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.12.5"; - sha256 = "1gvq7slby26cm62203gh13s4blwphiy0chdhkp3vl4k3gjlbslam"; - 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; - }) {}; - - "pinboard_0_9_12_6" = 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.6"; sha256 = "0z5sfgvbckd636hi1girlfpfz2v21xydzi3d1py3q6hyq34b67iq"; libraryHaskellDepends = [ @@ -151293,7 +151701,6 @@ self: { homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pinch" = callPackage @@ -154938,6 +155345,8 @@ self: { pname = "postgresql-typed"; version = "0.5.1"; sha256 = "0bvrbbzqjvzsm0bqinvbcz897fzf1isg76mk3hniyf8l9a19a3wv"; + revision = "1"; + editedCabalFile = "047bjdwgg94gbpzcapar46vw33n4g8gx639ns9i4d32105w32f0r"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite haskell-src-meta HDBC memory network old-locale postgresql-binary @@ -155053,6 +155462,7 @@ self: { homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postie" = callPackage @@ -155084,8 +155494,8 @@ self: { }: mkDerivation { pname = "postmark"; - version = "0.2.1"; - sha256 = "1afy3yra89909vilwr36j8vrvkhsy1xcp1jcvrdj90bj93rq64v3"; + version = "0.2.2"; + sha256 = "043q69v629r6y8ljij8nmfjz4qs3181278wrnlfgagfahh98pg0b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -156640,14 +157050,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_1_0" = callPackage + "process_1_6_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.1.0"; - sha256 = "0lwaa9qfh1x8zgmq7panhsvrs1nwcc1fficcg391dxp995ga4pr4"; + version = "1.6.2.0"; + sha256 = "0gsyzwvid2w1z5m0w492sqb8q8c86q9wa7iqjadcdhbv8ag9z6xm"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -157529,8 +157939,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "4.8.1"; - sha256 = "14q1zd6bvrfcs21pklxd6wgiqpb92v0464k4zhq9l31v4k2p5zpk"; + version = "4.9.0"; + sha256 = "1pciifl4hm5bmdx2li4hj3cm41ffj7s23r4ivkr8x3zghmik3n88"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157953,8 +158363,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.4"; - sha256 = "1qlkilnxfx5grim0hxf7drg2m48z76f88d4r61sy71npybf3mqnv"; + version = "2.4.5"; + sha256 = "1dcyv89z3869zd43wkby7xrzb1gz1iy2jrdr7yk45q2d1i63ssh4"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath mtl parsec syb utf8-string @@ -157968,8 +158378,8 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.4"; - sha256 = "0jr1clff6vn8lpx2rbc72angn0glc2v18ji5lqgzijri8zya9nqj"; + version = "2.4.5"; + sha256 = "0rz1v9iab012sc2m45yvmag94xg64gjrw0pqddp8gvw67i5lfan3"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -158298,6 +158708,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ptr" = callPackage + ({ mkDerivation, base, base-prelude, bug, bytestring, contravariant + , mtl, profunctors, quickcheck-instances, rerebase, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "ptr"; + version = "0.15.3"; + sha256 = "1h66bk595nv0jmcxdzfzvpr7ymfm6hl3n4bnglwlwkp2y1ymm3i3"; + libraryHaskellDepends = [ + base base-prelude bug bytestring contravariant mtl profunctors + semigroups text transformers + ]; + testHaskellDepends = [ + bug quickcheck-instances rerebase tasty tasty-hunit + tasty-quickcheck + ]; + homepage = "https://github.com/nikita-volkov/ptr"; + description = "Abstractions for operations on pointers"; + license = stdenv.lib.licenses.mit; + }) {}; + "pub" = callPackage ({ mkDerivation, base, bytestring, hedis, optparse-generic, pipes , pipes-bytestring, text @@ -158846,8 +159278,8 @@ self: { }: mkDerivation { pname = "purescript-bridge"; - version = "0.11.1.0"; - sha256 = "0syx11yzan1m86skjlxwv17ickplbiamkhbf2xsif0w0216whbvx"; + version = "0.11.1.1"; + sha256 = "023j88q724l38zqry6v916na1hlqhcinb5pw3cqssmql0cf32ajh"; libraryHaskellDepends = [ base containers directory filepath generic-deriving lens mtl text transformers @@ -159060,7 +159492,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pusher-http-haskell_1_5_0_0" = callPackage + "pusher-http-haskell_1_5_0_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , containers, cryptonite, hashable, hspec, HTTP, http-client , http-types, memory, network-uri, QuickCheck, scientific, text @@ -159068,8 +159500,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.5.0.0"; - sha256 = "098vj92gwzspqp0xbd4dxxb3dggpdz5gpf616p2spkj9xvdqgy17"; + version = "1.5.0.1"; + sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring containers cryptonite hashable HTTP http-client http-types memory text time transformers @@ -160866,8 +161298,8 @@ self: { }: mkDerivation { pname = "radium"; - version = "0.8.0"; - sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5"; + version = "0.9.0"; + sha256 = "142c2qra8080yndj2y0m0bdrqmf8l6r0z43pj1icdvjqj9451j16"; libraryHaskellDepends = [ base containers lens parsec ]; testHaskellDepends = [ base Cabal containers hspec lens parsec QuickCheck @@ -160895,13 +161327,15 @@ self: { }) {}; "radius" = callPackage - ({ mkDerivation, base, binary, bytestring, iproute, pretty-hex }: + ({ mkDerivation, base, binary, bytestring, cryptonite, iproute + , memory + }: mkDerivation { pname = "radius"; - version = "0.2.0.0"; - sha256 = "1arch1d93yijbm7r9a9ggjj7wzy7rk0immj5g8frczrbp0xpgmzy"; + version = "0.4.0.0"; + sha256 = "0bdixglg4yy5n6chw0n5mpk563dbkhh7iyzrmp9q2vpzxxvvdi06"; libraryHaskellDepends = [ - base binary bytestring iproute pretty-hex + base binary bytestring cryptonite iproute memory ]; homepage = "https://github.com/erickg/radius#readme"; description = "Remote Authentication Dial In User Service (RADIUS)"; @@ -161142,8 +161576,8 @@ self: { }: mkDerivation { pname = "rakuten"; - version = "0.1.0.0"; - sha256 = "18gasv78zq8l51kpwvx6gc089day6pmlz2f43vrfichqbivahmhf"; + version = "0.1.0.1"; + sha256 = "1y9kyipmhhy5f0f7v805a17x7g938vkvxnzj9n4h9rlprpdbdczc"; libraryHaskellDepends = [ aeson base bytestring connection constraints data-default-class extensible http-api-data http-client http-client-tls http-types @@ -161994,25 +162428,6 @@ self: { }: mkDerivation { pname = "ratel"; - version = "0.3.5"; - sha256 = "0mw59q5wbj5mbhznqd4szc5ps7d1r7gf490vdjqfblb5sqncy510"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base filepath tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ratel_0_3_6" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, filepath, http-client, http-client-tls, http-types - , tasty, tasty-hspec, text, uuid - }: - mkDerivation { - pname = "ratel"; version = "0.3.6"; sha256 = "04d93i7044zpax9hhx1xyipc8lliyn5z1xgq7k0011yzdsd8w31s"; libraryHaskellDepends = [ @@ -162023,7 +162438,6 @@ self: { 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 @@ -164068,15 +164482,18 @@ self: { }) {}; "reflex-sdl2" = callPackage - ({ mkDerivation, base, dependent-sum, mtl, ref-tf, reflex, sdl2 }: + ({ mkDerivation, async, base, containers, dependent-sum + , exception-transformers, mtl, primitive, ref-tf, reflex, sdl2, stm + }: mkDerivation { pname = "reflex-sdl2"; - version = "0.1.0.0"; - sha256 = "1k18lb7aa440i76yd6x4bh3sz6wsqv1cq1l93wpac1673bvxicll"; + version = "0.2.0.0"; + sha256 = "1aqcmj9gv1dhm8vqykawphk41fi24k4k061ynvfnpdypakldlvvw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dependent-sum mtl ref-tf reflex sdl2 + async base containers dependent-sum exception-transformers mtl + primitive ref-tf reflex sdl2 stm ]; executableHaskellDepends = [ base ]; homepage = "https://github.com/schell/reflex-sdl2#readme"; @@ -165271,13 +165688,13 @@ self: { "relational-record-examples" = callPackage ({ mkDerivation, base, HDBC, HDBC-session, HDBC-sqlite3 - , persistable-record, relational-query, relational-query-HDBC - , relational-schemas, template-haskell, time + , persistable-record, product-isomorphic, relational-query + , relational-query-HDBC, relational-schemas, template-haskell, time }: mkDerivation { pname = "relational-record-examples"; - version = "0.3.2.1"; - sha256 = "1y0bxg2sgrq72wpa1llymhn3kbks7krnsh0qzqd1cqni01g6q8hv"; + version = "0.4.0.0"; + sha256 = "0ch075l87sxxgmvis6hnrpc72lr0v21nx0xhw0ahpirqbw01ndqh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165286,10 +165703,11 @@ self: { template-haskell ]; executableHaskellDepends = [ - base relational-query template-haskell time + base product-isomorphic relational-query template-haskell time ]; description = "Examples of Haskell Relationa Record"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-schemas" = callPackage @@ -166260,8 +166678,8 @@ self: { pname = "req-conduit"; version = "0.2.1"; sha256 = "1f3nbmdmkr68i5nm3527s06w9crdgn9jrkzam2fgcg8qp6q73q4c"; - revision = "1"; - editedCabalFile = "0pz1pz7l06c6g0d6ripgb8yn5kz5zryzjhabnx93d89qix0dzkg3"; + revision = "2"; + editedCabalFile = "1r7qfg670gdncb9yszgg4dw5x8az17cfgbkpbnb7zjdy7rqrj442"; libraryHaskellDepends = [ base bytestring conduit http-client req resourcet transformers ]; @@ -166418,15 +166836,14 @@ self: { }: mkDerivation { pname = "resolv"; - version = "0.1.1.0"; - sha256 = "03k0r57q93y3iv3g62zpjhh5a647v3g9imn3z9jr1vnj5gracyh5"; + version = "0.1.1.1"; + sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; testHaskellDepends = [ base bytestring directory filepath tasty tasty-hunit ]; - homepage = "http://github.com/hvr/resolv"; description = "Domain Name Service (DNS) lookup via the libresolv standard library routines"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -167012,8 +167429,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.7.4.2"; - sha256 = "0z5ls9z5zcqkk3vbpl4wdgspi98n19m5i8mfian1fyxkf0jkj6sj"; + version = "0.7.4.3"; + sha256 = "0i47gmlljz00fwf2qwkrh24hgsyw5sz2npaighx4wxvykf00d390"; libraryHaskellDepends = [ base data-default-class exceptions ghc-prim random transformers ]; @@ -167243,8 +167660,8 @@ self: { }: mkDerivation { pname = "rhine"; - version = "0.1.0.0"; - sha256 = "1gjz5i7a00kq48fkg7ms3qr04jzg8mw5vb3lgn1pflp45m4p95vi"; + version = "0.1.1.0"; + sha256 = "1vl7hnnb2bmrzaf4231pq9rvn8l7y2y3x5g6b1ry77rb45bzspkq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167253,6 +167670,7 @@ self: { executableHaskellDepends = [ base ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rhythm-game-tutorial" = callPackage @@ -168179,6 +168597,35 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rose-trees_0_0_4_4" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq, hashable + , mtl, QuickCheck, quickcheck-instances, semigroupoids, semigroups + , sets, tasty, tasty-quickcheck, unordered-containers, witherable + }: + mkDerivation { + pname = "rose-trees"; + version = "0.0.4.4"; + sha256 = "1kbjkfknl2pyp30n5c6m6xavqlm8zg06w78b3x7iwvi854yi64r3"; + libraryHaskellDepends = [ + base containers deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + testHaskellDepends = [ + base containers deepseq hashable QuickCheck quickcheck-instances + semigroupoids semigroups sets tasty tasty-quickcheck + unordered-containers witherable + ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl QuickCheck + quickcheck-instances semigroupoids semigroups sets + unordered-containers witherable + ]; + description = "A collection of rose tree structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rose-trie" = callPackage ({ mkDerivation, base, containers, deepseq, minilens, mtl , transformers @@ -169607,6 +170054,7 @@ self: { homepage = "https://github.com/kccqzy/haskell-sajson#readme"; description = "Fast JSON parsing powered by Chad Austin's sajson library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "saltine" = callPackage @@ -170186,13 +170634,13 @@ self: { ({ mkDerivation, aeson, array, base, base64-bytestring , basic-prelude, binary, binary-conduit, bytestring, conduit , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck + , QuickCheck, resourcet, tasty, tasty-hunit, tasty-quickcheck , template-haskell, text, unordered-containers, yaml }: mkDerivation { pname = "sbp"; - version = "2.2.12"; - sha256 = "14c188bn883nd5nngvydx6aj8z7x1cgjgsl41l8a6hsiwjx721l0"; + version = "2.2.15"; + sha256 = "02y9mvy2ij1kdn06wgdpn5y5f4wa814lj4krvfsjyc2g9am06y83"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -170202,7 +170650,7 @@ self: { ]; executableHaskellDepends = [ aeson base basic-prelude binary-conduit bytestring conduit - conduit-extra yaml + conduit-extra resourcet yaml ]; testHaskellDepends = [ aeson base base64-bytestring basic-prelude bytestring QuickCheck @@ -171651,7 +172099,7 @@ self: { executableHaskellDepends = [ base data-default-class sdl2 vector ]; description = "Bindings to SDL2_mixer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2_mixer;}; "sdl2-ttf" = callPackage @@ -172560,15 +173008,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "sensu-run_0_4_0" = callPackage + "sensu-run_0_4_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, filepath, http-client , http-types, lens, network, optparse-applicative, process , temporary, text, time, unix, unix-compat, vector, wreq }: mkDerivation { pname = "sensu-run"; - version = "0.4.0"; - sha256 = "0wsrm7l12yfm89yfd5y1w8xypfg29d2s1afy7m8dpcdypmrxrghw"; + version = "0.4.0.1"; + sha256 = "05vmrbf3hk26ya5rvhadc8q1qb932x2n0x153bhafbf60yzc4bc5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -173211,6 +173659,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-cookie_0_5_0_6" = callPackage + ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring + , cereal, cookie, criterion, cryptonite, data-default, deepseq + , exceptions, hspec, http-api-data, http-types, memory, mtl + , QuickCheck, servant, servant-server, tagged, time, transformers + , wai + }: + mkDerivation { + pname = "servant-auth-cookie"; + version = "0.5.0.6"; + sha256 = "1bxvgf71710jzs0k83bz4rdj7zsagmwpsqv96invw8d7shipg650"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-api-data http-types memory + mtl servant servant-server tagged time transformers wai + ]; + testHaskellDepends = [ + base bytestring cereal cryptonite data-default deepseq hspec + QuickCheck servant-server time transformers + ]; + benchmarkHaskellDepends = [ + base bytestring criterion cryptonite servant-server + ]; + description = "Authentication via encrypted cookies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-auth-docs" = callPackage ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck , servant, servant-auth, servant-docs, text, yaml @@ -173505,6 +173983,8 @@ self: { pname = "servant-checked-exceptions"; version = "0.4.1.0"; sha256 = "19h0vywlh6b41mdjpka4b7rz4l6gxmjlvji8nzbgkllsjgr81g3g"; + revision = "1"; + editedCabalFile = "07srldxvgzgzxq5dik787ays7xylwsdmz8bv3ffvp435nvvpmrzr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -173538,8 +174018,8 @@ self: { pname = "servant-client"; version = "0.11"; sha256 = "1yiar76gf1zg8jaymz0xq751xs51fp0ryra4x4hwg71s32l2nvga"; - revision = "1"; - editedCabalFile = "0ymiqsn6451znpn524w1wn129plnqbplbvwxwjpp1drz3ab6xk6b"; + revision = "2"; + editedCabalFile = "0w3b3036rv9vfya5ayn9z70rkwk7hd9zisl7klgxzk4fgfmc3sgd"; libraryHaskellDepends = [ aeson attoparsec base base-compat base64-bytestring bytestring exceptions generics-sop http-api-data http-client http-client-tls @@ -173915,6 +174395,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-kotlin" = callPackage + ({ mkDerivation, aeson, base, containers, directory, formatting + , hspec, http-api-data, lens, servant, servant-foreign, shelly + , text, time, wl-pprint-text + }: + mkDerivation { + pname = "servant-kotlin"; + version = "0.1.0.0"; + sha256 = "0rsy8bmycmgxpnimaly08shlaqmna084bdgcxxs3ad0kicc427r1"; + libraryHaskellDepends = [ + base containers directory formatting lens servant servant-foreign + text time wl-pprint-text + ]; + testHaskellDepends = [ + aeson base containers directory formatting hspec http-api-data lens + servant servant-foreign text time wl-pprint-text + ]; + benchmarkHaskellDepends = [ + aeson base containers directory formatting http-api-data lens + servant servant-foreign shelly text time wl-pprint-text + ]; + homepage = "https://github.com/matsubara0507/servant-kotlin#readme"; + description = "Automatically derive Kotlin class to query servant webservices"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { @@ -173959,8 +174465,8 @@ self: { pname = "servant-mock"; version = "0.8.2"; sha256 = "146z4n7ayg0347kabwdz1crha7ilfdcdx3pazdgsmq2bl8mwad3w"; - revision = "1"; - editedCabalFile = "19vvzy09wj0yxjz4sv417c45h1n34nd7zc9n8agxavr3wyi9lihh"; + revision = "2"; + editedCabalFile = "16zbbjz7rj7fg6qs8zjy9arz7bwza9pq1gn15csnsvm5n6qnpgal"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174347,10 +174853,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.11"; - sha256 = "1c821ia2741v7nxbv651hcj21dmcqnqf4ix198is5b63sj4ff3ib"; - revision = "1"; - editedCabalFile = "04s8kzc1jzarxg68nqgdckv0ajw846a1byqjksgzlqlmfqm0l32l"; + version = "0.11.0.1"; + sha256 = "0yrcs1ixy7mzifdyssi58m34xn95mfy9zxbkm9k5z6svqnv1qp72"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cabal-doctest ]; @@ -174557,10 +175061,8 @@ self: { }: mkDerivation { pname = "servant-swagger-ui"; - version = "0.2.4.3.0.20"; - sha256 = "18qp908s0kjcz6dlvj2031kr8qjnzrgh2v92mdg4lwa1j7ddf0xn"; - revision = "1"; - editedCabalFile = "1wsbb9zaq5qv39hrymy1cma581337rbvqlm7y24jwfvk4vafs3fp"; + version = "0.2.4.3.4.0"; + sha256 = "1vb1bp7hjjyhb1p6x0j7z2ky05n72qm7zcmwgnsmnqalaxdnsvri"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -174912,25 +175414,6 @@ self: { }: mkDerivation { pname = "servius"; - version = "1.2.0.2"; - sha256 = "0asxkdg7csxmnpzw672jazynhnnc73ddpay65npql0jz93mq45n1"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base blaze-builder blaze-html bytestring http-types markdown - shakespeare text wai wai-app-static - ]; - homepage = "http://github.com/snoyberg/servius#readme"; - description = "Warp web server with template rendering"; - license = stdenv.lib.licenses.mit; - }) {}; - - "servius_1_2_0_3" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, bytestring - , http-types, markdown, shakespeare, text, wai, wai-app-static - }: - mkDerivation { - pname = "servius"; version = "1.2.0.3"; sha256 = "1w330lvkikbsv92g398kmnlw71wym6l080d8xsdfdx2wwl0iyqj7"; isLibrary = false; @@ -174942,7 +175425,6 @@ self: { homepage = "http://github.com/snoyberg/servius#readme"; description = "Warp web server with template rendering"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html" = callPackage @@ -175334,8 +175816,8 @@ self: { }: mkDerivation { pname = "sext"; - version = "0.1.3"; - sha256 = "0z6a4ghv5knfcwv28bax4gny5za0k0y076d15bnk01qg293w273b"; + version = "0.1.3.1"; + sha256 = "0836faqrrb9wsw5hlm82587isw6rkn4v8i6dh9hzxsqif1izd363"; libraryHaskellDepends = [ base bytestring template-haskell text vector ]; @@ -177753,18 +178235,18 @@ self: { }) {}; "simplessh" = callPackage - ({ mkDerivation, base, bytestring, mtl, ssh2 }: + ({ mkDerivation, base, bytestring, libssh2, mtl }: mkDerivation { pname = "simplessh"; version = "0.2.0.5"; sha256 = "1f0rck8shcm69bg2n2ijjad6dzrybfyrjqpsx5qh333mmz0q7bbq"; libraryHaskellDepends = [ base bytestring mtl ]; - librarySystemDepends = [ ssh2 ]; + librarySystemDepends = [ libssh2 ]; homepage = "http://hub.darcs.net/thoferon/simplessh"; description = "Simple wrapper around libssh2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {ssh2 = null;}; + }) {inherit (pkgs) libssh2;}; "simplest-sqlite" = callPackage ({ mkDerivation, base, bytestring, exception-hierarchy, sqlite @@ -178391,7 +178873,7 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "skylighting_0_4_1" = callPackage + "skylighting_0_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary , blaze-html, bytestring, case-insensitive, containers, criterion , Diff, directory, filepath, HUnit, hxt, mtl, pretty-show, random @@ -178400,8 +178882,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.4.1"; - sha256 = "0dsngs2nw2ijhxxwa8d7fb9rxgqz6kgimbsvxmhpd5s4y6a1ygf4"; + version = "0.4.2"; + sha256 = "0szhhmjz14wq1ica3gl6nj5fh85fwh55xyywlq8q3dq8isl1hcz3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180202,17 +180684,26 @@ self: { }) {}; "snaplet-redis" = callPackage - ({ mkDerivation, base, configurator, hedis, lens, mtl, network - , snap, text, transformers + ({ mkDerivation, aeson, base, bytestring, cereal, clientsession + , configurator, hedis, heist, lens, monad-control, mtl, network + , snap, snap-core, snap-server, text, time, transformers + , unordered-containers, xmlhtml }: mkDerivation { pname = "snaplet-redis"; - version = "0.1.4.2"; - sha256 = "0ri5cj3gjz5c1snh7kbncb08ijs1551ixr06v3nxjsb03hrl4hhh"; + version = "0.1.5"; + sha256 = "12c4pgh2axnvd7hnyf0xpnsidfss39siys3nzwafdmm0p5wf67bx"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base configurator hedis lens mtl network snap text transformers + base bytestring cereal clientsession configurator hedis lens mtl + network snap snap-core text time transformers unordered-containers + ]; + executableHaskellDepends = [ + aeson base bytestring hedis heist lens monad-control mtl snap + snap-core snap-server text time xmlhtml ]; - homepage = "https://github.com/dzhus/snaplet-redis/"; + homepage = "https://github.com/dzhus/snaplet-redis#readme"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187034,6 +187525,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "substring-parser" = callPackage + ({ mkDerivation, attoparsec, base, hspec, NoTrace, text }: + mkDerivation { + pname = "substring-parser"; + version = "0.1.0.0"; + sha256 = "0f4rbfpdhbnpk4gm4rsavblqdabxlqbf58xr9rvjcxq62hac6lvc"; + libraryHaskellDepends = [ attoparsec base NoTrace text ]; + testHaskellDepends = [ attoparsec base hspec NoTrace text ]; + homepage = "https://gitlab.com/igrep/substring-parser"; + description = "Match / replace substrings with a parser combinators"; + license = stdenv.lib.licenses.asl20; + }) {}; + "subtitleParser" = callPackage ({ mkDerivation, attoparsec, base, containers, text }: mkDerivation { @@ -187736,8 +188240,8 @@ self: { }: mkDerivation { pname = "swagger-petstore"; - version = "0.0.1.4"; - sha256 = "177aipxcycs79kh5vdkgq5rj8n0mixy374mxaggfp959i28rx164"; + version = "0.0.1.5"; + sha256 = "0fpviny6yxrmdhraan3ffhgwynn1lj88xdj093jf4229ysj0cskk"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -192212,6 +192716,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "test-fixture_0_5_1_0" = callPackage + ({ mkDerivation, base, data-default-class, exceptions + , haskell-src-exts, haskell-src-meta, hspec, hspec-discover, mtl + , template-haskell, th-orphans, transformers + }: + mkDerivation { + pname = "test-fixture"; + version = "0.5.1.0"; + sha256 = "1mjy7nx2w7gvsibvc5vl21hr8ypxd4qdiy46iagnfij1k3kdh6wv"; + libraryHaskellDepends = [ + base data-default-class exceptions haskell-src-exts + haskell-src-meta mtl template-haskell th-orphans + ]; + testHaskellDepends = [ + base hspec hspec-discover mtl template-haskell transformers + ]; + homepage = "http://github.com/cjdev/test-fixture#readme"; + description = "Test monadic side-effects"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "test-framework" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers , hostname, old-locale, random, regex-posix, time, xml @@ -192578,13 +193104,18 @@ self: { }) {}; "testCom" = callPackage - ({ mkDerivation, base, haskell-src-meta, template-haskell }: + ({ mkDerivation, base, haskell-src-meta, random, template-haskell + }: mkDerivation { pname = "testCom"; - version = "0.2.0"; - sha256 = "1gp8ylpp6315srcr1pi78a9f6kr24kp5dyfml9yibj35qd6wdil2"; - libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; - testHaskellDepends = [ base haskell-src-meta template-haskell ]; + version = "0.3.0"; + sha256 = "0j9mh47jq6igh5xkalgbrvjrvjsnyl7ir6jq7kr9rhh7rab4m7h1"; + libraryHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; + testHaskellDepends = [ + base haskell-src-meta random template-haskell + ]; description = "Write your tests in comments"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -192989,8 +193520,8 @@ self: { }: mkDerivation { pname = "text-format-heavy"; - version = "0.1.4.0"; - sha256 = "1kmiksxzvd99d762n4vgrx90awsdy0s3gm1a5s73r9yd79pajq5n"; + version = "0.1.5.0"; + sha256 = "127h2pw3p9ixx34jiql9kgpjbjmkmwigm56iklaz6wxd69zr0sfx"; libraryHaskellDepends = [ base bytestring containers data-default parsec text time ]; @@ -194359,8 +194890,8 @@ self: { }: mkDerivation { pname = "thank-you-stars"; - version = "0.1.0"; - sha256 = "1qxi26g81ndrx8vxckb8hkpaqqpbd60r2ck705mhafrv0yd3kry7"; + version = "0.2.0"; + sha256 = "0a1mv7k7m4yaadfrmb45s09aa5zy0wd2jccjsyqhp63v89m58z8j"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -194368,7 +194899,9 @@ self: { hackage-db req split text ]; executableHaskellDepends = [ base containers directory filepath ]; - testHaskellDepends = [ base Cabal containers hackage-db hspec ]; + testHaskellDepends = [ + base Cabal containers directory filepath hspec + ]; homepage = "https://github.com/y-taka-23/thank-you-stars#readme"; description = "Give your dependencies stars on GitHub!"; license = stdenv.lib.licenses.bsd3; @@ -194620,8 +195153,8 @@ self: { }: mkDerivation { pname = "thread-hierarchy"; - version = "0.1.0.2"; - sha256 = "1fhbwzx8shf2ph9l5mkrlz40dxdzn02rvjgz9l2kvjmi8v5rclxk"; + version = "0.1.0.3"; + sha256 = "1j5caivjcvrmfqgl13lhlx9dq81kka64w96ykb0bfb089kwi0j9f"; libraryHaskellDepends = [ base containers lifted-base monad-control transformers-base ]; @@ -194808,22 +195341,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "threepenny-editors_0_5_5" = callPackage + "threepenny-editors_0_5_6" = callPackage ({ mkDerivation, base, bifunctors, casing, containers, generics-sop - , profunctors, threepenny-gui + , profunctors, text, threepenny-gui }: mkDerivation { pname = "threepenny-editors"; - version = "0.5.5"; - sha256 = "1gblkdkmkngry2fncjv4l7f3q614rw4p25cskf850kjgvcvm04fj"; + version = "0.5.6"; + sha256 = "0gnbzf3a3xykkf8xc5bnn1wznszyrnllf5s6cb4gqz6cbqnf2mnw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; executableHaskellDepends = [ - base bifunctors casing containers generics-sop profunctors + base bifunctors casing containers generics-sop profunctors text threepenny-gui ]; homepage = "https://github.com/pepeiborra/threepenny-editors"; @@ -195350,8 +195883,8 @@ self: { ({ mkDerivation, base, HUnit }: mkDerivation { pname = "tile"; - version = "0.1.0.0"; - sha256 = "1j952m67spr4v7g3i8lpa9cn79rlmb8ybbg9hw2yswcijpq52fyb"; + version = "0.3.0.0"; + sha256 = "1w35rhrpjs39xbcg2i635jxdkbp4nhkzrrnl9p3bz85yc1iiiv8m"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/caneroj1/tile#readme"; @@ -196417,8 +196950,8 @@ self: { ({ mkDerivation, base, containers, HUnit, network-uri, text }: mkDerivation { pname = "tld"; - version = "0.3.0.1"; - sha256 = "0rfzcwaj9fyhrc8vswjjnqdj4bi7jln2lq38pcvnkl5zwx7kqhxa"; + version = "0.3.0.2"; + sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; description = "This project separates subdomains, domains, and top-level-domains from URLs"; @@ -196969,8 +197502,8 @@ self: { }: mkDerivation { pname = "tomlcheck"; - version = "0.1.0.14"; - sha256 = "1zms4vigyy29c3wmjh6zmhjlmvj3x98dx99mdpxws6sxl0wibfcv"; + version = "0.1.0.17"; + sha256 = "0yfy0453j3s5sskz529rd50dbjxhr411a4g5803dsw06kibij05s"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -199153,25 +199686,24 @@ self: { "tweet-hs" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, authenticate-oauth, base , bytestring, composition-prelude, containers, criterion - , data-default, directory, extra, hspec, htoml, http-client - , http-client-tls, http-types, lens, megaparsec - , optparse-applicative, QuickCheck, split, text - , unordered-containers + , data-default, directory, extra, hspec, htoml-megaparsec + , http-client, http-client-tls, http-types, lens, megaparsec + , optparse-applicative, split, text, unordered-containers }: mkDerivation { pname = "tweet-hs"; - version = "1.0.1.9"; - sha256 = "1s9gg1247xa2rl30s9i4rza04107s7awrx7pbmd4vc436mv4624z"; + version = "1.0.1.21"; + sha256 = "0m35d2ym83d3c0k2imjr9ws2nai6yhm784is9k1g6xrbazd947gr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-wl-pprint authenticate-oauth base bytestring - composition-prelude containers data-default directory extra htoml - http-client http-client-tls http-types lens megaparsec - optparse-applicative split text unordered-containers + composition-prelude containers data-default directory extra + htoml-megaparsec http-client http-client-tls http-types lens + megaparsec optparse-applicative split text unordered-containers ]; executableHaskellDepends = [ base ]; - testHaskellDepends = [ base bytestring hspec QuickCheck ]; + testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base bytestring criterion megaparsec ]; homepage = "https://github.com/vmchale/command-line-tweeter#readme"; description = "Command-line tool for twitter"; @@ -200199,17 +200731,19 @@ self: { }) {}; "type-of-html" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, criterion, ghc-prim - , hspec, QuickCheck, text + ({ mkDerivation, base, blaze-html, bytestring, criterion + , double-conversion, ghc-prim, hspec, QuickCheck, text }: mkDerivation { pname = "type-of-html"; - version = "1.0.0.0"; - sha256 = "0yknmw9xfi0pdg0ps2wg966i5k9y3nrqr38srj4lifng9bcgahx0"; - libraryHaskellDepends = [ base bytestring ghc-prim text ]; - testHaskellDepends = [ base hspec QuickCheck text ]; + version = "1.0.1.1"; + sha256 = "1fc8pqkvmrcvh3wayykqbc0ha336x77xq0hbzym9bknzr1xpy56n"; + libraryHaskellDepends = [ + base bytestring double-conversion ghc-prim text + ]; + testHaskellDepends = [ base hspec QuickCheck ]; benchmarkHaskellDepends = [ - base blaze-html bytestring criterion text + base blaze-html bytestring criterion QuickCheck text ]; homepage = "https://github.com/knupfer/type-of-html"; description = "High performance type driven html generation"; @@ -200525,6 +201059,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "typedflow" = callPackage + ({ mkDerivation, base, ghc-typelits-knownnat, mtl, pretty-compact + }: + mkDerivation { + pname = "typedflow"; + version = "0.9"; + sha256 = "0hanh2gww0i4a8dkq1kxizni8qgk5mzj6qkvz9k1yvprpx2kym8c"; + libraryHaskellDepends = [ + base ghc-typelits-knownnat mtl pretty-compact + ]; + description = "Typed frontend to TensorFlow and higher-order deep learning"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "typedquery" = callPackage ({ mkDerivation, aeson, base, bytestring, haskell-src-meta, parsec , template-haskell, text, transformers @@ -200848,8 +201396,8 @@ self: { }: mkDerivation { pname = "ua-parser"; - version = "0.7.4"; - sha256 = "1maph5na307ih1qx2ziww3mhc9c0a5rxqj2jfc4w404hisby947i"; + version = "0.7.4.1"; + sha256 = "1pwls2qbhd3ig2lm4ix3kh08yw20k0iajigbxqd0vmpkx459pmrf"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring data-default file-embed pcre-light text yaml @@ -202193,21 +202741,26 @@ self: { }) {}; "universum" = callPackage - ({ mkDerivation, base, bytestring, containers, deepseq, exceptions - , ghc-prim, hashable, microlens, microlens-mtl, mtl, safe - , safe-exceptions, stm, text, text-format, transformers - , type-operators, unordered-containers, utf8-string, vector + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , exceptions, ghc-prim, hashable, microlens, microlens-mtl, mtl + , safe, safe-exceptions, semigroups, stm, text, text-format + , transformers, type-operators, unordered-containers, utf8-string + , vector }: mkDerivation { pname = "universum"; - version = "0.7.0"; - sha256 = "1d2887l2g8f9scpwcrvlxk0dm8w9d7qnlpbfjswa08dnmy63kcrf"; + version = "0.7.1"; + sha256 = "1q7q1ynfm4m1zz2inyvvj7868p3yxjl7w512j5xiz4mzx3llb292"; libraryHaskellDepends = [ base bytestring containers deepseq exceptions ghc-prim hashable microlens microlens-mtl mtl safe safe-exceptions stm text text-format transformers type-operators unordered-containers utf8-string vector ]; + benchmarkHaskellDepends = [ + base containers criterion deepseq hashable mtl semigroups text + unordered-containers + ]; homepage = "https://github.com/serokell/universum"; description = "Custom prelude used in Serokell"; license = stdenv.lib.licenses.mit; @@ -203860,8 +204413,8 @@ self: { }: mkDerivation { pname = "uuid-crypto"; - version = "1.3.0.0"; - sha256 = "02vzxxijz2pdwq4asgvsxvj6gcnjdzrfrhiavwbmc0vckw8s108s"; + version = "1.3.1.0"; + sha256 = "10r6phn23f3piqs4jhx764pcl6f3dbxq75pvwsnmwcszdi970a3l"; libraryHaskellDepends = [ base binary bytestring cryptoids cryptoids-types exceptions uuid ]; @@ -204217,23 +204770,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "validation_0_6_0" = callPackage - ({ mkDerivation, base, bifunctors, Cabal, cabal-doctest, directory - , doctest, filepath, lens, mtl, QuickCheck, semigroupoids - , semigroups, template-haskell, transformers + "validation_0_6_2" = callPackage + ({ mkDerivation, base, bifunctors, hedgehog, HUnit, lens, mtl + , semigroupoids, semigroups, transformers }: mkDerivation { pname = "validation"; - version = "0.6.0"; - sha256 = "1x2mi8lgy18q7g2gwwk8c31kg77lkfpmjkxf5nkli5pri9z947av"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; + version = "0.6.2"; + sha256 = "0631g3ffxchgg6hpy8w94a3713plgqp1k45zq85vaxyjg2x5bh7r"; libraryHaskellDepends = [ base bifunctors lens mtl semigroupoids semigroups transformers ]; - testHaskellDepends = [ - base cabal-doctest directory doctest filepath QuickCheck - template-haskell - ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; homepage = "https://github.com/qfpl/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; @@ -205259,8 +205807,8 @@ self: { pname = "vector-space-points"; version = "0.2.1.2"; sha256 = "0jqiy7b3hy21c0imqxbzvcx0hxy33bh97bv47bpv099dx32d7spy"; - revision = "1"; - editedCabalFile = "1vgywmhxkkb7mfirl0wik5mk8xj9s3d23f9zwj5svnbyvdkc3fl4"; + revision = "2"; + editedCabalFile = "0jnnzhwkc82flvaxqc1vv30d8vpdwnyi82614c34j79m51wcmvya"; libraryHaskellDepends = [ base vector-space ]; description = "A type for points, as distinct from vectors"; license = stdenv.lib.licenses.bsd3; @@ -205484,10 +206032,8 @@ self: { }: mkDerivation { pname = "vgrep"; - version = "0.2.0.0"; - sha256 = "0crd7hrnvl4z5xb1b6km47b6250ica1yv4sy370m7lkjx00c4lrb"; - revision = "1"; - editedCabalFile = "0qljh5nddpgv2w7y3nq5h12jpwc509yyizqv8cjzdr1krfsnk4ck"; + version = "0.2.1.0"; + sha256 = "0k74bpi995wqxmin6h7bx3yjiwh403c708yjp19igbw1971irxjr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -206975,6 +207521,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wai-middleware-brotli" = callPackage + ({ mkDerivation, base, binary, bytestring, directory, filepath + , hs-brotli, http-types, mtl, tasty, tasty-hspec, tasty-hunit, unix + , wai, wai-app-static, wai-extra, warp + }: + mkDerivation { + pname = "wai-middleware-brotli"; + version = "0.1.0.0"; + sha256 = "1gv3s2y49179kzkjqzs905g2rq1a9al9n716y86ivan8nnkhxjnq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring directory filepath hs-brotli http-types unix + wai + ]; + executableHaskellDepends = [ + base http-types wai wai-app-static wai-extra warp + ]; + testHaskellDepends = [ + base bytestring hs-brotli http-types mtl tasty tasty-hspec + tasty-hunit wai wai-extra + ]; + homepage = "https://github.com/iand675/wai-middleware-brotli#readme"; + description = "WAI middleware for brotli compression"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-cache" = callPackage ({ mkDerivation, base, binary, blaze-builder-conduit, bytestring , conduit, crypto-conduit, http-types, HUnit, pureMD5 @@ -207790,8 +208364,8 @@ self: { }: mkDerivation { pname = "wai-session-postgresql"; - version = "0.2.1.0"; - sha256 = "16myzcxas9nwhd54bc5pi1biym39vrz707rfmmc1mar6ia7a1xil"; + version = "0.2.1.1"; + sha256 = "0yab46s0xyd49s46skrgm9hk4pvzqv3sr8mzr58231jvn7lijyf9"; libraryHaskellDepends = [ base bytestring cereal cookie data-default entropy postgresql-simple resource-pool text time transformers wai @@ -209778,6 +210352,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "wigner-ville-accelerate" = callPackage + ({ mkDerivation, accelerate, accelerate-fft, base, wigner }: + mkDerivation { + pname = "wigner-ville-accelerate"; + version = "0.1.0.2"; + sha256 = "1h5zdn3lkjnlr4m7s2xxiv36cr6hs7bnkr5rq20z585rfhbhavj5"; + libraryHaskellDepends = [ accelerate accelerate-fft base ]; + testHaskellDepends = [ base wigner ]; + homepage = "https://github.com/Haskell-mouse/wigner-ville-accelerate"; + description = "Wigner-ville transform using the Accelerate library"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {wigner = null;}; + "wikicfp-scraper" = callPackage ({ mkDerivation, attoparsec, base, bytestring, filepath, hspec , scalpel-core, text, time @@ -209900,6 +210488,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "windns" = callPackage + ({ mkDerivation, base, bytestring, deepseq, dnsapi }: + mkDerivation { + pname = "windns"; + version = "0.1.0.0"; + sha256 = "1hphwmwc1182p5aqjswcgqjbilm91rv5svjqhd93cqq599gg8q0c"; + revision = "1"; + editedCabalFile = "0kz6gv4dpppnnnyl57ibxi9gvykmkbmaz22yssx92mq306wbyimv"; + libraryHaskellDepends = [ base bytestring deepseq ]; + librarySystemDepends = [ dnsapi ]; + description = "Domain Name Service (DNS) lookup via the Windows dnsapi standard library"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {dnsapi = null;}; + "windowslive" = callPackage ({ mkDerivation, base, Crypto, dataenc, mtl, network, parsec , pretty, split, time, urlencoded @@ -210085,6 +210688,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "witherable_0_2" = callPackage + ({ mkDerivation, base, base-orphans, containers, hashable + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "witherable"; + version = "0.2"; + sha256 = "0bga2vx3bkg1m6pwdvnxbqjbljpwr6mxyq94fi87j3zy08mmmnwx"; + libraryHaskellDepends = [ + base base-orphans containers hashable transformers + unordered-containers vector + ]; + homepage = "https://github.com/fumieval/witherable"; + description = "filterable traversable"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "witness" = callPackage ({ mkDerivation, base, constraints, semigroupoids, transformers }: mkDerivation { @@ -210356,8 +210977,8 @@ self: { }: mkDerivation { pname = "wolf"; - version = "0.3.26"; - sha256 = "1wa1qpz5fdsgisvm9idla3jri1gzdgycmiphhynkn1k0337j0xy9"; + version = "0.3.29"; + sha256 = "147s2xg9y77gw81gnqgijnfzfx728ddv018n7zs2sl231asjqy3i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210466,8 +211087,8 @@ self: { }: mkDerivation { pname = "wordchoice"; - version = "0.1.2.0"; - sha256 = "01zmgxs09dplk8hf41cfqjcm6w9mjnd6szn22kz2ycjxxdd7kncv"; + version = "0.1.2.1"; + sha256 = "0b9la9lh00x0rnh4mpgl8djgik72x75q5070r96ibzkl5hp6483w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -210481,6 +211102,7 @@ self: { homepage = "https://github.com/githubuser/wordchoice#readme"; description = "Get word counts and distributions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wordcloud" = callPackage @@ -211117,6 +211739,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ws" = callPackage + ({ mkDerivation, async, base, bytestring, exceptions, haskeline + , mtl, network, network-uri, optparse-applicative, text, websockets + , wuss + }: + mkDerivation { + pname = "ws"; + version = "0.0.1"; + sha256 = "1i9jglq199pwxs9giigf3xgndspiwp30s2fb833mc7fl5s5mghhh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring exceptions haskeline mtl network network-uri + text websockets wuss + ]; + executableHaskellDepends = [ + base exceptions network-uri optparse-applicative + ]; + description = "A simple CLI utility for interacting with a websocket"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ws-chans" = callPackage ({ mkDerivation, async, base, http-types, HUnit, network , QuickCheck, quickcheck-instances, test-framework @@ -212175,6 +212819,7 @@ self: { homepage = "https://github.com/aisamanra/xleb"; description = "A simple monadic language for parsing XML structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xls" = callPackage @@ -212595,19 +213240,22 @@ self: { }) {}; "xml-isogen" = callPackage - ({ mkDerivation, base, dom-parser, lens, mtl, QuickCheck - , semigroups, template-haskell, text, xml-conduit - , xml-conduit-writer + ({ mkDerivation, base, data-default, dom-parser, generic-arbitrary + , hspec, lens, mtl, QuickCheck, quickcheck-instances, semigroups + , template-haskell, text, xml-conduit, xml-conduit-writer }: mkDerivation { pname = "xml-isogen"; - version = "0.2.0"; - sha256 = "1dmf660cyrs96ih1swlw44spd2g05dfikpak9mmjag40mab36116"; + version = "0.2.1"; + sha256 = "1kfv09ykz96dqd45bi618qi2qhzjkifh377ccylfzd55jkqnvn6l"; libraryHaskellDepends = [ base dom-parser lens mtl QuickCheck semigroups template-haskell text xml-conduit xml-conduit-writer ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default dom-parser generic-arbitrary hspec QuickCheck + quickcheck-instances semigroups xml-conduit xml-conduit-writer + ]; homepage = "https://github.com/typeable/xml-isogen"; description = "Generate XML-isomorphic types"; license = stdenv.lib.licenses.mit; @@ -213217,6 +213865,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xmonad-extras_0_13_2" = callPackage + ({ mkDerivation, alsa-mixer, base, bytestring, containers, hint + , libmpd, mtl, network, regex-posix, X11, xmonad, xmonad-contrib + }: + mkDerivation { + pname = "xmonad-extras"; + version = "0.13.2"; + sha256 = "1ixnr76gmym9gab6m6r2rvrrvakxa5kda6cll9nbq954sjvj54jx"; + configureFlags = [ + "-f-with_hlist" "-fwith_parsec" "-fwith_split" + ]; + libraryHaskellDepends = [ + alsa-mixer base bytestring containers hint libmpd mtl network + regex-posix X11 xmonad xmonad-contrib + ]; + homepage = "https://github.com/xmonad/xmonad-extras"; + description = "Third party extensions for xmonad with wacky dependencies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xmonad-screenshot" = callPackage ({ mkDerivation, base, gtk, xmonad }: mkDerivation { @@ -217285,8 +217954,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.5.1.2"; - sha256 = "0q185phadgi8m45ii90x5k7mpw2xqf021q55q00nqyw8l7yai8pr"; + version = "0.6"; + sha256 = "059mbh2x4i521kg99b2mmgvc2rwbid641ilzc14ri7ym7ljkw1mv"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 1a9475df2846..19517e2216b1 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -33,11 +33,11 @@ in stdenv.mkDerivation rec { name = "racket-${version}"; - version = "6.10.1"; + version = "6.11"; src = fetchurl { - url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; - sha256 = "0v3z6x277lq1y7wkqdf6mj3826z5vq0yadygspx9h4r0f1dnmafc"; + url = "https://mirror.racket-lang.org/installers/${version}/${name}-src.tgz"; + sha256 = "1nk7705x24jjlbqqhj8yvbgqkfscxx3m81bry1g56kjxysjmf3sw"; }; FONTCONFIG_FILE = fontsConf; diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 11d365159f80..b50025aa108a 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -411,7 +411,8 @@ stdenv.mkDerivation rec { ++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals nvenc [ nvidia-video-sdk ] ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation - MediaToolbox VideoDecodeAcceleration ]; + MediaToolbox VideoDecodeAcceleration + libiconv ]; # Build qt-faststart executable buildPhase = optional qtFaststartProgram ''make tools/qt-faststart''; diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 90d7583673a3..e348fe0fae28 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -27,8 +27,9 @@ let inherit (stdenv.lib) optional optionals hasPrefix; in let result = { + # e.g. https://libav.org/releases/libav-11.11.tar.xz.sha1 libav_0_8 = libavFun "0.8.20" "0c7a2417c3a01eb74072691bb93ce802ae1be08f"; - libav_11 = libavFun "11.10" "38db6721ca8423682e4d614c170eccc33ba32e00"; + libav_11 = libavFun "11.11" "d7444fa4f135bdd7347cc962ab4b5228796b0f23"; libav_12 = libavFun "12.2" "3784b15f88076ca0ab8fb6b0377e975b83a5c9f5"; }; diff --git a/pkgs/development/libraries/theft/default.nix b/pkgs/development/libraries/theft/default.nix new file mode 100644 index 000000000000..a0110c5f22b2 --- /dev/null +++ b/pkgs/development/libraries/theft/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + version = "0.4.3"; + name = "theft-${version}"; + + src = fetchFromGitHub { + owner = "silentbicycle"; + repo = "theft"; + rev = "v${version}"; + sha256 = "1ibh8np12lafnrsrvjbbzlyq45zq654939x0y22vdnc6s8dpbhw4"; + }; + + preConfigure = "patchShebangs ./scripts/mk_bits_lut"; + + doCheck = true; + checkTarget = "test"; + + installFlags = [ "PREFIX=$(out)" ]; + postInstall = "install -m644 vendor/greatest.h $out/include/"; + + meta = { + description = "A C library for property-based testing"; + platforms = stdenv.lib.platforms.linux; + homepage = "http://github.com/silentbicycle/theft/"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.kquick ]; + }; +} diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 2672d6efbec1..fbfc460db96d 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -2,21 +2,22 @@ stdenv.mkDerivation rec { name = "websocket++-${version}"; - version = "0.4.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "zaphoyd"; repo = "websocketpp"; rev = version; - sha256 = "1n6j0dh3qpis0f7crd49a2nhxd5459h0blch408z3kwlasx2g0i5"; + sha256 = "1i64sps52kvy8yffysjbmmbb109pi28kqai0qdxxz1dcj3xfckqd"; }; buildInputs = [ cmake ]; - meta = { + meta = with stdenv.lib; { homepage = http://www.zaphoyd.com/websocketpp/; description = "C++/Boost Asio based websocket client/server library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = with maintainers; [ andir ]; }; } diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix new file mode 100644 index 000000000000..79bd8bb96659 --- /dev/null +++ b/pkgs/development/libraries/wlroots/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman +, xcbutilwm, libX11, libcap +}: + +let pname = "wlroots"; + version = "unstable-2017-10-31"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "swaywm"; + repo = "wlroots"; + rev = "7200d643363e988edf6777c38e7f8fcd451a2c50"; + sha256 = "179raymkni1xzaph32zdhg7nfin0xfzrlnbnxkcr266k9y8k66ac"; + }; + + # TODO: Temporary workaround for compilation errors + patches = [ ./libdrm.patch ./no-werror.patch ]; + + nativeBuildInputs = [ meson ninja pkgconfig ]; + + buildInputs = [ + wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman + xcbutilwm libX11 libcap + ]; + + meta = with stdenv.lib; { + description = "A modular Wayland compositor library"; + inherit (src.meta) homepage; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/libraries/wlroots/libdrm.patch b/pkgs/development/libraries/wlroots/libdrm.patch new file mode 100644 index 000000000000..2b9d85382764 --- /dev/null +++ b/pkgs/development/libraries/wlroots/libdrm.patch @@ -0,0 +1,9 @@ +--- a/backend/meson.build 2017-10-31 22:08:01.112927610 +0100 ++++ b/backend/meson.build 2017-10-31 22:09:28.155264343 +0100 +@@ -43,5 +43,5 @@ + 'wlr_backend', + backend_files, + include_directories: wlr_inc, +- dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos], ++ dependencies: [wayland_server, egl, gbm, libinput, systemd, elogind, wlr_render, wlr_protos, drm], + ) diff --git a/pkgs/development/libraries/wlroots/no-werror.patch b/pkgs/development/libraries/wlroots/no-werror.patch new file mode 100644 index 000000000000..78c374d9dbb8 --- /dev/null +++ b/pkgs/development/libraries/wlroots/no-werror.patch @@ -0,0 +1,10 @@ +--- a/meson.build 2017-10-31 22:08:01.132927689 +0100 ++++ b/meson.build 2017-10-31 22:20:58.215784350 +0100 +@@ -5,7 +5,6 @@ + default_options: [ + 'c_std=c11', + 'warning_level=2', +- 'werror=true', + ], + ) + diff --git a/pkgs/development/misc/loc/default.nix b/pkgs/development/misc/loc/default.nix index fd5796276f7a..88d24fddf79e 100644 --- a/pkgs/development/misc/loc/default.nix +++ b/pkgs/development/misc/loc/default.nix @@ -3,17 +3,17 @@ with rustPlatform; buildRustPackage rec { - version = "2017-06-23"; + version = "0.4.1"; name = "loc-${version}"; src = fetchFromGitHub { owner = "cgag"; repo = "loc"; - rev = "bbea575f56879ef614d57a42a6b79fd45b9a8b38"; - sha256 = "0agyhi55rh248fmlsip4fi1iw4xv3433q7bcb2lpjfnjpzxxlvfn"; + rev = "v${version}"; + sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg"; }; - cargoSha256 = "0f3i8av9g19r2nhr9m8ca8s23kq294c5kqyvx155l6p76r7a9kvb"; + cargoSha256 = "0y2ww48vh667kkyg9pyjwcbh7fxi41bjnkhwp749crjqn2abimrk"; meta = { homepage = http://github.com/cgag/loc; diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md index dea7cd9b38b9..79f180759b09 100644 --- a/pkgs/development/node-packages/README.md +++ b/pkgs/development/node-packages/README.md @@ -1,13 +1,34 @@ Node.js packages ================ -To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: +The `pkgs/development/node-packages` folder contains a generated collection of +[NPM packages](https://npmjs.com/) that can be installed with the Nix package +manager. + +As a rule of thumb, the package set should only provide *end user* software +packages, such as command-line utilities. Libraries should only be added to the +package set if there is a non-NPM package that requires it. + +When it is desired to use NPM libraries in a development project, use the +`node2nix` generator directly on the `package.json` configuration file of the +project. + +The package set also provides support for multiple Node.js versions. The policy +is that a new package should be added to the collection for the latest stable LTS +release (which is currently 6.x), unless there is an explicit reason to support +a different release. + +To add a package from NPM to nixpkgs: 1. Modify `pkgs/development/node-packages/node-packages-v6.json` to add, update or remove package entries. (Or `pkgs/development/node-packages/node-packages-v4.json` - for packagages depending on Node.js 4.x) + for packages depending on Node.js 4.x) 2. Run the script: `(cd pkgs/development/node-packages && ./generate.sh)`. 3. Build your new package to test your changes: `cd /path/to/nixpkgs && nix-build -A nodePackages.<new-or-updated-package>`. To build against a specific Node.js version (e.g. 4.x): `nix-build -A nodePackages_4_x.<new-or-updated-package>` 4. Add and commit all modified and generated files. + +For more information about the generation process, consult the +[README.md](https://github.com/svanderburg/node2nix) file of the `node2nix` +tool. diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index 3deee40812ae..6cf74cdc4e78 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -6,6 +6,13 @@ let }; in nodePackages // { + dnschain = nodePackages.dnschain.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper nodePackages.coffee-script ]; + postInstall = '' + wrapProgram $out/bin/dnschain --suffix PATH : ${pkgs.openssl.bin}/bin + ''; + }); + node-inspector = nodePackages.node-inspector.override (oldAttrs: { buildInputs = oldAttrs.buildInputs ++ [ nodePackages.node-pre-gyp ]; }); diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index bf0ae24ff03d..90ee8d905a6e 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,20 +1,35 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, cmdliner, astring, fmt, result }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, opam, jbuilder +, cmdliner, astring, fmt, result +}: + +let param = + if stdenv.lib.versionAtLeast ocaml.version "4.02" then { + version = "0.8.1"; + sha256 = "1bjhgwmshlaz9xncrrkknys7prigf8vlg1kqvfx9l8kn92mlf10b"; + buildInputs = [ jbuilder ]; + buildPhase = "jbuilder build -p alcotest"; + inherit (jbuilder) installPhase; + } else { + version = "0.7.2"; + sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; + buildInputs = [ ocamlbuild opam topkg ]; + inherit (topkg) buildPhase installPhase; + }; +in stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-alcotest-${version}"; - version = "0.7.2"; + inherit (param) version buildPhase installPhase; src = fetchzip { url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; + inherit (param) sha256; }; - buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; + buildInputs = [ ocaml findlib ] ++ param.buildInputs; propagatedBuildInputs = [ cmdliner astring fmt result ]; - inherit (topkg) buildPhase installPhase; - createFindlibDestdir = true; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index 9d01b73479a4..ff42af0c0e40 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,18 +1,24 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: -let - pname = "lablgtk"; +let param = + let check = stdenv.lib.versionAtLeast ocaml.version; in + if check "4.06" then { + version = "2.18.6"; + url = https://forge.ocamlcore.org/frs/download.php/1726/lablgtk-2.18.6.tar.gz; + sha256 = "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d"; + } else if check "3.12" then { + version = "2.18.5"; + url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; + sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "2.18.5"; + name = "lablgtk-${version}"; + inherit (param) version; src = fetchurl { - url = https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz; - sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + inherit (param) url sha256; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/python-modules/keyutils/default.nix b/pkgs/development/python-modules/keyutils/default.nix new file mode 100644 index 000000000000..2746f1616682 --- /dev/null +++ b/pkgs/development/python-modules/keyutils/default.nix @@ -0,0 +1,24 @@ +{ lib, buildPythonPackage, fetchurl, pkgs, pytestrunner }: + +let + pname = "keyutils"; + version = "0.5"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/k/${pname}/${name}.tar.gz"; + sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; + }; + + buildInputs = [ pkgs.keyutils pytestrunner ]; + + doCheck = false; + + meta = { + description = "A set of python bindings for keyutils"; + homepage = https://github.com/sassoftware/python-keyutils; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix index cf05cbff631d..8d9340625e1c 100644 --- a/pkgs/development/python-modules/multidict/default.nix +++ b/pkgs/development/python-modules/multidict/default.nix @@ -1,9 +1,9 @@ { lib , fetchurl , buildPythonPackage -, pytest +, cython +, pytest, psutil, pytestrunner , isPy3k -, psutil }: let @@ -17,11 +17,8 @@ in buildPythonPackage rec { sha256 = "e76909da2fad6966281d4e0e4ccfd3c3025699ebcc30806afa09fa1384c3532b"; }; - checkInputs = [ pytest psutil ]; - - checkPhase = '' - py.test - ''; + buildInputs = [ cython ]; + checkInputs = [ pytest psutil pytestrunner ]; disabled = !isPy3k; @@ -30,4 +27,4 @@ in buildPythonPackage rec { homepage = https://github.com/aio-libs/multidict/; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/raven/default.nix b/pkgs/development/python-modules/raven/default.nix new file mode 100644 index 000000000000..00bc54d844b1 --- /dev/null +++ b/pkgs/development/python-modules/raven/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchurl, isPy3k, contextlib2 }: + +buildPythonPackage rec { + name = "raven-6.3.0"; + + src = fetchurl { + url = "mirror://pypi/r/raven/${name}.tar.gz"; + sha256 = "1wgddbd092vih6k6mknp68vvm1pp12fikjqzglw6mnyw8njnbr7k"; + }; + + # way too many dependencies to run tests + # see https://github.com/getsentry/raven-python/blob/master/setup.py + doCheck = false; + + propagatedBuildInputs = lib.optionals (!isPy3k) [ contextlib2 ]; + + meta = { + description = "A Python client for Sentry (getsentry.com)"; + homepage = https://github.com/getsentry/raven-python; + license = [ lib.licenses.bsd3 ]; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/python-modules/zipstream/default.nix b/pkgs/development/python-modules/zipstream/default.nix new file mode 100644 index 000000000000..aac2bceeb15d --- /dev/null +++ b/pkgs/development/python-modules/zipstream/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchurl, nose }: + +let + pname = "zipstream"; + version = "1.1.4"; +in buildPythonPackage rec { + name = "${pname}-${version}"; + + src = fetchurl { + url = "mirror://pypi/z/${pname}/${name}.tar.gz"; + sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; + }; + + buildInputs = [ nose ]; + + meta = { + description = "A zip archive generator"; + homepage = https://github.com/allanlei/python-zipstream; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ primeos ]; + }; +} diff --git a/pkgs/development/tools/build-managers/apache-maven/default.nix b/pkgs/development/tools/build-managers/apache-maven/default.nix index 5490790fe385..79648c16f5e7 100644 --- a/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -2,7 +2,7 @@ assert jdk != null; -let version = "3.5.0"; in +let version = "3.5.2"; in stdenv.mkDerivation rec { name = "apache-maven-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${name}-bin.tar.gz"; - sha256 = "0d7hjnj77hc7qqnnfmqlwij8n6pcldfavvd6lilvv5ak4hci9fdy"; + sha256 = "1zza5kjf69hnx41gy3yhvsk1kz259nig5njcmzjbsr8a75p1yyvh"; }; buildInputs = [ makeWrapper ]; @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { homepage = http://maven.apache.org/; license = licenses.asl20; platforms = platforms.unix; + maintainers = with maintainers; [ cko ]; }; } diff --git a/pkgs/servers/dnschain/default.nix b/pkgs/servers/dnschain/default.nix deleted file mode 100644 index 52cccae50c52..000000000000 --- a/pkgs/servers/dnschain/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper, openssl }: - -let - nodePackages = callPackage (import ../../top-level/node-packages.nix) { - self = nodePackages; - generated = ./package.nix; - }; - -in nodePackages.buildNodePackage rec { - name = "dnschain-${version}"; - version = "0.5.3"; - - src = fetchFromGitHub { - owner = "okTurtles"; - repo = "dnschain"; - rev = "a8d477f9ad33d7790f94ffc563e2205823e62515"; - sha256 = "0j5glbxf0fxnxl4l1lysb3a619b18rk0l1ks57wd255llc2mw7zy"; - }; - - deps = with nodePackages; [ - by-spec."bluebird"."2.9.9" - by-spec."bottleneck"."1.5.x" - by-spec."event-stream"."3.2.2" - by-spec."express"."4.11.2" - by-spec."hiredis"."0.4.1" - by-spec."json-rpc2"."0.8.1" - by-spec."lodash"."3.1.0" - by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" - by-spec."native-dns-packet"."0.1.1" - by-spec."nconf"."0.7.1" - by-spec."properties"."1.2.1" - by-spec."redis"."0.12.x" - by-spec."string"."2.0.1" - by-spec."winston"."0.8.0" - by-spec."superagent"."0.21.0" - ]; - - buildInputs = [ makeWrapper nodePackages.coffee-script ]; - postInstall = '' - wrapProgram $out/bin/dnschain --suffix PATH : ${openssl.bin}/bin - ''; - - meta = with stdenv.lib; { - description = "A blockchain-based DNS + HTTP server"; - homepage = https://okturtles.com/; - license = licenses.mpl20; - maintainers = with maintainers; [ rnhmjoj ]; - platforms = platforms.unix; - }; - -} diff --git a/pkgs/servers/dnschain/package.json b/pkgs/servers/dnschain/package.json deleted file mode 100644 index fda40c8a90a6..000000000000 --- a/pkgs/servers/dnschain/package.json +++ /dev/null @@ -1,3 +0,0 @@ -[ "dnschain" -, "coffee-script" -] diff --git a/pkgs/servers/dnschain/package.nix b/pkgs/servers/dnschain/package.nix deleted file mode 100644 index 600f5a94684f..000000000000 --- a/pkgs/servers/dnschain/package.nix +++ /dev/null @@ -1,2188 +0,0 @@ - -{ self, fetchurl, fetchgit ? null, lib }: - -{ - by-spec."accepts"."~1.2.3" = - self.by-version."accepts"."1.2.13"; - by-version."accepts"."1.2.13" = self.buildNodePackage { - name = "accepts-1.2.13"; - version = "1.2.13"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; - name = "accepts-1.2.13.tgz"; - sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; - }; - deps = { - "mime-types-2.1.14" = self.by-version."mime-types"."2.1.14"; - "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."assert-plus"."^1.0.0" = - self.by-version."assert-plus"."1.0.0"; - by-version."assert-plus"."1.0.0" = self.buildNodePackage { - name = "assert-plus-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - name = "assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.2.x" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = self.buildNodePackage { - name = "async-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."~0.9.0" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."better-curry"."1.x.x" = - self.by-version."better-curry"."1.6.0"; - by-version."better-curry"."1.6.0" = self.buildNodePackage { - name = "better-curry-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/better-curry/-/better-curry-1.6.0.tgz"; - name = "better-curry-1.6.0.tgz"; - sha1 = "38f716b24c8cee07a262abc41c22c314e20e3869"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."binaryheap".">= 0.0.3" = - self.by-version."binaryheap"."0.0.3"; - by-version."binaryheap"."0.0.3" = self.buildNodePackage { - name = "binaryheap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz"; - name = "binaryheap-0.0.3.tgz"; - sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bindings"."*" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bluebird"."2.9.9" = - self.by-version."bluebird"."2.9.9"; - by-version."bluebird"."2.9.9" = self.buildNodePackage { - name = "bluebird-2.9.9"; - version = "2.9.9"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.9.tgz"; - name = "bluebird-2.9.9.tgz"; - sha1 = "61a26904d43d7f6b19dff7ed917dbc92452ad6d3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bottleneck"."1.5.x" = - self.by-version."bottleneck"."1.5.3"; - by-version."bottleneck"."1.5.3" = self.buildNodePackage { - name = "bottleneck-1.5.3"; - version = "1.5.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/bottleneck/-/bottleneck-1.5.3.tgz"; - name = "bottleneck-1.5.3.tgz"; - sha1 = "55fa64920d9670087d44150404525d59f9511c20"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffercursor".">= 0.0.12" = - self.by-version."buffercursor"."0.0.12"; - by-version."buffercursor"."0.0.12" = self.buildNodePackage { - name = "buffercursor-0.0.12"; - version = "0.0.12"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz"; - name = "buffercursor-0.0.12.tgz"; - sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779"; - }; - deps = { - "verror-1.9.0" = self.by-version."verror"."1.9.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."buffercursor".">= 0.0.5" = - self.by-version."buffercursor"."0.0.12"; - by-spec."coffee-script"."*" = - self.by-version."coffee-script"."1.12.2"; - by-version."coffee-script"."1.12.2" = self.buildNodePackage { - name = "coffee-script-1.12.2"; - version = "1.12.2"; - bin = true; - src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.2.tgz"; - name = "coffee-script-1.12.2.tgz"; - sha1 = "0d4cbdee183f650da95419570c4929d08ef91376"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "coffee-script" = self.by-version."coffee-script"."1.12.2"; - by-spec."colors"."0.6.x" = - self.by-version."colors"."0.6.2"; - by-version."colors"."0.6.2" = self.buildNodePackage { - name = "colors-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - name = "colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."combined-stream"."~0.0.4" = - self.by-version."combined-stream"."0.0.7"; - by-version."combined-stream"."0.0.7" = self.buildNodePackage { - name = "combined-stream-0.0.7"; - version = "0.0.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - name = "combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - deps = { - "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."component-emitter"."1.1.2" = - self.by-version."component-emitter"."1.1.2"; - by-version."component-emitter"."1.1.2" = self.buildNodePackage { - name = "component-emitter-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz"; - name = "component-emitter-1.1.2.tgz"; - sha1 = "296594f2753daa63996d2af08d15a95116c9aec3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."content-disposition"."0.5.0" = - self.by-version."content-disposition"."0.5.0"; - by-version."content-disposition"."0.5.0" = self.buildNodePackage { - name = "content-disposition-0.5.0"; - version = "0.5.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - name = "content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie"."0.1.2" = - self.by-version."cookie"."0.1.2"; - by-version."cookie"."0.1.2" = self.buildNodePackage { - name = "cookie-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz"; - name = "cookie-0.1.2.tgz"; - sha1 = "72fec3d24e48a3432073d90c12642005061004b1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookie-signature"."1.0.5" = - self.by-version."cookie-signature"."1.0.5"; - by-version."cookie-signature"."1.0.5" = self.buildNodePackage { - name = "cookie-signature-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz"; - name = "cookie-signature-1.0.5.tgz"; - sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cookiejar"."2.0.1" = - self.by-version."cookiejar"."2.0.1"; - by-version."cookiejar"."2.0.1" = self.buildNodePackage { - name = "cookiejar-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz"; - name = "cookiejar-2.0.1.tgz"; - sha1 = "3d12752f6adf68a892f332433492bd5812bb668f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."core-util-is"."1.0.2" = - self.by-version."core-util-is"."1.0.2"; - by-version."core-util-is"."1.0.2" = self.buildNodePackage { - name = "core-util-is-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - name = "core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.2"; - by-spec."crc"."3.2.1" = - self.by-version."crc"."3.2.1"; - by-version."crc"."3.2.1" = self.buildNodePackage { - name = "crc-3.2.1"; - version = "3.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.2.1.tgz"; - name = "crc-3.2.1.tgz"; - sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."cycle"."1.0.x" = - self.by-version."cycle"."1.0.3"; - by-version."cycle"."1.0.3" = self.buildNodePackage { - name = "cycle-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - name = "cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."1.x.x" = - self.by-version."debug"."1.0.4"; - by-version."debug"."1.0.4" = self.buildNodePackage { - name = "debug-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz"; - name = "debug-1.0.4.tgz"; - sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8"; - }; - deps = { - "ms-0.6.2" = self.by-version."ms"."0.6.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."2" = - self.by-version."debug"."2.6.0"; - by-version."debug"."2.6.0" = self.buildNodePackage { - name = "debug-2.6.0"; - version = "2.6.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.0.tgz"; - name = "debug-2.6.0.tgz"; - sha1 = "bc596bcabe7617f11d9fa15361eded5608b8499b"; - }; - deps = { - "ms-0.7.2" = self.by-version."ms"."0.7.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."~2.1.1" = - self.by-version."debug"."2.1.3"; - by-version."debug"."2.1.3" = self.buildNodePackage { - name = "debug-2.1.3"; - version = "2.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz"; - name = "debug-2.1.3.tgz"; - sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e"; - }; - deps = { - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."delayed-stream"."0.0.5" = - self.by-version."delayed-stream"."0.0.5"; - by-version."delayed-stream"."0.0.5" = self.buildNodePackage { - name = "delayed-stream-0.0.5"; - version = "0.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - name = "delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."depd"."~1.0.0" = - self.by-version."depd"."1.0.1"; - by-version."depd"."1.0.1" = self.buildNodePackage { - name = "depd-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - name = "depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."destroy"."1.0.3" = - self.by-version."destroy"."1.0.3"; - by-version."destroy"."1.0.3" = self.buildNodePackage { - name = "destroy-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - name = "destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."duplexer"."~0.1.1" = - self.by-version."duplexer"."0.1.1"; - by-version."duplexer"."0.1.1" = self.buildNodePackage { - name = "duplexer-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - name = "duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ee-first"."1.1.0" = - self.by-version."ee-first"."1.1.0"; - by-version."ee-first"."1.1.0" = self.buildNodePackage { - name = "ee-first-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz"; - name = "ee-first-1.1.0.tgz"; - sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."es5class"."2.x.x" = - self.by-version."es5class"."2.3.1"; - by-version."es5class"."2.3.1" = self.buildNodePackage { - name = "es5class-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/es5class/-/es5class-2.3.1.tgz"; - name = "es5class-2.3.1.tgz"; - sha1 = "42c5c18a9016bcb0db28a4d340ebb831f55d1b66"; - }; - deps = { - "better-curry-1.6.0" = self.by-version."better-curry"."1.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."escape-html"."1.0.1" = - self.by-version."escape-html"."1.0.1"; - by-version."escape-html"."1.0.1" = self.buildNodePackage { - name = "escape-html-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz"; - name = "escape-html-1.0.1.tgz"; - sha1 = "181a286ead397a39a92857cfb1d43052e356bff0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."etag"."~1.5.1" = - self.by-version."etag"."1.5.1"; - by-version."etag"."1.5.1" = self.buildNodePackage { - name = "etag-1.5.1"; - version = "1.5.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.5.1.tgz"; - name = "etag-1.5.1.tgz"; - sha1 = "54c50de04ee42695562925ac566588291be7e9ea"; - }; - deps = { - "crc-3.2.1" = self.by-version."crc"."3.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."event-stream"."3.2.2" = - self.by-version."event-stream"."3.2.2"; - by-version."event-stream"."3.2.2" = self.buildNodePackage { - name = "event-stream-3.2.2"; - version = "3.2.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/event-stream/-/event-stream-3.2.2.tgz"; - name = "event-stream-3.2.2.tgz"; - sha1 = "f79f9984c07ee3fd9b44ffb3cd0422b13e24084d"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - "from-0.1.3" = self.by-version."from"."0.1.3"; - "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0"; - "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11"; - "split-0.3.3" = self.by-version."split"."0.3.3"; - "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eventemitter3"."0.x.x" = - self.by-version."eventemitter3"."0.1.6"; - by-version."eventemitter3"."0.1.6" = self.buildNodePackage { - name = "eventemitter3-0.1.6"; - version = "0.1.6"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz"; - name = "eventemitter3-0.1.6.tgz"; - sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."4.11.2" = - self.by-version."express"."4.11.2"; - by-version."express"."4.11.2" = self.buildNodePackage { - name = "express-4.11.2"; - version = "4.11.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-4.11.2.tgz"; - name = "express-4.11.2.tgz"; - sha1 = "8df3d5a9ac848585f00a0777601823faecd3b148"; - }; - deps = { - "accepts-1.2.13" = self.by-version."accepts"."1.2.13"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "finalhandler-0.3.3" = self.by-version."finalhandler"."0.3.3"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "methods-1.1.2" = self.by-version."methods"."1.1.2"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1"; - "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3"; - "send-0.11.1" = self.by-version."send"."0.11.1"; - "serve-static-1.8.1" = self.by-version."serve-static"."1.8.1"; - "type-is-1.5.7" = self.by-version."type-is"."1.5.7"; - "vary-1.0.1" = self.by-version."vary"."1.0.1"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extend"."~1.2.1" = - self.by-version."extend"."1.2.1"; - by-version."extend"."1.2.1" = self.buildNodePackage { - name = "extend-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - name = "extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."extsprintf"."^1.2.0" = - self.by-version."extsprintf"."1.3.0"; - by-version."extsprintf"."1.3.0" = self.buildNodePackage { - name = "extsprintf-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - name = "extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."eyes"."0.1.x" = - self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = self.buildNodePackage { - name = "eyes-0.1.8"; - version = "0.1.8"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."faye-websocket"."0.x.x" = - self.by-version."faye-websocket"."0.11.0"; - by-version."faye-websocket"."0.11.0" = self.buildNodePackage { - name = "faye-websocket-0.11.0"; - version = "0.11.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz"; - name = "faye-websocket-0.11.0.tgz"; - sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50"; - }; - deps = { - "websocket-driver-0.6.5" = self.by-version."websocket-driver"."0.6.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."finalhandler"."0.3.3" = - self.by-version."finalhandler"."0.3.3"; - by-version."finalhandler"."0.3.3" = self.buildNodePackage { - name = "finalhandler-0.3.3"; - version = "0.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.3.3.tgz"; - name = "finalhandler-0.3.3.tgz"; - sha1 = "b1a09aa1e6a607b3541669b09bcb727f460cd426"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."form-data"."0.1.3" = - self.by-version."form-data"."0.1.3"; - by-version."form-data"."0.1.3" = self.buildNodePackage { - name = "form-data-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz"; - name = "form-data-0.1.3.tgz"; - sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea"; - }; - deps = { - "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "async-0.9.2" = self.by-version."async"."0.9.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formidable"."1.0.14" = - self.by-version."formidable"."1.0.14"; - by-version."formidable"."1.0.14" = self.buildNodePackage { - name = "formidable-1.0.14"; - version = "1.0.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; - name = "formidable-1.0.14.tgz"; - sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."forwarded"."~0.1.0" = - self.by-version."forwarded"."0.1.0"; - by-version."forwarded"."0.1.0" = self.buildNodePackage { - name = "forwarded-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - name = "forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."fresh"."0.2.4" = - self.by-version."fresh"."0.2.4"; - by-version."fresh"."0.2.4" = self.buildNodePackage { - name = "fresh-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz"; - name = "fresh-0.2.4.tgz"; - sha1 = "3582499206c9723714190edd74b4604feb4a614c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."from"."~0" = - self.by-version."from"."0.1.3"; - by-version."from"."0.1.3" = self.buildNodePackage { - name = "from-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; - name = "from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hiredis"."0.4.1" = - self.by-version."hiredis"."0.4.1"; - by-version."hiredis"."0.4.1" = self.buildNodePackage { - name = "hiredis-0.4.1"; - version = "0.4.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz"; - name = "hiredis-0.4.1.tgz"; - sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-2.5.0" = self.by-version."nan"."2.5.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.3"; - by-version."inherits"."2.0.3" = self.buildNodePackage { - name = "inherits-2.0.3"; - version = "2.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - name = "inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ini"."1.x.x" = - self.by-version."ini"."1.3.4"; - by-version."ini"."1.3.4" = self.buildNodePackage { - name = "ini-1.3.4"; - version = "1.3.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"; - name = "ini-1.3.4.tgz"; - sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ipaddr.js"."1.0.5" = - self.by-version."ipaddr.js"."1.0.5"; - by-version."ipaddr.js"."1.0.5" = self.buildNodePackage { - name = "ipaddr.js-1.0.5"; - version = "1.0.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; - name = "ipaddr.js-1.0.5.tgz"; - sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ipaddr.js".">= 0.1.1" = - self.by-version."ipaddr.js"."1.2.0"; - by-version."ipaddr.js"."1.2.0" = self.buildNodePackage { - name = "ipaddr.js-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.2.0.tgz"; - name = "ipaddr.js-1.2.0.tgz"; - sha1 = "8aba49c9192799585bdd643e0ccb50e8ae777ba4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."json-rpc2"."0.8.1" = - self.by-version."json-rpc2"."0.8.1"; - by-version."json-rpc2"."0.8.1" = self.buildNodePackage { - name = "json-rpc2-0.8.1"; - version = "0.8.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/json-rpc2/-/json-rpc2-0.8.1.tgz"; - name = "json-rpc2-0.8.1.tgz"; - sha1 = "efe8c9834605b556c488d1ed7bcf24ee381eeeb2"; - }; - deps = { - "jsonparse-0.0.6" = self.by-version."jsonparse"."0.0.6"; - "debug-1.0.4" = self.by-version."debug"."1.0.4"; - "lodash-2.4.2" = self.by-version."lodash"."2.4.2"; - "es5class-2.3.1" = self.by-version."es5class"."2.3.1"; - "faye-websocket-0.11.0" = self.by-version."faye-websocket"."0.11.0"; - "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jsonparse"."0.x.x" = - self.by-version."jsonparse"."0.0.6"; - by-version."jsonparse"."0.0.6" = self.buildNodePackage { - name = "jsonparse-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.6.tgz"; - name = "jsonparse-0.0.6.tgz"; - sha1 = "ab599f19324d4ae178fa21a930192ab11ab61a4e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."2.x.x" = - self.by-version."lodash"."2.4.2"; - by-version."lodash"."2.4.2" = self.buildNodePackage { - name = "lodash-2.4.2"; - version = "2.4.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz"; - name = "lodash-2.4.2.tgz"; - sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lodash"."3.1.0" = - self.by-version."lodash"."3.1.0"; - by-version."lodash"."3.1.0" = self.buildNodePackage { - name = "lodash-3.1.0"; - version = "3.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-3.1.0.tgz"; - name = "lodash-3.1.0.tgz"; - sha1 = "d41b8b33530cb3be088853208ad30092d2c27961"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-stream"."~0.1.0" = - self.by-version."map-stream"."0.1.0"; - by-version."map-stream"."0.1.0" = self.buildNodePackage { - name = "map-stream-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - name = "map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."media-typer"."0.3.0" = - self.by-version."media-typer"."0.3.0"; - by-version."media-typer"."0.3.0" = self.buildNodePackage { - name = "media-typer-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - name = "media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."merge-descriptors"."0.0.2" = - self.by-version."merge-descriptors"."0.0.2"; - by-version."merge-descriptors"."0.0.2" = self.buildNodePackage { - name = "merge-descriptors-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz"; - name = "merge-descriptors-0.0.2.tgz"; - sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."1.0.1" = - self.by-version."methods"."1.0.1"; - by-version."methods"."1.0.1" = self.buildNodePackage { - name = "methods-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz"; - name = "methods-1.0.1.tgz"; - sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."methods"."~1.1.1" = - self.by-version."methods"."1.1.2"; - by-version."methods"."1.1.2" = self.buildNodePackage { - name = "methods-1.1.2"; - version = "1.1.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - name = "methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.2.11" = - self.by-version."mime"."1.2.11"; - by-version."mime"."1.2.11" = self.buildNodePackage { - name = "mime-1.2.11"; - version = "1.2.11"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - name = "mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."~1.2.11" = - self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.12.0" = - self.by-version."mime-db"."1.12.0"; - by-version."mime-db"."1.12.0" = self.buildNodePackage { - name = "mime-db-1.12.0"; - version = "1.12.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz"; - name = "mime-db-1.12.0.tgz"; - sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-db"."~1.26.0" = - self.by-version."mime-db"."1.26.0"; - by-version."mime-db"."1.26.0" = self.buildNodePackage { - name = "mime-db-1.26.0"; - version = "1.26.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.26.0.tgz"; - name = "mime-db-1.26.0.tgz"; - sha1 = "eaffcd0e4fc6935cf8134da246e2e6c35305adff"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.0.9" = - self.by-version."mime-types"."2.0.14"; - by-version."mime-types"."2.0.14" = self.buildNodePackage { - name = "mime-types-2.0.14"; - version = "2.0.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz"; - name = "mime-types-2.0.14.tgz"; - sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6"; - }; - deps = { - "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime-types"."~2.1.6" = - self.by-version."mime-types"."2.1.14"; - by-version."mime-types"."2.1.14" = self.buildNodePackage { - name = "mime-types-2.1.14"; - version = "2.1.14"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.14.tgz"; - name = "mime-types-2.1.14.tgz"; - sha1 = "f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"; - }; - deps = { - "mime-db-1.26.0" = self.by-version."mime-db"."1.26.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."~0.0.1" = - self.by-version."minimist"."0.0.10"; - by-version."minimist"."0.0.10" = self.buildNodePackage { - name = "minimist-0.0.10"; - version = "0.0.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - name = "minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.6.2" = - self.by-version."ms"."0.6.2"; - by-version."ms"."0.6.2" = self.buildNodePackage { - name = "ms-0.6.2"; - version = "0.6.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"; - name = "ms-0.6.2.tgz"; - sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.0" = - self.by-version."ms"."0.7.0"; - by-version."ms"."0.7.0" = self.buildNodePackage { - name = "ms-0.7.0"; - version = "0.7.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; - name = "ms-0.7.0.tgz"; - sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.2" = - self.by-version."ms"."0.7.2"; - by-version."ms"."0.7.2" = self.buildNodePackage { - name = "ms-0.7.2"; - version = "0.7.2"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - name = "ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."^2.0.5" = - self.by-version."nan"."2.5.0"; - by-version."nan"."2.5.0" = self.buildNodePackage { - name = "nan-2.5.0"; - version = "2.5.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.0.tgz"; - name = "nan-2.5.0.tgz"; - sha1 = "aa8f1e34531d807e9e27755b234b4a6ec0c152a8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns"."git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" = - self.by-version."native-dns"."0.6.1"; - by-version."native-dns"."0.6.1" = self.buildNodePackage { - name = "native-dns-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/node-dns.git"; - rev = "08433ec98f517eed3c6d5e47bdf62603539cd402"; - sha256 = "9c3faf4d39fda7bb6dd52a82036625f37ed442d5e948d295acb2f055dd367080"; - }; - deps = { - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2"; - "native-dns-packet-0.0.4" = self.by-version."native-dns-packet"."0.0.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-cache"."git+https://github.com/okTurtles/native-dns-cache.git#8714196bb9223cc9a4064a4fddf9e82ec50b7d4d" = - self.by-version."native-dns-cache"."0.0.2"; - by-version."native-dns-cache"."0.0.2" = self.buildNodePackage { - name = "native-dns-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-cache.git"; - rev = "8714196bb9223cc9a4064a4fddf9e82ec50b7d4d"; - sha256 = "3f06b2577afc3c1e428533baae3c51bad44a2e1e02fca147a1303943c214f841"; - }; - deps = { - "binaryheap-0.0.3" = self.by-version."binaryheap"."0.0.3"; - "native-dns-packet-0.0.3" = self.by-version."native-dns-packet"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."0.1.1" = - self.by-version."native-dns-packet"."0.1.1"; - by-version."native-dns-packet"."0.1.1" = self.buildNodePackage { - name = "native-dns-packet-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz"; - name = "native-dns-packet-0.1.1.tgz"; - sha1 = "97da90570b8438a00194701ce24d011fd3cc109a"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#307e77a47ebba57a5ae9118a284e916e5ebb305a" = - self.by-version."native-dns-packet"."0.0.3"; - by-version."native-dns-packet"."0.0.3" = self.buildNodePackage { - name = "native-dns-packet-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "307e77a47ebba57a5ae9118a284e916e5ebb305a"; - sha256 = "3ab023906deb8ee86bcb34c3e67e03cebeed1ba2dcb0b1d561c362ca995b0739"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."native-dns-packet"."git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" = - self.by-version."native-dns-packet"."0.0.4"; - by-version."native-dns-packet"."0.0.4" = self.buildNodePackage { - name = "native-dns-packet-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchgit { - url = "https://github.com/okTurtles/native-dns-packet.git"; - rev = "8bf2714c318cfe7d31bca2006385882ccbf503e4"; - sha256 = "2a5951696b4e514ab5dee36e4e5394781656a8e94c6aacba83b03f7e647f8df3"; - }; - deps = { - "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12"; - "ipaddr.js-1.2.0" = self.by-version."ipaddr.js"."1.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nconf"."0.7.1" = - self.by-version."nconf"."0.7.1"; - by-version."nconf"."0.7.1" = self.buildNodePackage { - name = "nconf-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz"; - name = "nconf-0.7.1.tgz"; - sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "ini-1.3.4" = self.by-version."ini"."1.3.4"; - "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."negotiator"."0.5.3" = - self.by-version."negotiator"."0.5.3"; - by-version."negotiator"."0.5.3" = self.buildNodePackage { - name = "negotiator-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - name = "negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."on-finished"."~2.2.0" = - self.by-version."on-finished"."2.2.1"; - by-version."on-finished"."2.2.1" = self.buildNodePackage { - name = "on-finished-2.2.1"; - version = "2.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.2.1.tgz"; - name = "on-finished-2.2.1.tgz"; - sha1 = "5c85c1cc36299f78029653f667f27b6b99ebc029"; - }; - deps = { - "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."~0.6.0" = - self.by-version."optimist"."0.6.1"; - by-version."optimist"."0.6.1" = self.buildNodePackage { - name = "optimist-0.6.1"; - version = "0.6.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - name = "optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - deps = { - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."parseurl"."~1.3.0" = - self.by-version."parseurl"."1.3.1"; - by-version."parseurl"."1.3.1" = self.buildNodePackage { - name = "parseurl-1.3.1"; - version = "1.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; - name = "parseurl-1.3.1.tgz"; - sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-to-regexp"."0.1.3" = - self.by-version."path-to-regexp"."0.1.3"; - by-version."path-to-regexp"."0.1.3" = self.buildNodePackage { - name = "path-to-regexp-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz"; - name = "path-to-regexp-0.1.3.tgz"; - sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pause-stream"."0.0.11" = - self.by-version."pause-stream"."0.0.11"; - by-version."pause-stream"."0.0.11" = self.buildNodePackage { - name = "pause-stream-0.0.11"; - version = "0.0.11"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - name = "pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pkginfo"."0.3.x" = - self.by-version."pkginfo"."0.3.1"; - by-version."pkginfo"."0.3.1" = self.buildNodePackage { - name = "pkginfo-0.3.1"; - version = "0.3.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - name = "pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."properties"."1.2.1" = - self.by-version."properties"."1.2.1"; - by-version."properties"."1.2.1" = self.buildNodePackage { - name = "properties-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/properties/-/properties-1.2.1.tgz"; - name = "properties-1.2.1.tgz"; - sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."proxy-addr"."~1.0.6" = - self.by-version."proxy-addr"."1.0.10"; - by-version."proxy-addr"."1.0.10" = self.buildNodePackage { - name = "proxy-addr-1.0.10"; - version = "1.0.10"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; - name = "proxy-addr-1.0.10.tgz"; - sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; - }; - deps = { - "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0"; - "ipaddr.js-1.0.5" = self.by-version."ipaddr.js"."1.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."1.2.0" = - self.by-version."qs"."1.2.0"; - by-version."qs"."1.2.0" = self.buildNodePackage { - name = "qs-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz"; - name = "qs-1.2.0.tgz"; - sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."2.3.3" = - self.by-version."qs"."2.3.3"; - by-version."qs"."2.3.3" = self.buildNodePackage { - name = "qs-2.3.3"; - version = "2.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"; - name = "qs-2.3.3.tgz"; - sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.3"; - by-version."range-parser"."1.0.3" = self.buildNodePackage { - name = "range-parser-1.0.3"; - version = "1.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - name = "range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."1.0.27-1" = - self.by-version."readable-stream"."1.0.27-1"; - by-version."readable-stream"."1.0.27-1" = self.buildNodePackage { - name = "readable-stream-1.0.27-1"; - version = "1.0.27-1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz"; - name = "readable-stream-1.0.27-1.tgz"; - sha1 = "6b67983c20357cefd07f0165001a16d710d91078"; - }; - deps = { - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.3" = self.by-version."inherits"."2.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."redis"."0.12.x" = - self.by-version."redis"."0.12.1"; - by-version."redis"."0.12.1" = self.buildNodePackage { - name = "redis-0.12.1"; - version = "0.12.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"; - name = "redis-0.12.1.tgz"; - sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."reduce-component"."1.0.1" = - self.by-version."reduce-component"."1.0.1"; - by-version."reduce-component"."1.0.1" = self.buildNodePackage { - name = "reduce-component-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz"; - name = "reduce-component-1.0.1.tgz"; - sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."send"."0.11.1" = - self.by-version."send"."0.11.1"; - by-version."send"."0.11.1" = self.buildNodePackage { - name = "send-0.11.1"; - version = "0.11.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.11.1.tgz"; - name = "send-0.11.1.tgz"; - sha1 = "1beabfd42f9e2709f99028af3078ac12b47092d5"; - }; - deps = { - "debug-2.1.3" = self.by-version."debug"."2.1.3"; - "depd-1.0.1" = self.by-version."depd"."1.0.1"; - "destroy-1.0.3" = self.by-version."destroy"."1.0.3"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "ms-0.7.0" = self.by-version."ms"."0.7.0"; - "on-finished-2.2.1" = self.by-version."on-finished"."2.2.1"; - "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."serve-static"."~1.8.1" = - self.by-version."serve-static"."1.8.1"; - by-version."serve-static"."1.8.1" = self.buildNodePackage { - name = "serve-static-1.8.1"; - version = "1.8.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.8.1.tgz"; - name = "serve-static-1.8.1.tgz"; - sha1 = "08fabd39999f050fc311443f46d5888a77ecfc7c"; - }; - deps = { - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1"; - "send-0.11.1" = self.by-version."send"."0.11.1"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."split"."0.3" = - self.by-version."split"."0.3.3"; - by-version."split"."0.3.3" = self.buildNodePackage { - name = "split-0.3.3"; - version = "0.3.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz"; - name = "split-0.3.3.tgz"; - sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"; - }; - deps = { - "through-2.3.8" = self.by-version."through"."2.3.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stack-trace"."0.0.x" = - self.by-version."stack-trace"."0.0.9"; - by-version."stack-trace"."0.0.9" = self.buildNodePackage { - name = "stack-trace-0.0.9"; - version = "0.0.9"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - name = "stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."stream-combiner"."~0.0.4" = - self.by-version."stream-combiner"."0.0.4"; - by-version."stream-combiner"."0.0.4" = self.buildNodePackage { - name = "stream-combiner-0.0.4"; - version = "0.0.4"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - name = "stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; - }; - deps = { - "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string"."2.0.1" = - self.by-version."string"."2.0.1"; - by-version."string"."2.0.1" = self.buildNodePackage { - name = "string-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/string/-/string-2.0.1.tgz"; - name = "string-2.0.1.tgz"; - sha1 = "ef1473b3e11cb8158671856556959b9aff5fd759"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."superagent"."0.21.0" = - self.by-version."superagent"."0.21.0"; - by-version."superagent"."0.21.0" = self.buildNodePackage { - name = "superagent-0.21.0"; - version = "0.21.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz"; - name = "superagent-0.21.0.tgz"; - sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87"; - }; - deps = { - "qs-1.2.0" = self.by-version."qs"."1.2.0"; - "formidable-1.0.14" = self.by-version."formidable"."1.0.14"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2"; - "methods-1.0.1" = self.by-version."methods"."1.0.1"; - "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1"; - "debug-2.6.0" = self.by-version."debug"."2.6.0"; - "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1"; - "extend-1.2.1" = self.by-version."extend"."1.2.1"; - "form-data-0.1.3" = self.by-version."form-data"."0.1.3"; - "readable-stream-1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."2" = - self.by-version."through"."2.3.8"; - by-version."through"."2.3.8" = self.buildNodePackage { - name = "through-2.3.8"; - version = "2.3.8"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - name = "through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."~2.3" = - self.by-version."through"."2.3.8"; - by-spec."through"."~2.3.1" = - self.by-version."through"."2.3.8"; - by-spec."type-is"."~1.5.6" = - self.by-version."type-is"."1.5.7"; - by-version."type-is"."1.5.7" = self.buildNodePackage { - name = "type-is-1.5.7"; - version = "1.5.7"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"; - name = "type-is-1.5.7.tgz"; - sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90"; - }; - deps = { - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utils-merge"."1.0.0" = - self.by-version."utils-merge"."1.0.0"; - by-version."utils-merge"."1.0.0" = self.buildNodePackage { - name = "utils-merge-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - name = "utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."vary"."~1.0.0" = - self.by-version."vary"."1.0.1"; - by-version."vary"."1.0.1" = self.buildNodePackage { - name = "vary-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; - name = "vary-1.0.1.tgz"; - sha1 = "99e4981566a286118dfb2b817357df7993376d10"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."verror"."^1.4.0" = - self.by-version."verror"."1.9.0"; - by-version."verror"."1.9.0" = self.buildNodePackage { - name = "verror-1.9.0"; - version = "1.9.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.9.0.tgz"; - name = "verror-1.9.0.tgz"; - sha1 = "107a8a2d14c33586fc4bb830057cd2d19ae2a6ee"; - }; - deps = { - "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0"; - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "extsprintf-1.3.0" = self.by-version."extsprintf"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-driver".">=0.5.1" = - self.by-version."websocket-driver"."0.6.5"; - by-version."websocket-driver"."0.6.5" = self.buildNodePackage { - name = "websocket-driver-0.6.5"; - version = "0.6.5"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - name = "websocket-driver-0.6.5.tgz"; - sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; - }; - deps = { - "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-extensions".">=0.1.1" = - self.by-version."websocket-extensions"."0.1.1"; - by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { - name = "websocket-extensions-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - name = "websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."winston"."0.8.0" = - self.by-version."winston"."0.8.0"; - by-version."winston"."0.8.0" = self.buildNodePackage { - name = "winston-0.8.0"; - version = "0.8.0"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz"; - name = "winston-0.8.0.tgz"; - sha1 = "61d0830fa699706212206b0a2b5ca69a93043668"; - }; - deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; - "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1"; - "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.3"; - by-version."wordwrap"."0.0.3" = self.buildNodePackage { - name = "wordwrap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - name = "wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f3222f2982b4..9f0f5ac4bb99 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -35,7 +35,7 @@ owner = "openresty"; repo = "headers-more-nginx-module"; rev = "v0.26"; - sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn"; + sha256 = "0zhr3ai4xf5yghxvlbrwv8n06fgx33f1n1d4a6gmsczdfjzf8g6g"; }; }; diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix index ba3cc6dae761..68c9b7a59362 100644 --- a/pkgs/servers/quagga/default.nix +++ b/pkgs/servers/quagga/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "quagga-${version}"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { url = "mirror://savannah/quagga/${name}.tar.gz"; - sha256 = "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda"; + sha256 = "0c99rjjc62xl5kwvx2pwyvs0709vbwax1qydqbqf6r7fpvr24bjj"; }; buildInputs = diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 878e8480bb99..bb07c42b872c 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,12 @@ { fetchFromGitHub, lib } : fetchFromGitHub { owner = "WordPress"; repo = "WordPress"; - rev = "4.7.4"; - sha256 = "1ia9d3n085x2r6pvdrv4rk6gdp6xhjhpsq5g7a6448xzv9hf14ri"; + rev = "4.8.3"; + sha256 = "077bdx22sj29v8q493b49xfzxpc38q45pjhmn4znw2fmkjilih5p"; meta = { homepage = https://wordpress.org; description = "WordPress is open source software you can use to create a beautiful website, blog, or app."; license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.basvandijk ]; }; } diff --git a/pkgs/tools/admin/ansible/2.4.nix b/pkgs/tools/admin/ansible/2.4.nix index dd9c12c831c9..80bd33bc7769 100644 --- a/pkgs/tools/admin/ansible/2.4.nix +++ b/pkgs/tools/admin/ansible/2.4.nix @@ -6,12 +6,12 @@ pythonPackages.buildPythonPackage rec { pname = "ansible"; - version = "2.4.0.0"; + version = "2.4.1.0"; name = "${pname}-${version}"; src = fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "0xkwnx817rygb1922gncv9ivgvb7hjg8g53r39hfdm3jgzp6y9qs"; + sha256 = "0spv0kjaicwss4q52s727b6grdizcxpa0bbsfg26pgf5kjrayqfs"; }; prePatch = '' diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch new file mode 100644 index 000000000000..f78bb7178af2 --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15953.patch @@ -0,0 +1,25 @@ +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:40:25.558131619 +0000 +@@ -18,6 +18,7 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#define _GNU_SOURCE + #include <stdio.h> + #include <stdlib.h> + #include <string.h> +@@ -271,11 +272,10 @@ + int16_t i; + float fl; + +- if (!(fname = malloc(strlen(bname) + 8))) { +- fprintf(stderr, "main(): malloc() failed, out of memory\n"); ++ if (asprintf(&fname, "%s%2.2d.%s", bname, track->num, track->extension) == -1) { ++ fprintf(stderr, "writetrack(): asprintf() failed, out of memory\n"); + exit(4); + } +- sprintf(fname, "%s%2.2d.%s", bname, track->num, track->extension); + + printf("%2d: %s ", track->num, fname); + + diff --git a/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch new file mode 100644 index 000000000000..80930ac69bc3 --- /dev/null +++ b/pkgs/tools/cd-dvd/bchunk/CVE-2017-15955.patch @@ -0,0 +1,33 @@ +diff -urNZ bchunk-1.2.0.orig/bchunk.c bchunk-1.2.0/bchunk.c +--- a/bchunk.c 2017-10-30 18:03:58.658741629 +0000 ++++ b/bchunk.c 2017-10-30 19:17:36.732855884 +0000 +@@ -426,11 +426,11 @@ + printf("\nTrack "); + if (!(p = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after TRACK.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + fprintf(stderr, "... ouch, no space after track number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + +@@ -460,12 +460,12 @@ + } else if ((p = strstr(s, "INDEX"))) { + if (!(p = strchr(p, ' '))) { + printf("... ouch, no space after INDEX.\n"); +- continue; ++ exit(3); + } + p++; + if (!(t = strchr(p, ' '))) { + printf("... ouch, no space after index number.\n"); +- continue; ++ exit(3); + } + *t = '\0'; + t++; \ No newline at end of file diff --git a/pkgs/tools/cd-dvd/bchunk/default.nix b/pkgs/tools/cd-dvd/bchunk/default.nix index 4b8510773a3d..ea4046f31f8c 100644 --- a/pkgs/tools/cd-dvd/bchunk/default.nix +++ b/pkgs/tools/cd-dvd/bchunk/default.nix @@ -8,20 +8,16 @@ stdenv.mkDerivation rec { sha256 = "0pcbyx3689cbl23dcij497hb3q5f1wmki7cxic5nzldx71g9vp5g"; }; - preConfigure = - '' - substituteInPlace Makefile \ - --replace "-o root -g root" "" \ - --replace "-o bin -g bin" "" - ''; + patches = [ ./CVE-2017-15953.patch ./CVE-2017-15955.patch ]; - makeFlags = "PREFIX=$(out) MAN_DIR=$(out)/share/man"; + installPhase = '' + install -Dt $out/bin bchunk + install -Dt $out/share/man/man1 bchunk.1 + ''; - preInstall = "mkdir -p $out/bin $out/share/man/man1"; - - meta = { + meta = with stdenv.lib; { homepage = http://he.fi/bchunk/; - description = "A program that converts CD-ROM images in BIN/CUE format into a set of ISO and CDR tracks"; - platforms = stdenv.lib.platforms.linux; + description = "A program that converts CD images in BIN/CUE format into a set of ISO and CDR tracks"; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/filesystems/9pfs/default.nix b/pkgs/tools/filesystems/9pfs/default.nix index c75cc45170af..5ad54adc08ad 100644 --- a/pkgs/tools/filesystems/9pfs/default.nix +++ b/pkgs/tools/filesystems/9pfs/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "9pfs"; src = fetchFromGitHub { - owner = "spewspew"; + owner = "mischief"; repo = "9pfs"; rev = "7f4ca4cd750d650c1215b92ac3cc2a28041960e4"; sha256 = "007s2idsn6bspmfxv1qabj39ggkgvn6gwdbhczwn04lb4c6gh3xc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://github.com/spewspew/9pfs; + #homepage = https://github.com/spewspew/9pfs; # the account apparently doesn't exist description = "FUSE-based client of the 9P network filesystem protocol"; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 5e4fd3ff0624..49bd74ea412f 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -2,23 +2,21 @@ let debPatch = fetchzip { - url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz; - sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5"; + url = mirror://debian/pool/main/s/scrot/scrot_0.8-18.debian.tar.xz; + sha256 = "1m8m8ad0idf3nzw0k57f6rfbw8n7dza69a7iikriqgbrpyvxqybx"; }; in stdenv.mkDerivation rec { - name = "scrot-0.8-17"; + name = "scrot-0.8-18"; src = fetchurl { url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz"; sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1"; }; - inherit debPatch; - postPatch = '' - for patch in $(cat $debPatch/patches/series); do - patch -p1 < "$debPatch/patches/$patch" + for patch in $(cat ${debPatch}/patches/series); do + patch -p1 < "${debPatch}/patches/$patch" done ''; diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b10b7891e5d1..f8b687a5c8ba 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { name = "lf-unstable-${version}"; - version = "2017-09-06"; + version = "2017-10-30"; src = fetchFromGitHub { owner = "gokcehan"; repo = "lf"; - rev = "ae4a29e5501f805fadb115658e83df6744a258b2"; # nightly - sha256 = "099ckbnyk08a716fc5qz7yldalb1p9gn2zn8kqp7bp4adi541hid"; + rev = "3f7bd0a62d1a243562e182d9051ebb54f3414aaa"; # nightly + sha256 = "0g6wf4j3dfy3yfkby3wlqajryv4kffqvhljq2q0x482fsrl4vipz"; }; goPackagePath = "github.com/gokcehan/lf"; diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix index 5b014d18dc1c..91a0c368d5f9 100644 --- a/pkgs/tools/misc/lf/deps.nix +++ b/pkgs/tools/misc/lf/deps.nix @@ -4,8 +4,8 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "4ed959e0540971545eddb8c75514973d670cf739"; # master - sha256 = "1vx64i1mg660if3wwm81p4b7lzxfb3qbr39i7misdyld3fc486p9"; + rev = "10cefba34bc5e7a6e5df0836a42513c28a10e074"; # master + sha256 = "05jy6dpva2a1xfsv3yajavbx41gx8hhh5k3k901dnk0118hnyd0w"; }; } { diff --git a/pkgs/tools/misc/mht2htm/default.nix b/pkgs/tools/misc/mht2htm/default.nix new file mode 100644 index 000000000000..930fd1e5d3ec --- /dev/null +++ b/pkgs/tools/misc/mht2htm/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, unzip, fpc, lazarus }: + +let + date = "07.apr.2016"; + +in stdenv.mkDerivation rec { + name = "mht2mht-${version}"; + version = "1.8.1.35"; + + src = fetchurl { + # there is a disconnect between the directory name date and file name date + # you should verify if that is still then case when the next version is released + url = "mirror://sourceforge/mht2htm/mht2htm/1.8.1%20%2805.apr.2016%29/mht2htmcl-${version}_${date}.source.zip"; + sha256 = "16r6zkihp84yqllp2hyaf0nvymdn9ji3g30mc5scfwycdfanja6f"; + }; + + sourceRoot = "."; + + buildInputs = [ fpc lazarus ]; + + nativeBuildInputs = [ unzip ]; + + buildPhase = '' + runHook preBuild + lazbuild --lazarusdir=${lazarus}/share/lazarus mht2htmcl.lpi + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -Dm755 -t $out/bin mht2htmcl + install -Dm644 -t $out/share/doc/mht2htm CHANGELOG COPYING README + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Convert .mht files to .html"; + homepage = http://pgm.bpalanka.com/mht2htm.html; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 17798057ec3d..382b69722a42 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -6,12 +6,12 @@ let pythonPackages = python3Packages; in pythonPackages.buildPythonApplication rec { - version = "0.15.0"; + version = "0.16.3"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "08aa5yxcj7ziz2r0hz4p554q8hgpfl2bh8r6r85f4g24mg6arxsj"; + sha256 = "0dpwbfi97ksijqng191659m8k0v215y8ld95w8gb126m4m96qpzw"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/networking/http-prompt/default.nix b/pkgs/tools/networking/http-prompt/default.nix index 5f6f0466f630..83ad64a66a4a 100644 --- a/pkgs/tools/networking/http-prompt/default.nix +++ b/pkgs/tools/networking/http-prompt/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, pythonPackages, httpie }: pythonPackages.buildPythonApplication rec { - version = "0.10.2"; + version = "0.11.0"; name = "http-prompt"; src = fetchFromGitHub { rev = "v${version}"; repo = "http-prompt"; owner = "eliangcs"; - sha256 = "0c03n1ll61zd4f60kzih3skl0hspck5hhpcf74h5l6v5as7qdbi2"; + sha256 = "0arl85880nnyfx8cvpzm6cr8nalhyrkz5zqfr628p487rwqv45ip"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/security/pwgen/default.nix b/pkgs/tools/security/pwgen/default.nix index b793219f6497..79e8fb071b37 100644 --- a/pkgs/tools/security/pwgen/default.nix +++ b/pkgs/tools/security/pwgen/default.nix @@ -1,11 +1,14 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, autoreconfHook}: stdenv.mkDerivation { - name = "pwgen-2.07"; + name = "pwgen-2.08"; src = fetchurl { - url = mirror://sourceforge/pwgen/pwgen-2.07.tar.gz; - sha256 = "0mhmw700kkh238fzivcwnwi94bj9f3h36yfh3k3j2v19b0zmjx7b"; + url = https://github.com/tytso/pwgen/archive/v2.08.tar.gz; + sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; }; + + nativeBuildInputs = [ autoreconfHook ]; + meta = { description = "Password generator which creates passwords which can be easily memorized by a human"; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 8aed674a644a..4f3f8af3256d 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { EXE chmod +x $out/bin/$lt done + cat > $out/bin/languagetool-http-server <<EXE + #!${stdenv.shell} + ${jdk}/bin/java -cp $out/share/languagetool-server.jar org.languagetool.server.HTTPServer "\$@" + EXE + chmod +x $out/bin/languagetool-http-server ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b28a7b59689..926946074819 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -152,6 +152,8 @@ with pkgs; packer = callPackage ../development/tools/packer { }; + mht2htm = callPackage ../tools/misc/mht2htm { }; + fetchpatch = callPackage ../build-support/fetchpatch { }; fetchs3 = callPackage ../build-support/fetchs3 { }; @@ -10789,6 +10791,8 @@ with pkgs; tet = callPackage ../development/tools/misc/tet { }; + theft = callPackage ../development/libraries/theft { }; + thrift = callPackage ../development/libraries/thrift { inherit (pythonPackages) twisted; }; @@ -11478,8 +11482,6 @@ with pkgs; inherit (perlPackages) Error MailDKIM MIMEtools NetServer; }; - dnschain = callPackage ../servers/dnschain { }; - dovecot = callPackage ../servers/mail/dovecot { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole { }; dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { }; @@ -15044,7 +15046,9 @@ with pkgs; hue-cli = callPackage ../tools/networking/hue-cli { }; - hugin = callPackage ../applications/graphics/hugin { }; + hugin = callPackage ../applications/graphics/hugin { + wxGTK = wxGTK30; + }; hugo = callPackage ../applications/misc/hugo { }; @@ -15064,6 +15068,7 @@ with pkgs; spectrwm = callPackage ../applications/window-managers/spectrwm { }; wlc = callPackage ../development/libraries/wlc { }; + wlroots = callPackage ../development/libraries/wlroots { }; orbment = callPackage ../applications/window-managers/orbment { }; sway = callPackage ../applications/window-managers/sway { }; swaylock = callPackage ../applications/window-managers/sway { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c94a401db0fb..f233ae43ad10 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -438,12 +438,15 @@ let }; - luastdlib = buildLuaPackage { - name = "stdlib"; + luastdlib = buildLuaPackage rec { + name = "stdlib-${version}"; + version = "41.2.1"; - src = fetchzip { - url = "https://github.com/lua-stdlib/lua-stdlib/archive/release.zip"; - sha256 = "0636absdfjx8ybglwydmqxwfwmqz1c4b9s5mhxlgm4ci18lw3hms"; + src = fetchFromGitHub { + owner = "lua-stdlib"; + repo = "lua-stdlib"; + rev = "release-v${version}"; + sha256 = "03wd1qvkrj50fjszb2apzdkc8d5bpfbbi9pajl0vbrlzzmmi3jlq"; }; nativeBuildInputs = [ autoreconfHook unzip ]; @@ -616,7 +619,7 @@ let # NOTE: For updating, new Lua mpack bindings live at: # https://github.com/libmpack/libmpack-lua. src = libmpack.src; - sourceRoot = "libmpack-${libmpack.rev}-src/binding/lua"; + sourceRoot = "${src.name}/binding/lua"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libmpack ]; # ++ [ libtool lua ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ce0e45284b7..b9c5fa93dfa5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2703,12 +2703,12 @@ in { }; click-log = buildPythonPackage rec { - version = "0.1.3"; + version = "0.2.1"; name = "click-log-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/c/click-log/${name}.tar.gz"; - sha256 = "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx"; + sha256 = "1r1x85023cslb2pwldd089jjk573mk3w78cnashs77wrx7yz8fj9"; }; propagatedBuildInputs = with self; [ click ]; @@ -7367,24 +7367,7 @@ in { }; }; - raven = buildPythonPackage rec { - name = "raven-6.2.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/raven/${name}.tar.gz"; - sha256 = "1zkh8llsfng5viz8cpf9j74v30705hv80vb5g6gha1ij7v60p8y0"; - }; - - # way too many dependencies to run tests - # see https://github.com/getsentry/raven-python/blob/master/setup.py - doCheck = false; - - propagatedBuildInputs = optionals (!isPy3k) [ self.contextlib2 ]; - - meta = { - maintainers = with maintainers; [ primeos ]; - }; - }; + raven = callPackage ../development/python-modules/raven { }; rethinkdb = buildPythonPackage rec { name = "rethinkdb-${version}"; @@ -10574,27 +10557,7 @@ in { keyring = callPackage ../development/python-modules/keyring { }; - keyutils = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "keyutils"; - version = "0.5"; - - src = pkgs.fetchurl { - url = "mirror://pypi/k/${pname}/${name}.tar.gz"; - sha256 = "0dskys71vkn59vlsfs1ljli0qnzk7b10iv4pawxawnk2hvyjrf10"; - }; - - buildInputs = with self; [ pkgs.keyutils pytestrunner ]; - - doCheck = false; - - meta = { - description = "A set of python bindings for keyutils"; - homepage = https://github.com/sassoftware/python-keyutils; - license = licenses.asl20; - maintainers = with maintainers; [ primeos ]; - }; - }; + keyutils = callPackage ../development/python-modules/keyutils { }; klaus = buildPythonPackage rec { version = "0.9.1"; @@ -21860,25 +21823,7 @@ EOF }; }); - zipstream = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "zipstream"; - version = "1.1.4"; - - src = pkgs.fetchurl { - url = "mirror://pypi/z/${pname}/${name}.tar.gz"; - sha256 = "01im5anqdyggmwkigqcjg0qw2a5bnn84h33mfaqjjd69a28lpwif"; - }; - - buildInputs = with self; [ nose ]; - - meta = { - description = "A zip archive generator"; - homepage = "https://github.com/allanlei/python-zipstream"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ primeos ]; - }; - }; + zipstream = callPackage ../development/python-modules/zipstream { }; zodb = callPackage ../development/python-modules/zodb {}; |