From 5bf732bf4bf76171463340d74ac4686e2dc85c87 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 23 Aug 2015 13:55:11 +0100 Subject: [PATCH 001/227] Restore the listing of Darwin packages. `nix-env -qaP -A pkgs.darwin` pkgs.darwin.libutil: Commented-out because the package definition doesn't exist. The source doesn't even provide a Makefile... pkgs.darwin.objc4_pure: Commented-out because the package is broken and referencing unknown applefetchsource and libc_old names. It doesn't seem to be used by any other packages too. --- pkgs/os-specific/darwin/apple-source-releases/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index f29a2b5b9111..43698629a46f 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -76,11 +76,11 @@ let libpthread = applePackage "libpthread" "105.1.4" "09vwwahcvmxvx2xl0890gkp91n61dld29j73y2pa597bqkag2qpg" {}; libresolv = applePackage "libresolv" "54" "028mp2smd744ryxwl8cqz4njv8h540sdw3an1yl7yxqcs04r0p4b" {}; Libsystem = applePackage "Libsystem" "1197.1.1" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; - libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; + #libutil = applePackage "libutil" "38" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; libunwind = applePackage "libunwind" "35.3" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; mDNSResponder = applePackage "mDNSResponder" "522.92.1" "1cp87qda1s7brriv413i71yggm8yqfwv64vknrnqv24fcb8hzbmy" {}; objc4 = applePackage "objc4" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; - objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; + #objc4_pure = applePackage "objc4/pure.nix" "551.1" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; ppp = applePackage "ppp" "727.90.1" "166xz1q7al12hm3q3drlp2r6fgdrsq3pmazjp3nsqg3vnglyh4gk" {}; removefile = applePackage "removefile" "33" "0ycvp7cnv40952a1jyhm258p6gg5xzh30x86z5gb204x80knw30y" {}; Security = applePackage "Security" "55471.14.18" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; From 7cfcbae958b7924cac660e8278623e1fef743523 Mon Sep 17 00:00:00 2001 From: Samuel Rivas Date: Sat, 19 Sep 2015 19:55:24 +0200 Subject: [PATCH 002/227] gusb: refactor, enable vala This exports the vapi files to share/vala/vapi --- pkgs/development/libraries/gusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix index f7bbe75f116e..c33920953ce2 100644 --- a/pkgs/development/libraries/gusb/default.nix +++ b/pkgs/development/libraries/gusb/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , automake, autoconf, libtool, which, gtkdoc, gettext, pkgconfig, gobjectIntrospection, libxslt -, glib, systemd, libusb1 +, glib, systemd, libusb1, vala }: stdenv.mkDerivation rec { name = "gusb-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig autoconf automake libtool which gtkdoc gettext gobjectIntrospection libxslt - systemd libusb1 + systemd libusb1 vala glib ]; From 8bba6d6ebf2f61b1ef47529648f216abd8640bcb Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 21 Sep 2015 00:12:34 +0200 Subject: [PATCH 003/227] perl-File-LibMagic: 1.13 -> 1.15 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d73f8210941c..0dee3fe2d8c2 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4469,10 +4469,10 @@ let self = _self // overrides; _self = with self; { }; FileLibMagic = buildPerlPackage rec { - name = "File-LibMagic-1.13"; + name = "File-LibMagic-1.15"; src = fetchurl { url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "61f92c3137a3b86d63e61313b51aa2673991110d655eee792ea11c68bf2c0092"; + sha256 = "2c7fb54912caf2c22d06b02d6a88edad970e0f8b017634dc30eec46e53763e84"; }; buildInputs = [ TestFatal pkgs.file ]; makeMakerFlags = "--lib=${pkgs.file}/lib"; From 9f191abad14fb10d3ef843e98ab055894248ca2d Mon Sep 17 00:00:00 2001 From: Sergey Mironov Date: Mon, 21 Sep 2015 21:17:38 +0000 Subject: [PATCH 004/227] syncthing: update systemd service config according to upstream example The example service config were taken from the syncthing repo: https://github.com/syncthing/syncthing/blob/master/etc/linux-systemd/system/syncthing@.service --- nixos/modules/services/networking/syncthing.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index d5accfef1cb5..4eb32b1cf306 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -54,12 +54,15 @@ in description = "Syncthing service"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment.STNORESTART = "placeholder"; # do not self-restart + environment.STNORESTART = "yes"; # do not self-restart + environment.STNOUPGRADE = "yes"; serviceConfig = { User = "${cfg.user}"; PermissionsStartOnly = true; - Restart = "always"; + Restart = "on-failure"; ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}"; + SuccessExitStatus = "2 3 4"; + RestartForceExitStatus="3 4"; }; }; From 70fd4b4b025a5f5aa5d0a0f565aa73e1c684a025 Mon Sep 17 00:00:00 2001 From: "Kovacsics Robert (NixOS)" Date: Mon, 21 Sep 2015 20:02:27 +0100 Subject: [PATCH 005/227] encrypted-devices service: Fix keyed mount, clarify descriptions. Not enough arguments were supplied to cryptsetup when a key-file was specified. Also don't try to unlock keyedEncDevs with a password. --- nixos/modules/tasks/encrypted-devices.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 8b5dd22fd380..331531cee151 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -6,6 +6,7 @@ let fileSystems = attrValues config.fileSystems ++ config.swapDevices; encDevs = filter (dev: dev.encrypted.enable) fileSystems; keyedEncDevs = filter (dev: dev.encrypted.keyFile != null) encDevs; + keylessEncDevs = filter (dev: dev.encrypted.keyFile == null) encDevs; isIn = needle: haystack: filter (p: p == needle) haystack != []; anyEncrypted = fold (j: v: v || j.encrypted.enable) false encDevs; @@ -29,15 +30,15 @@ let label = mkOption { default = null; example = "rootfs"; - type = types.nullOr types.str; - description = "Label of the backing encrypted device."; + type = types.uniq (types.nullOr types.str); + description = "Label of the unlocked encrypted device. Set fileSystems.<name?>.device to /dev/mapper/<label> to mount the unlocked device."; }; keyFile = mkOption { default = null; example = "/root/.swapkey"; type = types.nullOr types.str; - description = "File system location of keyfile."; + description = "File system location of keyfile. This unlocks the drive after the root has been mounted to /mnt-root."; }; }; }; @@ -58,11 +59,11 @@ in boot.initrd = { luks = { devices = - map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) encDevs; + map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; }; postMountCommands = - concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.label};\n") keyedEncDevs; + concatMapStrings (dev: "cryptsetup luksOpen --key-file ${dev.encrypted.keyFile} ${dev.encrypted.blkDev} ${dev.encrypted.label};\n") keyedEncDevs; }; }; } From 9a1245280d4d4f5fb0263bca41063e5901afcc62 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Sep 2015 19:04:51 +0200 Subject: [PATCH 006/227] hol_light: add support for camlp5 > 6.12 --- .../science/logic/hol_light/Makefile.patch | 13 +++++++++++++ .../science/logic/hol_light/default.nix | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/applications/science/logic/hol_light/Makefile.patch diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch new file mode 100644 index 000000000000..2cb05f27a4f6 --- /dev/null +++ b/pkgs/applications/science/logic/hol_light/Makefile.patch @@ -0,0 +1,13 @@ +Index: Makefile +=================================================================== +--- a/Makefile (révision 199) ++++ b/Makefile (copie de travail) +@@ -59,7 +59,7 @@ + then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ + else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ + then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ +- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \ ++ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" ; \ + then cp pa_j_3.1x_6.11.ml pa_j.ml; \ + else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ + fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 7653e137e260..8311ac466543 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml camlp5 ]; + patches = [ ./Makefile.patch ]; + installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light From 399a9da2ae1286c039f15fe6c9c502669dbd6809 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 23 Sep 2015 19:05:02 +0200 Subject: [PATCH 007/227] camlp5: 6.12 -> 6.14 --- pkgs/development/tools/ocaml/camlp5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix index 1c811b217585..d9f364234308 100644 --- a/pkgs/development/tools/ocaml/camlp5/default.nix +++ b/pkgs/development/tools/ocaml/camlp5/default.nix @@ -7,11 +7,11 @@ in stdenv.mkDerivation { - name = "camlp5${if transitional then "_transitional" else ""}-6.12"; + name = "camlp5${if transitional then "_transitional" else ""}-6.14"; src = fetchurl { - url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.12.tgz; - sha256 = "00jwgp6w4g64lfqjx77xziy532091fy00c42fsy0b4i892rch5mp"; + url = http://camlp5.gforge.inria.fr/distrib/src/camlp5-6.14.tgz; + sha256 = "1ql04iyvclpyy9805kpddc4ndjb5d0qg4shhi2fc6bixi49fvy89"; }; buildInputs = [ ocaml ]; From 56b1f7934c9b07243e1c12a80f9125c74f6ad23b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 23 Sep 2015 20:28:29 +0200 Subject: [PATCH 008/227] modsecurity: init at 2.9.0 --- pkgs/tools/security/modsecurity/default.nix | 45 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/security/modsecurity/default.nix diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix new file mode 100644 index 000000000000..5ed6c9ecdc4a --- /dev/null +++ b/pkgs/tools/security/modsecurity/default.nix @@ -0,0 +1,45 @@ +{ stdenv, lib, fetchurl +, curl, apacheHttpd, pcre, apr, aprutil, libxml2 }: + +with lib; + +stdenv.mkDerivation rec { + name = "modsecurity-${version}"; + version = "2.9.0"; + + src = fetchurl { + url = "https://www.modsecurity.org/tarball/${version}/${name}.tar.gz"; + sha256 = "e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434"; + }; + + buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ]; + configureFlags = [ + "--enable-standalone-module" + "--enable-static" + "--with-curl=${curl}" + "--with-apxs=${apacheHttpd}/bin/apxs" + "--with-pcre=${pcre}" + "--with-apr=${apr}" + "--with-apu=${aprutil}/bin/apu-1-config" + "--with-libxml=${libxml2}" + ]; + + outputs = ["out" "nginx"]; + + preBuild = '' + substituteInPlace apache2/Makefile.in --replace "install -D " "# install -D" + ''; + + postInstall = '' + mkdir -p $nginx + cp -R * $nginx + ''; + + meta = { + description = "Open source, cross-platform web application firewall (WAF)"; + license = licenses.asl20; + homepage = https://www.modsecurity.org/; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3990a1f63260..6ad6207e6cac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2231,6 +2231,8 @@ let modemmanager = callPackage ../tools/networking/modemmanager {}; + modsecurity_standalone = callPackage ../tools/security/modsecurity { }; + monit = callPackage ../tools/system/monit { }; moreutils = callPackage ../tools/misc/moreutils { From 46828582abbfa7d45edb4528953cf6197b36d7f8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 23 Sep 2015 20:28:44 +0200 Subject: [PATCH 009/227] nginx: add support for modescurity --- pkgs/servers/http/nginx/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 7888a772e2a5..54f4e1599b8c 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/pkgs/servers/http/nginx/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat , gd, geoip, luajit +, curl, apr, aprutil, apacheHttpd, yajl, libcap, modsecurity_standalone , rtmp ? false , fullWebDAV ? false , syslog ? false , moreheaders ? false , echo ? false -, ngx_lua ? false +, modsecurity ? false +, ngx_lua ? modsecurity || false , set_misc ? false , fluent ? false , extraModules ? [] @@ -48,6 +50,8 @@ let sha256 = "01wkqhk8mk8jgmzi7jbzmg5kamffx3lmhj5yfwryvnvs6xqs74wn"; }; + modsecurity-ext = modsecurity_standalone.nginx; + echo-ext = fetchFromGitHub { owner = "openresty"; repo = "echo-nginx-module"; @@ -93,7 +97,8 @@ stdenv.mkDerivation rec { buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip ] ++ optional fullWebDAV expat - ++ optional ngx_lua luajit; + ++ optional ngx_lua luajit + ++ optionals modsecurity [ curl apr aprutil apacheHttpd yajl ]; LUAJIT_LIB = if ngx_lua then "${luajit}/lib" else ""; LUAJIT_INC = if ngx_lua then "${luajit}/include/luajit-2.0" else ""; @@ -132,14 +137,17 @@ stdenv.mkDerivation rec { ++ optional echo "--add-module=${echo-ext}" ++ optional ngx_lua "--add-module=${develkit-ext} --add-module=${lua-ext}" ++ optional set_misc "--add-module=${set-misc-ext}" - ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) + ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd)) [ "--with-file-aio" "--with-aio_module" ] ++ optional fluent "--add-module=${fluentd}" + ++ optional modsecurity "--add-module=${modsecurity-ext}/nginx/modsecurity" ++ (map (m: "--add-module=${m}") extraModules); additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized"; + NIX_CFLAGS_COMPILE = optionalString modsecurity "-I${aprutil}/include/apr-1 -I${apacheHttpd}/include -I${apr}/include/apr-1 -I${yajl}/include"; + preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" ''; From 3973f9f2fe8b3b5d506cddc4a9dafe8cc1155b01 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 21 Sep 2015 12:25:39 +0300 Subject: [PATCH 010/227] inconsolata-lgc: init at 2015-04-18 Add Inconsolata-LGC, fork of Inconsolata font with improved Cyrillic and Greek support. --- pkgs/data/fonts/inconsolata/lgc.nix | 59 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/data/fonts/inconsolata/lgc.nix diff --git a/pkgs/data/fonts/inconsolata/lgc.nix b/pkgs/data/fonts/inconsolata/lgc.nix new file mode 100644 index 000000000000..ffa55a33e8e0 --- /dev/null +++ b/pkgs/data/fonts/inconsolata/lgc.nix @@ -0,0 +1,59 @@ +{stdenv, fetchFromGitHub, fontforge}: + +stdenv.mkDerivation rec { + name = "inconsolata-lgc-${version}"; + version = "git-2015-04-18"; + + src = fetchFromGitHub { + owner = "MihailJP"; + repo = "Inconsolata-LGC"; + rev = "30bbc1bd82502bf76f1cc5553f17388da2ba20e7"; + sha256 = "02af2gpksdxdp7zfh5qhgfqzc6gvah9v4ph818irwhs9gcq8833c"; + }; + + buildInputs = [ fontforge ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v $(find . -name '*.ttf') $out/share/fonts/truetype + + mkdir -p $out/share/fonts/opentype + cp -v $(find . -name '*.otf') $out/share/fonts/opentype + + mkdir -p "$out/doc/${name}" + cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true + ''; + + meta = { + description = "Fork of Inconsolata font, with proper support of Cyrillic and Greek"; + longDescription = '' + Inconsolata is one of the most suitable font for programmers created by Raph + Levien. Since the original Inconsolata does not contain Cyrillic alphabet, + it was slightly inconvenient for not a few programmers from Russia. + + Inconsolata LGC is a modified version of Inconsolata with added the Cyrillic + alphabet which directly descends from Inconsolata Hellenic supporting modern + Greek. + + Inconsolata LGC is licensed under SIL OFL. + + + Inconsolata LGC changes: + * Cyrillic glyphs added. + * Italic and Bold font added. + + Changes inherited from Inconsolata Hellenic: + * Greek glyphs. + + Changes inherited from Inconsolata-dz: + * Straight quotation marks. + ''; + + # See `License.txt' for details. + license = stdenv.lib.licenses.ofl; + homepage = https://github.com/MihailJP/Inconsolata-LGC; + maintainers = [ + stdenv.lib.maintainers.avnik + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0e53c988f888..85b9cf5774dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10400,6 +10400,7 @@ let hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; + inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; ipafont = callPackage ../data/fonts/ipafont {}; From db74af9a5f5f0b6f6c87320a12ff60129f48c58e Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 23 Sep 2015 23:44:28 +0300 Subject: [PATCH 011/227] fonts: Formatting, empty lines and whitespaces. --- pkgs/data/fonts/aurulent-sans/default.nix | 8 +++- pkgs/data/fonts/dejavu-fonts/default.nix | 3 ++ pkgs/data/fonts/font-awesome-ttf/default.nix | 3 -- pkgs/data/fonts/fontWrap/default.nix | 46 +++++++++---------- pkgs/data/fonts/freefont-ttf/default.nix | 5 +- pkgs/data/fonts/gyre/default.nix | 16 +++---- pkgs/data/fonts/hack/default.nix | 1 - pkgs/data/fonts/mph-2b-damase/default.nix | 4 ++ pkgs/data/fonts/nafees/default.nix | 13 +++--- pkgs/data/fonts/opensans-ttf/default.nix | 3 -- pkgs/data/fonts/poly/default.nix | 16 +++---- .../fonts/redhat-liberation-fonts/binary.nix | 3 -- .../fonts/redhat-liberation-fonts/default.nix | 3 -- .../data/fonts/ttf-bitstream-vera/default.nix | 3 ++ 14 files changed, 61 insertions(+), 66 deletions(-) diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix index 3685dbf356e9..f57f3de7f829 100644 --- a/pkgs/data/fonts/aurulent-sans/default.nix +++ b/pkgs/data/fonts/aurulent-sans/default.nix @@ -2,17 +2,21 @@ stdenv.mkDerivation rec { name = "aurulent-sans-0.1"; + src = fetchgit { url = "https://github.com/deepfire/hartke-aurulent-sans.git"; rev = "refs/tags/${name}"; sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk"; }; + buildPhase = "true"; - installPhase = " + + installPhase = '' fontDir=$out/share/fonts/opentype mkdir -p $fontDir cp *.otf $fontDir - "; + ''; + meta = { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix index 728cb4445399..9d5e25e0abd6 100644 --- a/pkgs/data/fonts/dejavu-fonts/default.nix +++ b/pkgs/data/fonts/dejavu-fonts/default.nix @@ -20,7 +20,9 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2"; sha256 = "1xdbi4llrq1qbkd73352ibrfqcbz93dww8hab216qz5szd95yvv4"; }; + buildFlags = "full-ttf"; + preBuild = '' sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/* sed -e s@/usr/bin/perl@$(type -tP perl)@ -i scripts/* @@ -30,6 +32,7 @@ stdenv.mkDerivation rec { ln -s ${unicodeData} resources/UnicodeData.txt ln -s ${blocks} resources/Blocks.txt ''; + installPhase = '' mkdir -p $out/share/fonts/truetype for i in $(find build -name '*.ttf'); do diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix index 992b87b8ec75..246eb3fb4814 100644 --- a/pkgs/data/fonts/font-awesome-ttf/default.nix +++ b/pkgs/data/fonts/font-awesome-ttf/default.nix @@ -16,15 +16,12 @@ stdenv.mkDerivation rec { meta = { description = "Font Awesome - TTF font"; - longDescription = '' Font Awesome gives you scalable vector icons that can instantly be customized. This package includes only the TTF font. For full CSS etc. see the project website. ''; - homepage = "http://fortawesome.github.io/Font-Awesome/"; license = stdenv.lib.licenses.ofl; - platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.abaldeau ]; }; diff --git a/pkgs/data/fonts/fontWrap/default.nix b/pkgs/data/fonts/fontWrap/default.nix index 9a65c0cde302..e2822cf164f0 100644 --- a/pkgs/data/fonts/fontWrap/default.nix +++ b/pkgs/data/fonts/fontWrap/default.nix @@ -1,31 +1,31 @@ args @ { fetchurl, stdenv, builderDefs, paths, mkfontdir, mkfontscale }: with args; - let localDefs = builderDefs.passthru.function { - src =""; /* put a fetchurl here */ - buildInputs = [mkfontdir mkfontscale]; - configureFlags = []; - }; - in with localDefs; + let localDefs = builderDefs.passthru.function { + src =""; /* put a fetchurl here */ + buildInputs = [mkfontdir mkfontscale]; + configureFlags = []; + }; + in with localDefs; let - doInstall = fullDepEntry (" - mkdir -p \$out/share/fonts/ - cd \$out/share/fonts - for i in ${toString paths}; do - find \$i -type f -exec ln -s '{}' . ';' ; - done - mkfontdir - mkfontscale - ") [minInit addInputs defEnsureDir] ; + doInstall = fullDepEntry (" + mkdir -p \$out/share/fonts/ + cd \$out/share/fonts + for i in ${toString paths}; do + find \$i -type f -exec ln -s '{}' . ';' ; + done + mkfontdir + mkfontscale + ") [minInit addInputs defEnsureDir] ; in stdenv.mkDerivation rec { - name = "wrapped-font-dir"; - builder = writeScript (name + "-builder") - (textClosure localDefs [ doInstall doForceShare doPropagate]); + name = "wrapped-font-dir"; + builder = writeScript (name + "-builder") + (textClosure localDefs [ doInstall doForceShare doPropagate]); preferLocalBuild = true; - meta = { - description = " - Just a wrapper to create fonts.dir and fonts.scale . + meta = { + description = " + Just a wrapper to create fonts.dir and fonts.scale . "; - inherit src; - }; + inherit src; + }; } diff --git a/pkgs/data/fonts/freefont-ttf/default.nix b/pkgs/data/fonts/freefont-ttf/default.nix index 51505320ba40..00d5cfba27a0 100644 --- a/pkgs/data/fonts/freefont-ttf/default.nix +++ b/pkgs/data/fonts/freefont-ttf/default.nix @@ -17,17 +17,14 @@ stdenv.mkDerivation rec { meta = { description = "GNU Free UCS Outline Fonts"; - longDescription = '' The GNU Freefont project aims to provide a set of free outline (PostScript Type0, TrueType, OpenType...) fonts covering the ISO 10646/Unicode UCS (Universal Character Set). ''; - homepage = http://www.gnu.org/software/freefont/; license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; - maintainers = [ ]; + maintainers = []; }; } diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix index 46b947ce77a2..a5f43d4169b2 100644 --- a/pkgs/data/fonts/gyre/default.nix +++ b/pkgs/data/fonts/gyre/default.nix @@ -21,17 +21,15 @@ stdenv.mkDerivation rec { meta = { description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; - - longDescription = ''The Gyre project started in 2006, and will - eventually include enhanced releases of all 35 freely available - PostScript fonts distributed with Ghostscript v4.00. These are - being converted to OpenType and extended with diacritical marks - covering all modern European languages and then some''; - + longDescription = '' + The Gyre project started in 2006, and will + eventually include enhanced releases of all 35 freely available + PostScript fonts distributed with Ghostscript v4.00. These are + being converted to OpenType and extended with diacritical marks + covering all modern European languages and then some + ''; homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; - license = stdenv.lib.licenses.lppl13c; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ bergey ]; }; diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix index 522847a52418..faa126d693e1 100644 --- a/pkgs/data/fonts/hack/default.nix +++ b/pkgs/data/fonts/hack/default.nix @@ -42,7 +42,6 @@ stdenv.mkDerivation { the license is available in LICENSE.md" (From the GitHub page) */ license = licenses.free; - platforms = platforms.all; maintainers = with maintainers; [ nckx ]; }; diff --git a/pkgs/data/fonts/mph-2b-damase/default.nix b/pkgs/data/fonts/mph-2b-damase/default.nix index 7fe56987ad36..0424f6e727c8 100644 --- a/pkgs/data/fonts/mph-2b-damase/default.nix +++ b/pkgs/data/fonts/mph-2b-damase/default.nix @@ -2,14 +2,18 @@ stdenv.mkDerivation { name = "MPH-2B-Damase"; + src = fetchurl { url = http://www.wazu.jp/downloads/damase_v.2.zip; sha256 = "0y7rakbysjjrzcc5y100hkn64j7js434x20pyi6rllnw2w2n1y1h"; }; + buildInputs = [unzip]; + unpackPhase = '' unzip $src; ''; + installPhase = '' mkdir -p $out/share/fonts/truetype cp *.ttf $out/share/fonts/truetype diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index bcbf57498106..f90cb98b8024 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -40,19 +40,18 @@ stdenv.mkDerivation rec { meta = { description = "OpenType Urdu font from the Center for Research in Urdu Language Processing"; - - longDescription = '' The Nafees font family is developed according - to calligraphic rules, following the style of Syed Nafees - Al-Hussaini (Nafees Raqam) one of the finest calligraphers of - Pakistan ''; - + longDescription = '' + The Nafees font family is developed according + to calligraphic rules, following the style of Syed Nafees + Al-Hussaini (Nafees Raqam) one of the finest calligraphers of + Pakistan + ''; homepage = "http://www.cle.org.pk/software/localization.htm"; # Used to be GPLv2. The license distributed with the fonts looks # more like a modified BSD, but still contains the GPLv2 embedded # font exception, and some not-for-resale language. license = "unknown"; - platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ bergey ]; }; diff --git a/pkgs/data/fonts/opensans-ttf/default.nix b/pkgs/data/fonts/opensans-ttf/default.nix index 946efa00b9ab..c0d533ca6204 100644 --- a/pkgs/data/fonts/opensans-ttf/default.nix +++ b/pkgs/data/fonts/opensans-ttf/default.nix @@ -19,15 +19,12 @@ stdenv.mkDerivation rec { meta = { description = "Open Sans fonts"; - longDescription = '' Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. ''; - homepage = "http://en.wikipedia.org/wiki/Open_Sans"; license = stdenv.lib.licenses.asl20; - platforms = stdenv.lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/data/fonts/poly/default.nix b/pkgs/data/fonts/poly/default.nix index 1bd0d8980677..7298dbb18cef 100644 --- a/pkgs/data/fonts/poly/default.nix +++ b/pkgs/data/fonts/poly/default.nix @@ -30,14 +30,14 @@ stdenv.mkDerivation rec { meta = { description = "Medium contrast serif font"; longDescription = '' - With short ascenders and a very high x-height, Poly is efficient in small - sizes. Thanks to its careful balance between the x-height and glyph widths, - it allows more economy and legibility than standard web serifs, even in - small sizes. The aglutinative language for which it was designed contains - very long words. The goal was to develop a typeface that would tolerate - cramped tracking and that would increase the number of letters on a single - line. Poly is a Unicode typeface family that supports Open Type features - and languages that use the Latin script and its variants. + With short ascenders and a very high x-height, Poly is efficient in small + sizes. Thanks to its careful balance between the x-height and glyph widths, + it allows more economy and legibility than standard web serifs, even in + small sizes. The aglutinative language for which it was designed contains + very long words. The goal was to develop a typeface that would tolerate + cramped tracking and that would increase the number of letters on a single + line. Poly is a Unicode typeface family that supports Open Type features + and languages that use the Latin script and its variants. ''; homepage = http://www.fontsquirrel.com/fonts/poly; license = stdenv.lib.licenses.ofl; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix index 369ab3493f34..df206fe13b5a 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and @@ -38,9 +37,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix index a9304769378d..cd5c50309412 100644 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' The Liberation Fonts are intended to be replacements for the three most commonly used fonts on Microsoft systems: Times New Roman, Arial, and @@ -40,9 +39,7 @@ stdenv.mkDerivation rec { # See `License.txt' for details. license = stdenv.lib.licenses.gpl2Oss; - homepage = https://fedorahosted.org/liberation-fonts/; - maintainers = [ stdenv.lib.maintainers.raskin ]; diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix index 1dfaa376df4c..10766d9fa788 100644 --- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix +++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix @@ -2,11 +2,14 @@ stdenv.mkDerivation { name = "ttf-bitstream-vera-1.10"; + src = fetchurl { url = mirror://gnome/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2; sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv"; }; + buildPhase = "true"; + installPhase = " fontDir=$out/share/fonts/truetype mkdir -p $fontDir From 1aff91160189105bb334966c0071d222a17b52ab Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 13:48:38 +0000 Subject: [PATCH 012/227] rustUnstable: 2015-09-05 -> 2015-09-23 --- pkgs/development/compilers/rustc/head.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 045a47e88de6..016d09b3cf1a 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -2,10 +2,10 @@ { stdenv, callPackage }: callPackage ./generic.nix { - shortVersion = "2015-09-21"; + shortVersion = "2015-09-23"; isRelease = false; - srcRev = "547fd5c11e6902e2f9748e7b46893211b36da421"; - srcSha = "10wklbxz6f4ga9q2rxghih18xdw6xm01bay6c13y72c4bwlnkm2w"; + srcRev = "b2f379cdc23aec5c5d0d62acfcc5a4a18ebf0e30"; + srcSha = "1z710f5vv9pbis1q96dc6kqvi0j7xgg95r5f5c3czbvndrxjwm03"; /* Rust is bootstrapped from an earlier built version. We need to fetch these earlier versions, which vary per platform. From 73438e3d8d006324ec4c2b185523b3bbe47abace Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 16:57:36 +0000 Subject: [PATCH 013/227] rustRegistry: 2015-08-21 -> 2015-09-23 --- pkgs/top-level/rust-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index e79ff5ca57ef..e5d762763019 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,15 +7,15 @@ { runCommand, fetchFromGitHub, git }: let - version = "2015-08-21"; - rev = "02e31a901d5f0942466ca7730431b547477126b1"; + version = "2015-09-23"; + rev = "14906530682acd6fa4bac6a8578f6fd1c1090081"; src = fetchFromGitHub { inherit rev; owner = "rust-lang"; repo = "crates.io-index"; - sha256 = "0jppl2grir4wxc3da24h18h21kvh1wj0iff1b0z9vvx0a1iqp4gm"; + sha256 = "1ycrf8qb776lsgcw9rfz5r63rih2m35n4p4h76hq1dxgvp1f2awh"; }; in From feda2925f7d0856ec03faeda619cc08d0381d8f1 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 16:58:38 +0000 Subject: [PATCH 014/227] cargo: 0.3.0 -> 0.5.0 --- .../tools/build-managers/cargo/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix index 9ffc9b0cbb99..6d16cbf7405c 100644 --- a/pkgs/development/tools/build-managers/cargo/default.nix +++ b/pkgs/development/tools/build-managers/cargo/default.nix @@ -1,20 +1,21 @@ { stdenv, fetchgit, rustPlatform, file, curl, python, pkgconfig, openssl , cmake, zlib }: -with ((import ./common.nix) { inherit stdenv; version = "0.3.0"; }); +with ((import ./common.nix) { inherit stdenv; version = "0.5.0"; }); with rustPlatform; buildRustPackage rec { inherit name version meta; + # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules src = fetchgit { - url = "https://github.com/rust-lang/cargo.git"; - rev = "refs/tags/0.3.0"; - sha256 = "0p7p7yivydjkpqb53a8i7pjl719z3gxa6czi0255ccwsh6n9z793"; + url = "git://github.com/rust-lang/cargo"; + rev = "refs/tags/${version}"; + sha256 = "1wg7vr6fpk9n76ly65lf2z9w1dj5nhykffbwrv46lybd8m3r8x3w"; }; - depsSha256 = "1sgdr2akd9xrfmf5g0lbf842b2pdj1ymxk37my0cf2x349rjsf0w"; + depsSha256 = "1q92q63g9pz7fy9fhx8y0kqarsshmzv1dq18ki3hdd7d5pcbczna"; buildInputs = [ file curl pkgconfig python openssl cmake zlib ]; From 760be9cf7025a1a30b7e7c73a3935a652f098f2d Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 13:49:54 +0000 Subject: [PATCH 015/227] rustfmt: git-2015-09-05 -> git-2015-09-23 --- pkgs/development/tools/rust/rustfmt/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 1e735611782a..1a2bf7ac01ce 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchgit, rustUnstable, makeWrapper }: +{ stdenv, fetchgit, rustUnstable, makeWrapper }: with rustUnstable; buildRustPackage rec { - name = "rustfmt-git-2015-09-05"; + name = "rustfmt-git-2015-09-23"; src = fetchgit { url = https://github.com/nrc/rustfmt; - rev = "6c5d3500bb805b37865fe961a7054f8435d176fc"; - sha256 = "0y506viir1klzvspi49qawrfd2g12p9ff2fyy1ndba6zixf69a90"; + rev = "c14cfca0e3de3dfa5fd91d39a85c5b452e7756e3"; + sha256 = "0q72mfj2ph2n4cd0cs4p2mpyr2ixd6ss607kjlgfinjv6klk1i3b"; }; - depsSha256 = "1kfc9l176qkimaag9p650sfpaz50p263rw2021gq5kjw8cyndlx8"; + depsSha256 = "13i9qaia1wn18lgfl69rrxw7b24bq1bpqhdck2jzxpv3wi2xshlw"; meta = with stdenv.lib; { description = "A tool for formatting Rust code according to style guidelines"; From 738acf065173e8b123a9ae8d8f3a83eb7ded95ab Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Wed, 23 Sep 2015 22:40:03 -0400 Subject: [PATCH 016/227] smartgithg: 7.0.0 -> 7.0.2 Also adapted package's freedesktop item install script so that it works in the context of nix. (i.e.: icons and `*.desktop` file now properly installed by the package). --- .../version-management/smartgithg/default.nix | 7 +++++-- .../smartgithg/install_freedesktop_items.sh | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 40a3a3f9ae52..778ae995f3de 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "7_0_0"; + version = "7_0_2"; src = fetchurl { url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz"; - sha256 = "099hnpczh2c0s86nsdybymmm4903n0bsjdq1fpdmm0x5w4216iy6"; + sha256 = "1jpi424aqy6niq31j750rgbspwii013c8kbi965i4jzjpba1pagi"; }; buildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { buildCommand = let pkg_path = "$out/${name}"; bin_path = "$out/bin"; + install_freedesktop_items = ./install_freedesktop_items.sh; runtime_paths = lib.makeSearchPath "bin" [ jre git mercurial subversion @@ -48,6 +49,8 @@ stdenv.mkDerivation rec { --prefix SMARTGITHG_JAVA_HOME : ${jre} patchShebangs $out cp ${bin_path}/smartgit ${bin_path}/smartgithg + + ${install_freedesktop_items} "${pkg_path}/bin" "$out" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh new file mode 100755 index 000000000000..66fb0cf8f95a --- /dev/null +++ b/pkgs/applications/version-management/smartgithg/install_freedesktop_items.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +inBinDir=$1 +out=$2 + +cat $inBinDir/add-menuitem.sh | \ +sed -re 's#xdg-icon-resource[ ]+install[ ]+--size[ ]+([0-9]+)[ ]+("[^"]+")[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/icons/hicolor/\1x\1/apps \&\& cp \2 '${out}'/share/icons/hicolor/\1x\1/apps/\3\.png #' | \ +sed -re 's#xdg-desktop-menu[ ]+install[ ]+([$0-9a-zA-Z_]+)#mkdir -p '${out}'/share/applications \&\& cp \1 '${out}'/share/applications/#' | \ +sed -re 's#Exec="[^"]+"#Exec=smartgit#' | +sed -re 's#SMARTGIT_BIN=.*#'SMARTGIT_BIN=${inBinDir}'#' \ +| bash From 2dc98aaec7a912d830917fc56cf6bfa312bb5eb3 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 27 Jul 2015 06:04:06 -0500 Subject: [PATCH 017/227] skalibs: 2.3.4.0 -> 2.3.7.0 --- pkgs/development/libraries/skalibs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix index cc49466d020b..e8b3403df405 100644 --- a/pkgs/development/libraries/skalibs/default.nix +++ b/pkgs/development/libraries/skalibs/default.nix @@ -2,7 +2,7 @@ let - version = "2.3.4.0"; + version = "2.3.7.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/skalibs"; rev = "refs/tags/v${version}"; - sha256 = "03kqcinb5sn1pk297nqg7w5hzgmkkhhcs3l9x99w1x9kgmw6wisp"; + sha256 = "11k84vckwvxphjswqxv677p6riyb2hgx1kh15f865hnk8n21fldx"; }; dontDisableStatic = true; From 1fcf088a6a4c7e5f7b1c22b19f23e83332646fcf Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Tue, 28 Jul 2015 06:13:42 -0500 Subject: [PATCH 018/227] execline 2.1.2.0 -> 2.1.4.0 --- pkgs/tools/misc/execline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix index 162cc9a48ff8..7478b1e33eea 100644 --- a/pkgs/tools/misc/execline/default.nix +++ b/pkgs/tools/misc/execline/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.2.0"; + version = "2.1.4.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/execline"; rev = "refs/tags/v${version}"; - sha256 = "0p9wp1rq8010k5yxlvamajhi6m24r9v7ikb7scvznf6zb2b0d9hf"; + sha256 = "1ih0mmkra3aa697nz7haaifq2hfy3wjj39npxzg9zr37m7yw67yz"; }; dontDisableStatic = true; From 9eb0f8307c9ebedebacda5d5fb4af6f7c1507e34 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Tue, 28 Jul 2015 06:16:43 -0500 Subject: [PATCH 019/227] s6-dns 2.0.0.3 -> 2.0.0.4 --- pkgs/tools/networking/s6-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix index e8ed6e68e414..233425dc3a11 100644 --- a/pkgs/tools/networking/s6-dns/default.nix +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.0.3"; + version = "2.0.0.4"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6-dns"; rev = "refs/tags/v${version}"; - sha256 = "0kabv1k5xn2vhwlq42913d22kd1f79nssmi7jkncgvsgv1zs0sym"; + sha256 = "0h2s0r0g0qi74aw04c0jap09yjzzprwc6ihknx8bqgbzv08yv03w"; }; dontDisableStatic = true; From 07cd629184251106f647a64bfe409e127491f805 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 23 Sep 2015 19:06:06 +0200 Subject: [PATCH 020/227] libeb: init at 4.4.3 --- pkgs/development/libraries/libeb/default.nix | 24 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/libeb/default.nix diff --git a/pkgs/development/libraries/libeb/default.nix b/pkgs/development/libraries/libeb/default.nix new file mode 100644 index 000000000000..9315a8f12b5a --- /dev/null +++ b/pkgs/development/libraries/libeb/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, perl, zlib }: +stdenv.mkDerivation rec { + name = "libeb-${version}"; + version = "4.4.3"; + + src = fetchurl { + url = "ftp://ftp.sra.co.jp/pub/misc/eb/eb-${version}.tar.bz2"; + sha256 = "0psbdzirazfnn02hp3gsx7xxss9f1brv4ywp6a15ihvggjki1rxb"; + }; + + nativeBuildInputs = [ perl ]; + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + description = "C library for accessing Japanese CD-ROM books"; + longDescription = '' + The EB library is a library for accessing CD-ROM books, which are a + common way to distribute electronic dictionaries in Japan. It supports + the EB, EBG, EBXA, EBXA-C, S-EBXA and EPWING formats. + ''; + licence = licenses.bsd3; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d63c5d67a8d8..09d97e781491 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6836,6 +6836,8 @@ let libeatmydata = callPackage ../development/libraries/libeatmydata { }; + libeb = callPackage ../development/libraries/libeb { }; + libebml = callPackage ../development/libraries/libebml { }; libebur128 = callPackage ../development/libraries/libebur128 { }; From 4b9428038e279a40184106a9a8640788d7db01c3 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Wed, 23 Sep 2015 19:06:29 +0200 Subject: [PATCH 021/227] goldendict: 1.0.1 -> 1.5.0.20150801 --- pkgs/applications/misc/goldendict/default.nix | 28 +++++-------- pkgs/applications/misc/goldendict/gcc47.patch | 40 ------------------- .../misc/goldendict/goldendict-paths.diff | 10 ----- 3 files changed, 10 insertions(+), 68 deletions(-) delete mode 100644 pkgs/applications/misc/goldendict/gcc47.patch delete mode 100644 pkgs/applications/misc/goldendict/goldendict-paths.diff diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix index 717d0a012a2c..32a16e79c21e 100644 --- a/pkgs/applications/misc/goldendict/default.nix +++ b/pkgs/applications/misc/goldendict/default.nix @@ -1,24 +1,16 @@ -{ stdenv, fetchurl, pkgconfig, qt4, libXtst, libvorbis, phonon, hunspell }: +{ stdenv, fetchFromGitHub, pkgconfig, qt4, libXtst, libvorbis, hunspell, libao, ffmpeg, libeb, lzo, xz, libtiff }: stdenv.mkDerivation rec { - name = "goldendict-1.0.1"; - src = fetchurl { - url = "mirror://sourceforge/goldendict/${name}-src.tar.bz2"; - sha256 = "19p99dd5jgs0k66sy30vck7ymqj6dv1lh6w8xw18zczdll2h9yxk"; + name = "goldendict-1.5.0.20150801"; + src = fetchFromGitHub { + owner = "goldendict"; + repo = "goldendict"; + rev = "b4bb1e9635c764aa602fbeaeee661f35e461d062"; + sha256 = "0dhaa0nii226541al3i2d8x8h7cfh96w5vkw3pa3l74llgrj7yx2"; }; - buildInputs = [ pkgconfig qt4 libXtst libvorbis phonon hunspell ]; - unpackPhase = '' - mkdir ${name}-src - cd ${name}-src - tar xf ${src} - ''; - patches = [ ./goldendict-paths.diff ./gcc47.patch ]; - patchFlags = "-p 0"; + + buildInputs = [ pkgconfig qt4 libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff ]; configurePhase = '' - qmake - ''; - installPhase = '' - make INSTALL_ROOT="$out" install - rm -rf "$out/share/app-install" + qmake PREFIX=$out 'CONFIG+=zim_support' ''; meta = { diff --git a/pkgs/applications/misc/goldendict/gcc47.patch b/pkgs/applications/misc/goldendict/gcc47.patch deleted file mode 100644 index 311dad4f6487..000000000000 --- a/pkgs/applications/misc/goldendict/gcc47.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001 -From: Michael Palimaka -Date: Fri, 20 Jul 2012 03:27:38 +1000 -Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes. - ---- - processwrapper.cc | 4 ++++ - qtsingleapplication/src/qtlocalpeer.cpp | 1 + - 2 files changed, 5 insertions(+) - -diff --git processwrapper.cc processwrapper.cc -index f7f3f19..86b985d 100644 ---- processwrapper.cc -+++ processwrapper.cc -@@ -2,6 +2,10 @@ - - #include - -+#if defined(Q_OS_UNIX) -+#include -+#endif -+ - #ifdef Q_OS_WIN32 - - #include -diff --git qtsingleapplication/src/qtlocalpeer.cpp qtsingleapplication/src/qtlocalpeer.cpp -index 382d182..506c142 100644 ---- qtsingleapplication/src/qtlocalpeer.cpp -+++ qtsingleapplication/src/qtlocalpeer.cpp -@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0; - #endif - #if defined(Q_OS_UNIX) - #include -+#include - #endif - - namespace QtLP_Private { --- -1.7.11.1 - diff --git a/pkgs/applications/misc/goldendict/goldendict-paths.diff b/pkgs/applications/misc/goldendict/goldendict-paths.diff deleted file mode 100644 index 6682911dbe42..000000000000 --- a/pkgs/applications/misc/goldendict/goldendict-paths.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100 -+++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100 -@@ -63,2 +63,2 @@ -- isEmpty( PREFIX ):PREFIX = /usr/local -- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\" -+ isEmpty( PREFIX ):PREFIX = / -+ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\" -@@ -66 +66 @@ -- locale.path = $$PREFIX/share/apps/goldendict/locale/ -+ locale.path = $$PREFIX/share/goldendict/locale/ From 2f3eb5e0eff9958999245fb8ae9f2702480cf6c6 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 23 Sep 2015 23:22:17 -0700 Subject: [PATCH 022/227] ipfs: 2015-08-29 -> 2015-09-23 --- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/go-packages.nix | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d63c5d67a8d8..0607bc278519 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1886,6 +1886,8 @@ let iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; + ipfs = goPackages.ipfs.bin // { outputs = [ "bin" ]; }; + ipmitool = callPackage ../tools/system/ipmitool { static = false; }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 056d8d8fb3f3..2bf0a96a5aa1 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -1592,11 +1592,11 @@ let }; ipfs = buildFromGitHub{ - rev = "ff26c312000da12d395c9cdba05c43f29b68b456"; + rev = "9c6ec296e396cc6be551c9807ae220fb50dd07d4"; + date = "2015-09-23"; owner = "ipfs"; repo = "go-ipfs"; - sha256 = "0qj3rwq5i4aiwn0i09skpi1s3mzqm8ma9v1cpjl7rya2y6ypx8xg"; - disabled = !isGo14; + sha256 = "0lmj2s9ihl1a5r8yn6w0lvb8z3n6c9b8wi1yvi77vgzm6b6lfl3a"; }; ldap = buildGoPackage rec { From 3e6bb402b18c7b08e85a0468b442c40e4983ab58 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 22 Sep 2015 09:24:10 +0200 Subject: [PATCH 023/227] nixos/tests/virtualbox: Give VMs more memory. We previously had 1024 MB of memory to fit a VirtualBox VM with 512 MB plus the memory needed of the VirtualBox host VM. That obviously won't work for two VirtualBox VMs, which are used for testing networking between two VirtualBox guests. Now, we have 2048 MB on the qemu guest (the VirtualBox host) and 768 MB for each VirtualBox guest. That should be enough to fit in two VirtualBox guests (I hope). Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 728d46d446ea..a2d33fa328b0 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -141,6 +141,7 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let vmFlags = mkFlags ([ "--uart1 0x3F8 4" "--uartmode1 client /run/virtualbox-log-${name}.sock" + "--memory 768" ] ++ (attrs.vmFlags or [])); controllerFlags = mkFlags [ @@ -324,7 +325,7 @@ in { mkVMConf = name: val: val.machine // { key = "${name}-config"; }; vmConfigs = mapAttrsToList mkVMConf vboxVMs; in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; - virtualisation.memorySize = 1024; + virtualisation.memorySize = 2048; virtualisation.virtualbox.host.enable = true; users.extraUsers.alice.extraGroups = let inherit (config.virtualisation.virtualbox.host) enableHardening; From 764a767d5f263e97406c07e6341b387643e1c7ac Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 24 Sep 2015 09:13:15 +0200 Subject: [PATCH 024/227] nixos/tests/virtualbox: Destroy detectvirt VM. I forgot to do this in da0e642. It shouldn't be a big problem but it's more clean to destroy the VM once we're done testing. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index a2d33fa328b0..2b5b5a180fca 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -413,6 +413,7 @@ in { shutdownVM_detectvirt; my $result = $machine->succeed("cat '$detectvirt_sharepath/result'"); chomp $result; + destroyVM_detectvirt; die "systemd-detect-virt returned \"$result\" instead of \"oracle\"" if $result ne "oracle"; }; From 2d066a8869e3d2e5cb6f44f1fb969dded65f7740 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 24 Sep 2015 10:08:30 +0200 Subject: [PATCH 025/227] mu: 0.9.12 -> 0.9.13 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 2104768e3b9f..3710cffb9908 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -3,12 +3,12 @@ , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { - version = "0.9.12"; + version = "0.9.13"; name = "mu-${version}"; src = fetchurl { url = "https://github.com/djcb/mu/archive/v${version}.tar.gz"; - sha256 = "1bxryacmas2llj68m2dv8dr1vwx8f5k2i2azh69jajkpqx7i4wdq"; + sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51"; }; buildInputs = From 5ad29f6b85b7f49ede3f2a14f995b524c452e0aa Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 24 Sep 2015 10:14:00 +0200 Subject: [PATCH 026/227] gpaste: 3.16.3 -> 3.16.3.1 --- pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix index dee9caf444c5..6563f7979700 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix @@ -2,12 +2,12 @@ , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }: stdenv.mkDerivation rec { - version = "${gnome3.version}.3"; + version = "${gnome3.version}.3.1"; name = "gpaste-${version}"; src = fetchurl { url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz"; - sha256 = "1czc707y2ksb8lgq1la0qkj3wpi202hjfiyshsndhw0pqn3qjj4a"; + sha256 = "1m171r1d1jrv9d7ssj25ikrw7lc96gr41rgkxnsa2lsqrvv8i16l"; }; buildInputs = [ intltool autoreconfHook pkgconfig vala glib From fcab752abf94ae36e903097846c752d6b22e0dff Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 24 Sep 2015 10:24:54 +0200 Subject: [PATCH 027/227] openvswitch module: do not fork services --- nixos/modules/virtualisation/openvswitch.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index b5155246fdad..1c77945a6cb5 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -92,13 +92,11 @@ in { --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --unixctl=ovsdb.ctl.sock \ --pidfile=/var/run/openvswitch/ovsdb.pid \ - --detach \ /var/db/openvswitch/conf.db ''; Restart = "always"; RestartSec = 3; PIDFile = "/var/run/openvswitch/ovsdb.pid"; - Type = "forking"; }; postStart = '' ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init @@ -114,11 +112,9 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/ovs-vswitchd \ - --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ - --detach + --pidfile=/var/run/openvswitch/ovs-vswitchd.pid ''; PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; - Type = "forking"; }; }; @@ -143,11 +139,10 @@ in { ${cfg.package}/bin/ovs-monitor-ipsec \ --root-prefix ${runDir}/ipsec \ --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ - --monitor --detach \ + --monitor \ unix:/var/run/openvswitch/db.sock ''; PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; - Type = "forking"; }; preStart = '' From 8e45d4da52389c0782ca14f5f596ccd24a230ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Sep 2015 10:38:43 +0200 Subject: [PATCH 028/227] mu: don't use nested lists and refactor meta This doesn't even change derivation hash in the default setting. --- pkgs/tools/networking/mu/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 3710cffb9908..1191129894c1 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ sqlite pkgconfig autoconf automake xapian glib gmime texinfo emacs guile libsoup icu ] - ++ stdenv.lib.optional withMug [ gtk3 webkit ]; + ++ stdenv.lib.optionals withMug [ gtk3 webkit ]; preConfigure = '' autoreconf -i @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { cp -v toys/mug/mug $out/bin/ ''; - meta = { + meta = with stdenv.lib; { description = "A collection of utilties for indexing and searching Maildirs"; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; homepage = "http://www.djcbsoftware.nl/code/mu/"; - platforms = stdenv.lib.platforms.mesaPlatforms; - maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ antono the-kenny ]; }; } From 3f06a234f634f2377081a275a8a6f11cf9a24e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Sep 2015 10:41:17 +0200 Subject: [PATCH 029/227] texlive: just comment about (not) another mirror --- pkgs/tools/typesetting/tex/texlive-new/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix index 85bfe24e77f5..961fbc26ba47 100644 --- a/pkgs/tools/typesetting/tex/texlive-new/default.nix +++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix @@ -129,7 +129,7 @@ let urlPrefix = args.urlPrefix or ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive"); # beware: standard mirrors http://mirror.ctan.org/ don't have releases - mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu + mirror = "ftp://tug.ctan.org"; # also works: ftp.math.utah.edu but same IP in '' tar -xf '${ fetchurl { inherit url md5; } }' \ '--strip-components=${toString stripPrefix}' \ From 2d3537fbf2ec94d9eab06ed68ce80e0c2a1af1ad Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Wed, 23 Sep 2015 23:45:45 +0000 Subject: [PATCH 030/227] racer: git-2015-05-18 -> 1.0.0 --- pkgs/development/tools/rust/racer/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix index 0b614f4edc61..463f57f5e75c 100644 --- a/pkgs/development/tools/rust/racer/default.nix +++ b/pkgs/development/tools/rust/racer/default.nix @@ -1,17 +1,18 @@ -{stdenv, fetchgit, rustPlatform, makeWrapper }: +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: with rustPlatform; buildRustPackage rec { - #TODO add emacs support - name = "racer-git-2015-05-18"; - src = fetchgit { - url = https://github.com/phildawes/racer; - rev = "c2d31ed49baa11f06ffc0c7bc8f95dd00037d035"; - sha256 = "0g420cbqpknhl61a4mpk3bbia8agf657d9vzzcqr338lmni80qz7"; + name = "racer-${version}"; + version = "1.0.0"; + src = fetchFromGitHub { + owner = "phildawes"; + repo = "racer"; + rev = "v${version}"; + sha256 = "1b6829nqx0sqw1akcid61izw8mah1dfx2nxldkmmg4scnydhvw1l"; }; - depsSha256 = "0s951apqcr96lvc1jamk6qw3631gwnlnfgcx55vlznfm7shnmywn"; + depsSha256 = "1hfqr1kidl77lq3djbhfn37whvv6k0hg9g5gcnl6pgl6kn669hdc"; buildInputs = [ makeWrapper ]; @@ -24,13 +25,13 @@ buildRustPackage rec { cp -p target/release/racer $out/bin/ wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustc.src}/src" install -d $out/share/emacs/site-lisp - install "editors/"*.el $out/share/emacs/site-lisp + install "editors/emacs/"*.el $out/share/emacs/site-lisp ''; meta = with stdenv.lib; { description = "A utility intended to provide Rust code completion for editors and IDEs"; homepage = https://github.com/phildawes/racer; license = stdenv.lib.licenses.mit; - maintainers = [ maintainers.jagajaga ]; + maintainers = with maintainers; [ jagajaga globin ]; }; } From 4ed66c9f02de8722586f08371a1b202d2ef2b723 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 24 Sep 2015 08:58:13 +0000 Subject: [PATCH 031/227] rustfmt: fix build rustfmt now needs to have llvm in its buildInputs since rust does not bundle it and rustfmt needs to link to it. --- pkgs/development/tools/rust/rustfmt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix index 1a2bf7ac01ce..95818a323d68 100644 --- a/pkgs/development/tools/rust/rustfmt/default.nix +++ b/pkgs/development/tools/rust/rustfmt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, rustUnstable, makeWrapper }: +{ stdenv, fetchgit, rustUnstable, makeWrapper, llvmPackages_37 }: with rustUnstable; @@ -10,6 +10,8 @@ buildRustPackage rec { sha256 = "0q72mfj2ph2n4cd0cs4p2mpyr2ixd6ss607kjlgfinjv6klk1i3b"; }; + buildInputs = [ llvmPackages_37.llvm ]; + depsSha256 = "13i9qaia1wn18lgfl69rrxw7b24bq1bpqhdck2jzxpv3wi2xshlw"; meta = with stdenv.lib; { From 1eb5566af549ac1af600834a5e5782563f38e89e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 24 Sep 2015 11:07:38 +0200 Subject: [PATCH 032/227] doc/functions: fix a typo --- doc/functions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/functions.xml b/doc/functions.xml index 7fd30cabf16b..5378b59abcb2 100644 --- a/doc/functions.xml +++ b/doc/functions.xml @@ -127,7 +127,7 @@ in ... lib.makeOverridable - The function lib.makeOverridable is used make the result + The function lib.makeOverridable is used to make the result of a function easily customizable. This utility only makes sense for functions that accept an argument set and return an attribute set. From 57287106bef24ef4f8fe97557ba3dfc90fff6e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 19 Jul 2015 23:10:11 +0200 Subject: [PATCH 033/227] xfce.xfdesktop: maintenance update --- pkgs/desktops/xfce/core/xfdesktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 4402e61a2fb6..e5d04879008e 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; ver_maj = "4.12"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "c9788883163b57bac39d12e5f8310c869d176454879defb78b67f8e9f1ad5225"; + sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac"; }; name = "${p_name}-${ver_maj}.${ver_min}"; From b3d4b1bef278987103c2258148d5f4b05a6776a6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 23 Sep 2015 20:08:04 +0200 Subject: [PATCH 034/227] ec2-ami-tools: Update to 1.5.7 --- pkgs/tools/virtualization/ec2-ami-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix index dad581c93d06..dee14db46bcf 100644 --- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ec2-ami-tools-${version}"; - version = "1.5.6"; + version = "1.5.7"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { url = "http://s3.amazonaws.com/ec2-downloads/${name}.zip"; - sha256 = "0227370qbm26qaqvscqxv6002bqwy2i5fdhbhpwfnbymh7jz59ks"; + sha256 = "17xj7xmdbcwdbzalhfs6yyiwa64978mk3li39l949qfjjgrxjias"; }; # Amazon EC2 requires that disk images are writable. If they're From 5ab7a37febe3acce36bf659bbbc430fb572c73d8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 10:36:32 +0200 Subject: [PATCH 035/227] ec2-api-tools: Update to 1.7.5.1 --- pkgs/tools/virtualization/ec2-api-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix index 5ffba07087ad..86ad36886c9f 100644 --- a/pkgs/tools/virtualization/ec2-api-tools/default.nix +++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "ec2-api-tools-1.6.5.1"; + name = "ec2-api-tools-1.7.5.1"; src = fetchurl { url = "http://tarballs.nixos.org/${name}.zip"; - sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda"; + sha256 = "0figmvcm82ghmpz3018ihysz8zpxpysgbpdx7rmciq9y80qbw6l5"; }; buildInputs = [ unzip makeWrapper ]; From e73b19ae4e984f58cebe4dd4f82cda622da552ab Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 10:36:50 +0200 Subject: [PATCH 036/227] ec2-data.nix: Print all SSH host keys Also, don't barf if there is no DSA key. --- nixos/modules/virtualisation/ec2-data.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix index 0b0fdda49888..91f4774cdc26 100644 --- a/nixos/modules/virtualisation/ec2-data.nix +++ b/nixos/modules/virtualisation/ec2-data.nix @@ -80,8 +80,9 @@ with lib; # can obtain it securely by parsing the output of # ec2-get-console-output. echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console - ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_dsa_key.pub > /dev/console - ${config.programs.ssh.package}/bin/ssh-keygen -l -f /etc/ssh/ssh_host_ed25519_key.pub > /dev/console + for i in /etc/ssh/ssh_host_*_key.pub; do + ${config.programs.ssh.package}/bin/ssh-keygen -l -f $i > /dev/console + done echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console ''; serviceConfig.Type = "oneshot"; From 89e983786a4e2cf6dd238af4df6da373cc01e62b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 11:42:32 +0200 Subject: [PATCH 037/227] Manual: Remove store path references --- nixos/modules/config/shells-environment.nix | 5 +++-- nixos/modules/programs/ssh.nix | 3 ++- nixos/modules/programs/venus.nix | 3 ++- nixos/modules/services/amqp/activemq/default.nix | 3 ++- nixos/modules/services/hardware/sane.nix | 3 ++- nixos/modules/services/logging/logstash.nix | 4 ++-- nixos/modules/services/misc/nixos-manual.nix | 3 ++- nixos/modules/services/misc/subsonic.nix | 4 +++- nixos/modules/services/monitoring/grafana.nix | 6 ++++-- nixos/modules/services/networking/dnscrypt-proxy.nix | 5 +---- nixos/modules/services/networking/seeks.nix | 2 +- nixos/modules/services/web-servers/phpfpm.nix | 5 +++-- nixos/modules/services/x11/display-managers/lightdm.nix | 4 +++- 13 files changed, 30 insertions(+), 20 deletions(-) diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index 533280890a70..d0243f9775c5 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -57,8 +57,8 @@ in type = types.attrsOf (types.listOf types.str); example = { PATH = [ "/bin" "/sbin" ]; MANPATH = [ "/man" "/share/man" ]; }; description = '' - Attribute set of environment variable. Each attribute maps to a list - of relative paths. Each relative path is appended to the each profile + Attribute set of environment variable. Each attribute maps to a list + of relative paths. Each relative path is appended to the each profile of to form the content of the corresponding environment variable. ''; @@ -123,6 +123,7 @@ in "''${pkgs.dash}/bin/dash" ''; type = types.path; + visible = false; description = '' The shell executable that is linked system-wide to /bin/sh. Please note that NixOS assumes all diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index cf7ef455eb85..87a7bac208b7 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -36,7 +36,6 @@ in askPassword = mkOption { type = types.str; - default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; description = ''Program used by SSH to ask for passwords.''; }; @@ -223,5 +222,7 @@ in export SSH_ASKPASS=${askPassword} ''; + programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass"; + }; } diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index ca3188b18199..8f85b602fe2c 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -99,7 +99,6 @@ in }; outputTheme = mkOption { - default = "${pkgs.venus}/themes/classic_fancy"; type = types.path; description = '' Directory containing a config.ini file which is merged with this one. @@ -170,5 +169,7 @@ in startAt = cfg.dates; }; + services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy"; + }; } diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix index 261f97617664..56ff388f8a9e 100644 --- a/nixos/modules/services/amqp/activemq/default.nix +++ b/nixos/modules/services/amqp/activemq/default.nix @@ -32,7 +32,6 @@ in { ''; }; configurationDir = mkOption { - default = "${activemq}/conf"; description = '' The base directory for ActiveMQ's configuration. By default, this directory is searched for a file named activemq.xml, @@ -126,6 +125,8 @@ in { ''; }; + services.activemq.configurationDir = mkDefault "${activemq}/conf"; + }; } diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix index 3bf765c6f991..0428602688dd 100644 --- a/nixos/modules/services/hardware/sane.nix +++ b/nixos/modules/services/hardware/sane.nix @@ -36,7 +36,6 @@ in hardware.sane.configDir = mkOption { type = types.string; - default = "${saneConfig}/etc/sane.d"; description = "The value of SANE_CONFIG_DIR."; }; @@ -47,6 +46,8 @@ in config = mkIf config.hardware.sane.enable { + hardware.sane.configDir = mkDefault "${saneConfig}/etc/sane.d"; + environment.systemPackages = backends; environment.sessionVariables = { SANE_CONFIG_DIR = config.hardware.sane.configDir; diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix index aec45d9286d8..3a798c6f3724 100644 --- a/nixos/modules/services/logging/logstash.nix +++ b/nixos/modules/services/logging/logstash.nix @@ -84,10 +84,10 @@ in type = types.lines; default = ''stdin { type => "example" }''; description = "Logstash input configuration."; - example = '' + example = literalExample '' # Read from journal pipe { - command => "${pkgs.systemd}/bin/journalctl -f -o json" + command => "''${pkgs.systemd}/bin/journalctl -f -o json" type => "syslog" codec => json {} } ''; diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index c570a01fb3b2..0c9a916ed21a 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -80,7 +80,6 @@ in services.nixosManual.browser = mkOption { type = types.path; - default = "${pkgs.w3m}/bin/w3m"; description = '' Browser used to show the manual. ''; @@ -116,6 +115,8 @@ in services.mingetty.helpLine = mkIf cfg.showManual "\nPress for the NixOS manual."; + services.nixosManual.browser = mkDefault "${pkgs.w3m}/bin/w3m"; + }; } diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix index 3e1a2e8fbb51..4d164ad8d65f 100644 --- a/nixos/modules/services/misc/subsonic.nix +++ b/nixos/modules/services/misc/subsonic.nix @@ -97,7 +97,6 @@ in transcoders = mkOption { type = types.listOf types.path; - default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ]; description = '' List of paths to transcoder executables that should be accessible from Subsonic. Symlinks will be created to each executable inside @@ -153,5 +152,8 @@ in }; users.extraGroups.subsonic.gid = config.ids.gids.subsonic; + + services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ]; + }; } diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 0393d01054d1..fa653565a67f 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -200,7 +200,6 @@ in { staticRootPath = mkOption { description = "Root path for static assets."; - default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public"; type = types.str; }; @@ -311,7 +310,7 @@ in { config = mkIf cfg.enable { warnings = [ - "Grafana passwords will be stored as plaintext in nix store!" + "Grafana passwords will be stored as plaintext in the Nix store!" ]; systemd.services.grafana = { @@ -331,5 +330,8 @@ in { home = cfg.dataDir; createHome = true; }; + + services.grafana.staticRootPath = mkDefault "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public"; + }; } diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index c724ee979c2d..218bce2dbb31 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -52,10 +52,7 @@ in default = "opendns"; type = types.nullOr types.string; description = '' - The name of the upstream DNSCrypt resolver to use. See - ${resolverListFile} for alternative resolvers - (e.g., if you are concerned about logging and/or server - location). + The name of the upstream DNSCrypt resolver to use. ''; }; customResolver = mkOption { diff --git a/nixos/modules/services/networking/seeks.nix b/nixos/modules/services/networking/seeks.nix index 155ecbb98ef3..f5bc60be3457 100644 --- a/nixos/modules/services/networking/seeks.nix +++ b/nixos/modules/services/networking/seeks.nix @@ -33,7 +33,7 @@ in type = types.str; description = " The Seeks server configuration. If it is not specified, - a default configuration is used (${seeks}/etc/seeks). + a default configuration is used. "; }; diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix index 41dbfff41cfe..82398948bfaa 100644 --- a/nixos/modules/services/web-servers/phpfpm.nix +++ b/nixos/modules/services/web-servers/phpfpm.nix @@ -44,8 +44,7 @@ in { phpIni = mkOption { type = types.path; - default = "${cfg.phpPackage}/etc/php-recommended.ini"; - description = "php.ini file to use."; + description = "PHP configuration file to use."; }; poolConfigs = mkOption { @@ -86,5 +85,7 @@ in { }; }; + services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini"; + }; } diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index bc8f478c7d83..11e21c9d917f 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -104,7 +104,6 @@ in }; background = mkOption { - default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; description = '' The background image or color to use. ''; @@ -172,5 +171,8 @@ in }; users.extraGroups.lightdm.gid = config.ids.gids.lightdm; + + services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png"; + }; } From 5b8dae8ef3870aca16632ff29bf26391898d08f5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 11:47:00 +0200 Subject: [PATCH 038/227] Prevent future store path references in the manual --- nixos/doc/manual/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 15bd185ccec9..87964e27bb9c 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -31,10 +31,8 @@ let else fn; - # Convert the list of options into an XML file. The builtin - # unsafeDiscardStringContext is used to prevent the realisation of - # the store paths which are used in options definitions. - optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML optionsList')); + # Convert the list of options into an XML file. + optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList'); optionsDocBook = runCommand "options-db.xml" {} '' optionsXML=${optionsXML} @@ -139,6 +137,8 @@ in rec { ''; # */ meta.description = "The NixOS manual in HTML format"; + + allowedReferences = ["out"]; }; manualPDF = stdenv.mkDerivation { @@ -187,6 +187,8 @@ in rec { ${docbook5_xsl}/xml/xsl/docbook/manpages/docbook.xsl \ ./man-pages.xml ''; + + allowedReferences = ["out"]; }; } From 9cc7859b2ea2a9f79a17489ba945c0358296c8ed Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 18 Sep 2015 17:50:31 +0000 Subject: [PATCH 039/227] nixos: show the manual in system's /share/doc (close #9928) --- nixos/modules/services/misc/nixos-manual.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 0c9a916ed21a..c10d8197686f 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -92,7 +92,7 @@ in system.build.manual = manual; - environment.systemPackages = [ manual.manpages help ]; + environment.systemPackages = [ manual.manpages manual.manual help ]; boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"]; From 251a00da4cb5073b9e38f40348835a194a68e6ca Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 24 Sep 2015 12:44:07 +0200 Subject: [PATCH 040/227] openvswitch module: add option to reset db on start --- nixos/modules/virtualisation/openvswitch.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 1c77945a6cb5..4d6123e4ce51 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -19,6 +19,15 @@ in { ''; }; + resetOnStart = mkOption { + type = types.bool; + default = false; + description = '' + Whether to reset the Open vSwitch configuration database to a default + configuration on every start of the systemd ovsdb.service. + ''; + }; + package = mkOption { type = types.package; default = pkgs.openvswitch; @@ -75,6 +84,7 @@ in { mkdir -p ${runDir} mkdir -p /var/db/openvswitch chmod +w /var/db/openvswitch + ${optionalString cfg.resetOnStart "rm -f /var/db/openvswitch/conf.db"} if [[ ! -e /var/db/openvswitch/conf.db ]]; then ${cfg.package}/bin/ovsdb-tool create \ "/var/db/openvswitch/conf.db" \ From f96582fc609f576bdf63ba94b2fe954f107b6c69 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 24 Sep 2015 09:31:43 +0000 Subject: [PATCH 041/227] mercurial: add package for crecord extension as optional dependency, include by default in mercurialFull --- .../version-management/mercurial/default.nix | 9 +++++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 28 +++++++++++++++++++ 3 files changed, 37 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 62f2cc80d6fd..5a44240fa769 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich -, guiSupport ? false, tk ? null, curses +, guiSupport ? false, tk ? null, hg-crecord ? null, curses , ApplicationServices }: let @@ -36,6 +36,13 @@ stdenv.mkDerivation { WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\" --set HG \"$out/bin/hg\" --prefix PATH : \"${tk}/bin\" " + '') + (stdenv.lib.optionalString (hg-crecord != null) + '' + mkdir -p $out/etc/mercurial + cat >> $out/etc/mercurial/hgrc << EOF + [extensions] + crecord=${hg-crecord}/${python.sitePackages}/crecord + EOF '') + '' for i in $(cd $out/bin && ls); do diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0607bc278519..b16c179c7c62 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11934,7 +11934,7 @@ let guiSupport = false; # use mercurialFull to get hgk GUI }; - mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); + mercurialFull = appendToName "full" (pkgs.mercurial.override { inherit (pythonPackages) hg-crecord; guiSupport = true; }); merkaartor = callPackage ../applications/misc/merkaartor { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9e99efb3f64..5983ff67a3e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5720,6 +5720,34 @@ let }; + hg-crecord = buildPythonPackage rec { + rev = "5cfaabfe9cb9f0a0d6837956d73127f290a213be"; + name = "hg-crecord-${rev}"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://bitbucket.org/edgimar/crecord/get/${builtins.substring 0 12 rev}.tar.gz"; + sha256 = "02003fa5620ec40a5ad0d7cede2e65c2cb398a7fe4e1ee26bd3396a87d63ad35"; + }; + + # crecord comes as just a bare directory + configurePhase = " "; + buildPhase = "${python.executable} -m compileall crecord"; + installPhase = '' + mkdir -p $out/${python.sitePackages} + cp -Lr crecord $out/${python.sitePackages}/ + ''; + + # there ain't none + doCheck = false; + + meta = { + description = "Mercurial extension for selecting graphically which files/hunk/lines to commit"; + homepage = https://bitbucket.org/edgimar/crecord; + }; + }; + + docutils = buildPythonPackage rec { name = "docutils-0.12"; From 1e1a54f62c7b3a849bd353b70cbe06aebcfdb60c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 00:48:25 +0200 Subject: [PATCH 042/227] libpsl: 0.10.0 -> 0.11.0 --- pkgs/development/libraries/libpsl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 58de331c0c51..dcffa005bc49 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -13,13 +13,13 @@ let owner = "publicsuffix"; }; - libVersion = "0.10.0"; + libVersion = "0.11.0"; in stdenv.mkDerivation { name = "libpsl-${version}"; src = fetchFromGitHub { - sha256 = "0m6jz0cc49cp0zki1qb2b1z7z0djladayfhbxi0i20pad28czsbn"; + sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm"; rev = "libpsl-${libVersion}"; repo = "libpsl"; owner = "rockdaboot"; From d2f3041d270cba3746dbdb021a4be3d166517e77 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 01:32:25 +0200 Subject: [PATCH 043/227] sshuttle: carry a few bug fixes until next release --- pkgs/tools/security/sshuttle/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 18997abb6788..d392f8a2fb63 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, pandoc +{ stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pandoc , coreutils, iptables, nettools, openssh, procps, python }: let version = "0.71"; in @@ -12,6 +12,21 @@ stdenv.mkDerivation rec { owner = "sshuttle"; }; + patches = [ + (fetchpatch { + sha256 = "1yrjyvdz6k6zk020dmbagf8w49w8vhfbzgfpsq9jqdh2hbykv3m3"; + url = https://github.com/sshuttle/sshuttle/commit/3cf5002b62650c26a50e18af8d8c5c91d754bab9.patch; + }) + (fetchpatch { + sha256 = "091gg28cnmx200q46bcnxpp9ih9p5qlq0r3bxfm0f4qalg8rmp2g"; + url = https://github.com/sshuttle/sshuttle/commit/d70b5f2b89e593506834cf8ea10785d96c801dfc.patch; + }) + (fetchpatch { + sha256 = "17l9h8clqlbyxdkssavxqpb902j7b3yabrrdalybfpkhj69x8ghk"; + url = https://github.com/sshuttle/sshuttle/commit/a38963301e9c29fbe3232f0a41ea080b642c5ad2.patch; + }) + ]; + nativeBuildInputs = [ makeWrapper pandoc ]; buildInputs = [ coreutils iptables nettools openssh procps python ]; From 198dda950be230df9794833a0bc916a48bb13195 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 09:44:10 +0200 Subject: [PATCH 044/227] sshuttle: add PyXAPI for tproxy UDP proxy support --- pkgs/tools/security/sshuttle/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index d392f8a2fb63..e085bfaaa91a 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, makeWrapper, pandoc -, coreutils, iptables, nettools, openssh, procps, python }: +, coreutils, iptables, nettools, openssh, procps, pythonPackages }: let version = "0.71"; in stdenv.mkDerivation rec { @@ -28,20 +28,25 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ makeWrapper pandoc ]; - buildInputs = [ coreutils iptables nettools openssh procps python ]; + buildInputs = + [ coreutils iptables nettools openssh procps pythonPackages.python ]; + pythonPaths = with pythonPackages; [ PyXAPI ]; preConfigure = '' cd src ''; - installPhase = '' + installPhase = let + mapPath = f: x: stdenv.lib.concatStringsSep ":" (map f x); + in '' mkdir -p $out/share/sshuttle cp -R sshuttle *.py compat $out/share/sshuttle mkdir -p $out/bin ln -s $out/share/sshuttle/sshuttle $out/bin - wrapProgram $out/bin/sshuttle --prefix PATH : \ - "${stdenv.lib.concatStringsSep ":" (map (x: "${x}/bin") buildInputs)}" + wrapProgram $out/bin/sshuttle \ + --prefix PATH : "${mapPath (x: "${x}/bin") buildInputs}" \ + --prefix PYTHONPATH : "${mapPath (x: "$(toPythonPath ${x})") pythonPaths}" install -Dm644 sshuttle.8 $out/share/man/man8/sshuttle.8 ''; From 0d08b2c5990f201081201445df955984f836cb2e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 24 Sep 2015 13:29:52 +0200 Subject: [PATCH 045/227] exfat: 1.2.0 -> 1.2.1 Upstream changes: - Fixed compatibility with Zalman VE-200: now newly created directories do not have archive bit set. - Fixed heap corruption: malformed FS can use invalid sector or cluster size. - Fixed hang on mount: malformed FS can have cyclic references in the clusters map. --- pkgs/tools/filesystems/exfat/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix index a0a4223731c0..08cb70dcfc88 100644 --- a/pkgs/tools/filesystems/exfat/default.nix +++ b/pkgs/tools/filesystems/exfat/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }: -let version = "1.2.0"; in +let version = "1.2.1"; in stdenv.mkDerivation rec { name = "exfat-${version}"; src = fetchFromGitHub { - sha256 = "1fsm082g8phqcdg5md6yll06jijnbvqrdy0638psa8kr159h4dv8"; + sha256 = "1k716civkxszkzpc7bcqqcmfik8lpwk3zwp2nl4v844b8g7r5xz9"; rev = "v${version}"; repo = "exfat"; owner = "relan"; @@ -23,4 +23,3 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nckx ]; }; } - From 1f5f472a8a21f9bceed7f50c581007cb9c7ec3d6 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 24 Sep 2015 14:51:44 +0200 Subject: [PATCH 046/227] Revert "openvswitch module: do not fork services" This reverts commit fcab752abf94ae36e903097846c752d6b22e0dff. --- nixos/modules/virtualisation/openvswitch.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 4d6123e4ce51..a0231315236c 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -102,11 +102,14 @@ in { --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ --unixctl=ovsdb.ctl.sock \ --pidfile=/var/run/openvswitch/ovsdb.pid \ + --detach \ /var/db/openvswitch/conf.db ''; Restart = "always"; RestartSec = 3; PIDFile = "/var/run/openvswitch/ovsdb.pid"; + # Use service type 'forking' to correctly determine when ovsdb-server is ready. + Type = "forking"; }; postStart = '' ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init @@ -122,9 +125,12 @@ in { serviceConfig = { ExecStart = '' ${cfg.package}/bin/ovs-vswitchd \ - --pidfile=/var/run/openvswitch/ovs-vswitchd.pid + --pidfile=/var/run/openvswitch/ovs-vswitchd.pid \ + --detach ''; PIDFile = "/var/run/openvswitch/ovs-vswitchd.pid"; + # Use service type 'forking' to correctly determine when vswitchd is ready. + Type = "forking"; }; }; @@ -149,10 +155,12 @@ in { ${cfg.package}/bin/ovs-monitor-ipsec \ --root-prefix ${runDir}/ipsec \ --pidfile /var/run/openvswitch/ovs-monitor-ipsec.pid \ - --monitor \ + --monitor --detach \ unix:/var/run/openvswitch/db.sock ''; PIDFile = "/var/run/openvswitch/ovs-monitor-ipsec.pid"; + # Use service type 'forking' to correctly determine when ovs-monitor-ipsec is ready. + Type = "forking"; }; preStart = '' From 9952afa2ffcb9401fb8216bd57895797cea5b72b Mon Sep 17 00:00:00 2001 From: Robbin C Date: Tue, 22 Sep 2015 08:11:53 +0800 Subject: [PATCH 047/227] kiwix: init at 0.9. This adds kiwix, an offline reader for Web content (like Wikipedia). --- pkgs/applications/misc/kiwix/default.nix | 110 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 112 insertions(+) create mode 100644 pkgs/applications/misc/kiwix/default.nix diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix new file mode 100644 index 000000000000..30db6a45ea1b --- /dev/null +++ b/pkgs/applications/misc/kiwix/default.nix @@ -0,0 +1,110 @@ +{ stdenv, fetchurl, makeWrapper, pkgconfig, zip, python +, zlib, xapian, which , icu, libmicrohttpd , lzma, zimlib +, ctpp2, aria2, wget , bc, libuuid , glibc, libX11 +, libXext, libXt, libXrender , glib, dbus, dbus_glib, gtk +, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib +, atk +}: + +let + xulrunner64_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.tar.bz2; + sha256 = "0i3m30gm5z7qmas14id6ypvbmnb2k7jhz8aby2wz5vvv49zqmx3s"; + }; + xulrunnersdk64_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-x86_64.sdk.tar.bz2; + sha256 = "0z90v7c4mq15g5klmsj8vs2r10fbygj3qzynx4952hkv8ihw8n3a"; + }; + xulrunner32_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.tar.bz2; + sha256 = "0yln6pxz8f6b9wm9124sx049z8mgi17lgd63rcv2hnix825y8gjb"; + }; + xulrunnersdk32_tar = fetchurl { + url = http://download.kiwix.org/dev/xulrunner-29.0.en-US.linux-i686.sdk.tar.bz2; + sha256 = "1h9vcbvf8wgds6i2z20y7krpys0mqsqhv1ijyfljanp6vyll9fvi"; + }; + + xulrunner_tar = if stdenv.system == "x86_64-linux" then xulrunner64_tar else xulrunner32_tar; + xulrunnersdk_tar = if stdenv.system == "x86_64-linux" then xulrunnersdk64_tar else xulrunnersdk32_tar; + pugixml_tar = fetchurl { + url = http://download.kiwix.org/dev/pugixml-1.2.tar.gz; + sha256 = "0sqk0vdwjq44jxbbkj1cy8qykrmafs1sickzldb2w2nshsnjshhg"; + }; + +in +with stdenv.lib; +stdenv.mkDerivation rec { + name = "kiwix-${version}"; + version = "0.9"; + + src = fetchurl { + url = "http://download.kiwix.org/src/kiwix-${version}-src.tar.xz"; + sha256 = "0577phhy2na59cpcqjgldvksp0jwczyg0l6c9ghnr19i375l7yqc"; + }; + + buildInputs = [ + zip + pkgconfig + python + zlib + xapian + which + icu + libmicrohttpd + lzma + zimlib + ctpp2 + aria2 + wget + bc + libuuid + makeWrapper + ]; + + postUnpack = '' + cd kiwix-* + mkdir static + cp Makefile.in static/ + + cd src/dependencies + cp ${pugixml_tar} pugixml-1.2.tar.gz + + tar -xf ${xulrunner_tar} + tar -xf ${xulrunnersdk_tar} + + cd ../../.. + ''; + + configurePhase = '' + bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF + ''; + + buildPhase = '' + cd src/dependencies + make pugixml-1.2/libpugixml.a + + cd ../.. + bash ./configure --disable-static --disable-dependency-tracking --prefix=$out --with-libpugixml=SELF + + make + ''; + + installPhase = '' + make install + cp -r src/dependencies/xulrunner $out/lib/kiwix + + patchelf --set-interpreter ${glibc}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner + + rm $out/bin/kiwix + makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ + --suffix LD_LIBRARY_PATH : `cat ${stdenv.cc}/nix-support/orig-cc`/lib:${makeLibraryPath [libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix PATH : ${aria2}/bin + ''; + + meta = { + description = "An offline reader for Web content"; + homepage = http://kiwix.org; + license = licenses.gpl3; + maintainers = with maintainers; [ robbinch ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3990a1f63260..6435be0269ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11768,6 +11768,8 @@ let inherit (gnome) libglade; }; + kiwix = callPackage ../applications/misc/kiwix { }; + koji = callPackage ../tools/package-management/koji { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; From 3733c25227ba2304bba2c3c4b390b4e7696b4c9d Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 19 Sep 2015 13:35:59 +0000 Subject: [PATCH 048/227] nodejs: 0.12.7 -> 4.1.0 A big version jump after io.js merge. dontDisableStatic flag is added since the ./configure script didn't recognize "--disable-static" flag added by default. New dependencies are also introduced, coming from io.js --- pkgs/development/web/nodejs/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index 0f41723ee94a..440ed7aca924 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -7,7 +7,7 @@ assert stdenv.system != "armv5tel-linux"; let - version = "0.12.7"; + version = "4.1.0"; deps = { inherit openssl zlib libuv; @@ -31,18 +31,18 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; - sha256 = "17gk29zbw58l0sjjfw86acp39pkiblnq0gsq1jdrd70w0pgn8gdj"; + sha256 = "453005f64ee529f7dcf1237eb27ee2fa2415c49f5c9e7463e8b71fba61c5b408"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ]; - + dontDisableStatic = true; prePatch = '' patchShebangs . ''; patches = stdenv.lib.optional stdenv.isDarwin ./no-xcode.patch; - buildInputs = [ python which ] + buildInputs = [ python which http-parser zlib libuv openssl python ] ++ (optional stdenv.isLinux utillinux) ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0607bc278519..c009ea0d39b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2008,8 +2008,9 @@ let ninka = callPackage ../development/tools/misc/ninka { }; - nodejs-0_12 = callPackage ../development/web/nodejs { + nodejs-4_1 = callPackage ../development/web/nodejs { libuv = libuvVersions.v1_6_1; + openssl = openssl_1_0_2; }; nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix { @@ -2019,16 +2020,16 @@ let nodejs = if stdenv.system == "armv5tel-linux" then nodejs-0_10 else - nodejs-0_12; + nodejs-4_1; - nodePackages_0_12 = callPackage ./node-packages.nix { self = nodePackages_0_12; nodejs = nodejs-0_12; }; + nodePackages_4_1 = callPackage ./node-packages.nix { self = nodePackages_4_1; nodejs = nodejs-4_1; }; nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; }; nodePackages = if stdenv.system == "armv5tel-linux" then nodePackages_0_10 else - nodePackages_0_12; + nodePackages_4_1; iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_6_1; }; From fbe9201a8ad9f06cc2f328376821fc659e757e30 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Sat, 19 Sep 2015 21:48:16 +0300 Subject: [PATCH 049/227] Remove io.js Since they're merged with nodejs and nodejs is updated to 4.1 --- pkgs/development/web/iojs/default.nix | 36 ------------------- pkgs/development/web/iojs/update-iojs | 50 --------------------------- pkgs/top-level/all-packages.nix | 4 --- 3 files changed, 90 deletions(-) delete mode 100644 pkgs/development/web/iojs/default.nix delete mode 100755 pkgs/development/web/iojs/update-iojs diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix deleted file mode 100644 index 6a0c8ca512e8..000000000000 --- a/pkgs/development/web/iojs/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: - -let - version = "3.1.0"; - inherit (stdenv.lib) optional maintainers licenses platforms; -in stdenv.mkDerivation { - name = "iojs-${version}"; - - src = fetchurl { - url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727"; - }; - - prePatch = '' - sed -e 's|^#!/usr/bin/env python$|#!${python}/bin/python|g' -i configure - ''; - - configureFlags = [ "--shared-openssl" "--shared-http-parser" "--shared-zlib" "--shared-libuv" ]; - - # iojs has --enable-static but no --disable-static. Automatically adding --disable-static - # causes configure to fail, so don't add --disable-static. - dontDisableStatic = true; - - buildInputs = [ python openssl_1_0_2 http-parser zlib libuv ] ++ (optional stdenv.isLinux utillinux); - setupHook = ../nodejs/setup-hook.sh; - - passthru.interpreterName = "iojs"; - - meta = { - description = "A friendly fork of Node.js with an open governance model"; - homepage = https://iojs.org/; - license = licenses.mit; - platforms = platforms.linux; - maintainers = [ maintainers.havvy ]; - }; -} diff --git a/pkgs/development/web/iojs/update-iojs b/pkgs/development/web/iojs/update-iojs deleted file mode 100755 index 837238f27c62..000000000000 --- a/pkgs/development/web/iojs/update-iojs +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# Fetch the latest io.js release (stable/nightly) and update -# `default.nix` in this directory. -# -# Call this from the root of your nixpkgs directory. -# - -set -e - -HERE="$(dirname "$0")" - -latest() { - curl -s "$1" | grep 'href="v' \ - | tail -1 | sed 's/.*href="v//;s/\/".*//' -} - -latest_log() { - echo "Getting latest $1 version from $2" >&2 - version=$(latest "$2") - echo "version -> $version" >&2 - echo "$version" -} - -url() { - nix-instantiate -A "$1" \ - | xargs cat \ - | sed 's/.*"urls","//;s/".*//' -} - -hash() { - nix-prefetch-url "$1" -} - -hash_log() { - echo "Finding hash for $1" >&2 - value=$(hash "$1") - echo "hash -> $value" >&2 - echo "$value" -} - -stableVersion=$(latest_log stable 'https://iojs.org/dist/') -stableHash=$(hash_log "$(url iojs.src)") - -sed -i \ - "/version = /s/\"[^\"]*\"/\"$stableVersion\"/" \ - "$HERE/default.nix" -sed -i \ - "/sha256 = /s/\"[^\"]*\"/\"$stableHash\"/" \ - "$HERE/default.nix" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c009ea0d39b0..8390b16def93 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2031,10 +2031,6 @@ let else nodePackages_4_1; - iojs = callPackage ../development/web/iojs { libuv = libuvVersions.v1_6_1; }; - - iojsPackages = callPackage ./node-packages.nix { self = iojsPackages; nodejs = iojs; }; - npm2nix = nodePackages.npm2nix; ldapvi = callPackage ../tools/misc/ldapvi { }; From f40c7ed1435d9507868337ae7509fe6d0392498b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 19:58:41 +0200 Subject: [PATCH 050/227] Remove relatime mount option This has been the kernel default for a long time. --- nixos/modules/tasks/filesystems.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 4409bd4cc8c3..ab64106f3533 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -41,7 +41,7 @@ let }; options = mkOption { - default = "defaults,relatime"; + default = "defaults"; example = "data=journal"; type = types.commas; description = "Options used to mount the file system."; @@ -69,8 +69,6 @@ let config = { mountPoint = mkDefault name; device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); - # The vboxsf filesystem doesn't support the relatime option: - options = mkIf (config.fsType == "vboxsf") (mkDefault "defaults"); }; }; From 9d92bd7845a0fcf895a1e7c4ae95c908be673060 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 24 Sep 2015 18:13:14 +0200 Subject: [PATCH 051/227] Add filesystem option to automatically grow to the maximum size This is primarily for EC2 and other cloud environments, where the disk may be bigger than the original image. --- nixos/modules/system/boot/stage-1-init.sh | 15 +++++++++- nixos/modules/system/boot/stage-1.nix | 7 ++++- nixos/modules/tasks/filesystems.nix | 16 ++++++++-- nixos/tests/make-test.nix | 2 +- nixos/tests/resize-root.nix | 36 +++++++++++++++++++++++ 5 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 nixos/tests/resize-root.nix diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index 480bbfa2b07b..516cbb295fa4 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -290,10 +290,23 @@ mountFS() { if [ -z "$fsType" ]; then fsType=auto; fi fi - echo "$device /mnt-root$mountPoint $fsType $options" >> /etc/fstab + # Filter out x- options, which busybox doesn't do yet. + local optionsFiltered="$(IFS=,; for i in $options; do if [ "${i:0:2}" != "x-" ]; then echo -n $i,; fi; done)" + + echo "$device /mnt-root$mountPoint $fsType $optionsFiltered" >> /etc/fstab checkFS "$device" "$fsType" + # Optionally resize the filesystem. + case $options in + *x-nixos.autoresize*) + if [ "$fsType" = ext2 -o "$fsType" = ext3 -o "$fsType" = ext4 ]; then + echo "resizing $device..." + resize2fs "$device" + fi + ;; + esac + # Create backing directories for unionfs-fuse. if [ "$fsType" = unionfs-fuse ]; then for i in $(IFS=:; echo ${options##*,dirs=}); do diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index f782eca3f647..ace2d10ec9c1 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -70,6 +70,12 @@ let copy_bin_and_libs ${pkgs.kmod}/bin/kmod ln -sf kmod $out/bin/modprobe + # Copy resize2fs if needed. + ${optionalString (any (fs: fs.autoResize) (attrValues config.fileSystems)) '' + # We need mke2fs in the initrd. + copy_bin_and_libs ${pkgs.e2fsprogs}/sbin/resize2fs + ''} + ${config.boot.initrd.extraUtilsCommands} # Copy ld manually since it isn't detected correctly @@ -393,7 +399,6 @@ in } ]; - system.build.bootStage1 = bootStage1; system.build.initialRamdisk = initialRamdisk; system.build.extraUtils = extraUtils; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index ab64106f3533..9dd250f140ce 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -7,7 +7,7 @@ let fileSystems = attrValues config.fileSystems; - prioOption = prio: optionalString (prio !=null) " pri=${toString prio}"; + prioOption = prio: optionalString (prio != null) " pri=${toString prio}"; fileSystemOpts = { name, config, ... }: { @@ -43,7 +43,7 @@ let options = mkOption { default = "defaults"; example = "data=journal"; - type = types.commas; + type = types.commas; # FIXME: should be a list description = "Options used to mount the file system."; }; @@ -58,6 +58,17 @@ let ''; }; + autoResize = mkOption { + default = false; + type = types.bool; + description = '' + If set, the filesystem is grown to its maximum size before + being mounted. (This is typically the size of the containing + partition.) This is currently only supported for ext2/3/4 + filesystems that are mounted during early boot. + ''; + }; + noCheck = mkOption { default = false; type = types.bool; @@ -69,6 +80,7 @@ let config = { mountPoint = mkDefault name; device = mkIf (config.fsType == "tmpfs") (mkDefault config.fsType); + options = mkIf config.autoResize "x-nixos.autoresize"; }; }; diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix index 285ca5b71d6e..f3e26aa7e74d 100644 --- a/nixos/tests/make-test.nix +++ b/nixos/tests/make-test.nix @@ -2,4 +2,4 @@ f: { system ? builtins.currentSystem, ... } @ args: with import ../lib/testing.nix { inherit system; }; -makeTest (if builtins.isFunction f then f (args // { inherit pkgs; }) else f) +makeTest (if builtins.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) diff --git a/nixos/tests/resize-root.nix b/nixos/tests/resize-root.nix new file mode 100644 index 000000000000..c8ccab38ab6f --- /dev/null +++ b/nixos/tests/resize-root.nix @@ -0,0 +1,36 @@ +import ./make-test.nix ({ pkgs, lib, ...} : { + + meta.maintainers = [ lib.maintainers.eelco ]; + + machine = { config, pkgs, ... }: { + virtualisation.diskSize = 512; + fileSystems = lib.mkVMOverride { + "/".autoResize = true; + }; + }; + + testScript = + '' + # Create a VM with a 512 MiB disk. + $machine->start; + $machine->waitForUnit("multi-user.target"); + my $blocks = $machine->succeed("stat -c %b -f /"); + my $bsize = $machine->succeed("stat -c %S -f /"); + my $size = $blocks * $bsize; + die "wrong free space $size" if $size < 480 * 1024 * 1024 || $size > 512 * 1024 * 1024; + $machine->succeed("touch /marker"); + $machine->shutdown; + + # Grow the disk to 1024 MiB. + system("qemu-img resize vm-state-machine/machine.qcow2 1024M") == 0 or die; + + # Start the VM again and check whether the initrd has correctly + # grown the root filesystem. + $machine->start; + $machine->waitForUnit("multi-user.target"); + $machine->succeed("[ -e /marker ]"); + my $blocks = $machine->succeed("stat -c %b -f /"); + my $size = $blocks * $bsize; + die "wrong free space $size" if $size < 980 * 1024 * 1024 || $size > 1024 * 1024 * 1024; + ''; +}) From 866e3932c74962402f19053883f436ffad1c9a8a Mon Sep 17 00:00:00 2001 From: michael bishop Date: Thu, 24 Sep 2015 16:42:06 -0300 Subject: [PATCH 052/227] tgt: init at 1.0.60 --- pkgs/tools/networking/tgt/default.nix | 37 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/networking/tgt/default.nix diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix new file mode 100644 index 000000000000..b5acdce800a0 --- /dev/null +++ b/pkgs/tools/networking/tgt/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages }: + +let + version = "1.0.60"; +in stdenv.mkDerivation rec { + name = "tgt-${version}"; + src = fetchFromGitHub { + owner = "fujita"; + repo = "tgt"; + rev = "ab51727a361bf296b1c2036375b5e45479059921"; + sha256 = "1bf8rn3mavjrzkp5k23akqn5ilw43g8mpfr68z1bi8s9lr2gkf37"; + }; + + buildInputs = [ libxslt systemd libaio ]; + + DESTDIR = "$(out)"; + PREFIX = "/"; + SD_NOTIFY="1"; + + preConfigure = '' + sed -i 's|/usr/bin/||' doc/Makefile + sed -i 's|/usr/include/libaio.h|${libaio}/include/libaio.h|' usr/Makefile + sed -i 's|/usr/include/sys/|${stdenv.glibc}/include/sys/|' usr/Makefile + sed -i 's|/usr/include/linux/|${stdenv.glibc}/include/linux/|' usr/Makefile + ''; + + postInstall = '' + sed -i 's|#!/usr/bin/perl|#! ${perl}/bin/perl -I${perlPackages.ConfigGeneral}/${perl.libPrefix}|' $out/sbin/tgt-admin + ''; + + enableParallelBuilding = true; + meta = { + description = "iSCSI Target daemon with rdma support"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0607bc278519..2937bcf2ccc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9580,6 +9580,8 @@ let openiscsi = callPackage ../os-specific/linux/open-iscsi { }; + tgt = callPackage ../tools/networking/tgt { }; + # -- Linux kernel expressions ------------------------------------------------ linuxHeaders = linuxHeaders_3_12; From 7216159cbee6b16d8289a36ce663f91751ae0ec5 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Thu, 24 Sep 2015 18:34:02 +0300 Subject: [PATCH 053/227] memcached: build on darwin Versions up to 1.4.24 are broken when building with clang: https://code.google.com/p/memcached/issues/detail?id=409 --- pkgs/servers/memcached/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 294cb003ab43..9d110d9c1461 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { homepage = http://memcached.org/; license = licenses.bsd3; maintainers = [ maintainers.coconnor ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } - From 8ba640d932d69a1c25d7a4906955d6780e7b24e4 Mon Sep 17 00:00:00 2001 From: Maxim Krivchikov Date: Thu, 24 Sep 2015 18:47:19 +0300 Subject: [PATCH 054/227] libmemcached: build on darwin (patch from homebrew) --- .../libraries/libmemcached/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libmemcached/default.nix b/pkgs/development/libraries/libmemcached/default.nix index 16196c9abc93..619aa0144976 100644 --- a/pkgs/development/libraries/libmemcached/default.nix +++ b/pkgs/development/libraries/libmemcached/default.nix @@ -1,17 +1,23 @@ -{ stdenv, fetchurl, cyrus_sasl, libevent }: +{ stdenv, fetchurl, fetchpatch, cyrus_sasl, libevent }: stdenv.mkDerivation rec { name = "libmemcached-1.0.18"; - + src = fetchurl { url = https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz; sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; }; - + # Fix linking against libpthread (patch from Fedora) # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 # https://bugs.launchpad.net/libmemcached/+bug/1281907 - patches = [ ./libmemcached-fix-linking-with-libpthread.patch ]; + # Fix building on OS X (patch from Homebrew) + # https://bugs.launchpad.net/libmemcached/+bug/1245562 + patches = stdenv.lib.optional stdenv.isLinux ./libmemcached-fix-linking-with-libpthread.patch + ++ stdenv.lib.optional stdenv.isDarwin (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; + sha256 = "1nvxwdkxj2a2g39z0g8byxjwnw4pa5xlvsmdk081q63vmfywh7zb"; + }); buildInputs = [ cyrus_sasl libevent ]; @@ -19,6 +25,6 @@ stdenv.mkDerivation rec { homepage = http://libmemcached.org; description = "Open source C/C++ client library and tools for the memcached server"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } From 5c4ad05f9655da667d6e6f0cd51aab6a5f31b3e0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:14:58 -0700 Subject: [PATCH 055/227] soxr: 0.1.1 -> 0.1.2 --- pkgs/applications/misc/audio/soxr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix index 084a95b962ad..135ae47aa846 100644 --- a/pkgs/applications/misc/audio/soxr/default.nix +++ b/pkgs/applications/misc/audio/soxr/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake }: stdenv.mkDerivation rec { - name = "soxr-0.1.1"; + name = "soxr-0.1.2"; src = fetchurl { url = "mirror://sourceforge/soxr/${name}-Source.tar.xz"; - sha256 = "1hmadwqfpg15vhwq9pa1sl5xslibrjpk6hpq2s9hfmx1s5l6ihfw"; + sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl"; }; preConfigure = if stdenv.isDarwin then '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src ''; - buildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ]; meta = { description = "An audio resampling library"; From de514ea33425d6087bb2465565930623773999ff Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:15:14 -0700 Subject: [PATCH 056/227] llvm2: 2.02.128 -> 2.02.132 --- pkgs/os-specific/linux/lvm2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 6ddbbc9340fe..0e6bf512aa26 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.128"; + version = "2.02.132"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "0a5m63b729ranbnmg964b36jlbfc140bs92di37w2gq54hzp1v97"; + sha256 = "0ac8izssflj371zzar16965zlia6a6zd97i0n00jxfxssnfa0fj1"; }; configureFlags = [ From 0f85ef398281bcaeafe41353f055477c268fc0dd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:15:24 -0700 Subject: [PATCH 057/227] unifi: 4.6.6 -> 4.7.5 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index b19ccd8db8de..5d0e7455d946 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "4.6.6"; + version = "4.7.5"; src = fetchurl { url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "0c9j5h4dyivfdic1y2q3nvhzajzagskzxyj7009icmy3fzgkv3y5"; + sha256 = "1d5jkpwnz4wvcjr5i73m8i5aah6rkxwd0r9239l90v1ja9lkyk7w"; }; buildInputs = [ unzip ]; From 83ac62eb5d19625338dea35dd63e4f684e0dca38 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 24 Sep 2015 16:33:57 -0700 Subject: [PATCH 058/227] pulseaudio: 6.0 -> 7.0 --- pkgs/servers/pulseaudio/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 86bcb3e1cec0..d1888e1928a9 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation rec { name = "${if libOnly then "lib" else ""}pulseaudio-${version}"; - version = "6.0"; + version = "7.0"; src = fetchurl { url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz"; - sha256 = "1xpnfxa0d8pgf6b4qdgnkcvrvdxbbbjd5ync19h0f5hbp3h401mm"; + sha256 = "1yp8x8z4wigrzik131kjdyhn7hznazvbkbp2zz1vy9l9gqvy26na"; }; patches = [ ./caps-fix.patch ]; @@ -88,6 +88,7 @@ stdenv.mkDerivation rec { [ "--localstatedir=/var" "--sysconfdir=/etc" "--with-access-group=audio" + "--with-bash-completion-dir=\${out}/share/bash-completions/completions" ] ++ lib.optional (jackaudioSupport && !libOnly) "--enable-jack" ++ lib.optional stdenv.isDarwin "--with-mac-sysroot=/" @@ -109,7 +110,7 @@ stdenv.mkDerivation rec { postInstall = lib.optionalString libOnly '' rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}} - sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-6.0.la + sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la ''; meta = { From 560674ae83defcb69965129a787191c30f934b29 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Wed, 23 Sep 2015 22:07:35 -0500 Subject: [PATCH 059/227] s6 2.1.3.0 -> 2.2.1.0 --- pkgs/servers/s6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix index 10d4520d9122..5e29c20339cf 100644 --- a/pkgs/servers/s6/default.nix +++ b/pkgs/servers/s6/default.nix @@ -2,7 +2,7 @@ let - version = "2.1.3.0"; + version = "2.2.1.0"; in stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ in stdenv.mkDerivation rec { src = fetchgit { url = "git://git.skarnet.org/s6"; rev = "refs/tags/v${version}"; - sha256 = "0dnwkdxqjv5awdgwxci1spcx1s13y5s9wd8ccskwv1rymvpgn8b3"; + sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9"; }; dontDisableStatic = true; From 71025243a12419a0bc519dcf998b66c6608e7f8f Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Wed, 23 Sep 2015 22:08:17 -0500 Subject: [PATCH 060/227] s6-portable-utils 2.0.5.0 -> 2.0.5.2 --- pkgs/tools/misc/s6-portable-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix index 2f0a647f3431..0ca0774989de 100644 --- a/pkgs/tools/misc/s6-portable-utils/default.nix +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -2,7 +2,7 @@ let - version = "2.0.5.0"; + version = "2.0.5.2"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; - sha256 = "099c7isi5vynis4iaiz362rvr73w4rvjhv3c2f7ddxgfyvd2331l"; + sha256 = "0d5dvqz61abr4m2n10by8hccvw51jdvyckvpbbq0c57viri54jzm"; }; dontDisableStatic = true; From dacc96be28eb5c821d701f8c2c8ba9cfb21f02ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 23 Sep 2015 17:19:28 +0200 Subject: [PATCH 061/227] hackage-packages.nix: update Haskell package set This update was generated by hackage2nix v20150922-6-g5d5ccfe using the following inputs: - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/eaa43c65b3dbe002880d1c823e636b471c9b70f3 - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/c048a402d3e71ab8d3af72799f148923d21ce661 - LTS Haskell: https://github.com/fpco/lts-haskell/commit/c7012a704b558556ca067861eb156f9916aa2afb - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a74568b5547db646674ce2771943ccba35e34129 --- .../haskell-modules/configuration-lts-0.0.nix | 6 + .../haskell-modules/configuration-lts-0.1.nix | 6 + .../haskell-modules/configuration-lts-0.2.nix | 6 + .../haskell-modules/configuration-lts-0.3.nix | 6 + .../haskell-modules/configuration-lts-0.4.nix | 6 + .../haskell-modules/configuration-lts-0.5.nix | 6 + .../haskell-modules/configuration-lts-0.6.nix | 6 + .../haskell-modules/configuration-lts-0.7.nix | 6 + .../haskell-modules/configuration-lts-1.0.nix | 6 + .../haskell-modules/configuration-lts-1.1.nix | 6 + .../configuration-lts-1.10.nix | 7 + .../configuration-lts-1.11.nix | 7 + .../configuration-lts-1.12.nix | 7 + .../configuration-lts-1.13.nix | 7 + .../configuration-lts-1.14.nix | 7 + .../configuration-lts-1.15.nix | 7 + .../haskell-modules/configuration-lts-1.2.nix | 6 + .../haskell-modules/configuration-lts-1.4.nix | 7 + .../haskell-modules/configuration-lts-1.5.nix | 7 + .../haskell-modules/configuration-lts-1.7.nix | 7 + .../haskell-modules/configuration-lts-1.8.nix | 7 + .../haskell-modules/configuration-lts-1.9.nix | 7 + .../haskell-modules/configuration-lts-2.0.nix | 8 + .../haskell-modules/configuration-lts-2.1.nix | 8 + .../configuration-lts-2.10.nix | 9 + .../configuration-lts-2.11.nix | 9 + .../configuration-lts-2.12.nix | 9 + .../configuration-lts-2.13.nix | 9 + .../configuration-lts-2.14.nix | 9 + .../configuration-lts-2.15.nix | 10 + .../configuration-lts-2.16.nix | 10 + .../configuration-lts-2.17.nix | 10 + .../configuration-lts-2.18.nix | 10 + .../configuration-lts-2.19.nix | 10 + .../haskell-modules/configuration-lts-2.2.nix | 8 + .../configuration-lts-2.20.nix | 10 + .../configuration-lts-2.21.nix | 10 + .../configuration-lts-2.22.nix | 10 + .../haskell-modules/configuration-lts-2.3.nix | 8 + .../haskell-modules/configuration-lts-2.4.nix | 8 + .../haskell-modules/configuration-lts-2.5.nix | 8 + .../haskell-modules/configuration-lts-2.6.nix | 9 + .../haskell-modules/configuration-lts-2.7.nix | 9 + .../haskell-modules/configuration-lts-2.8.nix | 9 + .../haskell-modules/configuration-lts-2.9.nix | 9 + .../haskell-modules/configuration-lts-3.0.nix | 21 + .../haskell-modules/configuration-lts-3.1.nix | 22 + .../haskell-modules/configuration-lts-3.2.nix | 22 + .../haskell-modules/configuration-lts-3.3.nix | 31 + .../haskell-modules/configuration-lts-3.4.nix | 31 + .../haskell-modules/configuration-lts-3.5.nix | 34 + .../haskell-modules/configuration-lts-3.6.nix | 36 + .../haskell-modules/hackage-packages.nix | 1171 ++++++++++++----- 53 files changed, 1358 insertions(+), 362 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix index d921561a7963..9c2a5ed9691b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2276,6 +2278,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3926,6 +3929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6094,6 +6098,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7304,6 +7309,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix index ab29b6397d7c..90d358e7e8a1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3925,6 +3928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6093,6 +6097,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7303,6 +7308,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix index 392daa1edf4f..a5d72fed900d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3925,6 +3928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6093,6 +6097,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7303,6 +7308,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix index 9c990e434307..d9b34f0dbde2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3925,6 +3928,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6093,6 +6097,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7303,6 +7308,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix index 9f7d29835d9a..dcffcfd61245 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_5"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3922,6 +3925,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6090,6 +6094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7298,6 +7303,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix index 6aaccab73b26..c1c48f8380b6 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2093,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2275,6 +2277,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_6"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3922,6 +3925,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6090,6 +6094,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7298,6 +7303,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix index c19a016642c4..62d922d21756 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2090,6 +2091,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2272,6 +2274,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_6"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3918,6 +3921,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6085,6 +6089,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7292,6 +7297,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix index 88d241d3341e..02f95e3a3739 100644 --- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix @@ -640,6 +640,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2090,6 +2091,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2272,6 +2274,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-numbers" = doDistribute super."crypto-numbers_0_2_3"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_6"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; @@ -3918,6 +3921,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6085,6 +6089,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_9"; @@ -7292,6 +7297,7 @@ self: super: assert super.ghc.name == "ghc-7.8.3"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix index 34b00b038466..3f4684f542ea 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix @@ -637,6 +637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2082,6 +2083,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2264,6 +2266,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_7"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-pubkey-types" = doDistribute super."crypto-pubkey-types_0_4_2_3"; @@ -3901,6 +3904,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6066,6 +6070,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7270,6 +7275,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix index db60388b0e60..f96e772d26db 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix @@ -637,6 +637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2078,6 +2079,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2259,6 +2261,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey" = doDistribute super."crypto-pubkey_0_2_7"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; @@ -3892,6 +3895,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6052,6 +6056,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7254,6 +7259,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix index ec11903b6da1..a5380c3a3c44 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2560,6 +2563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3877,6 +3881,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6020,6 +6025,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7218,6 +7224,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix index 963aec2889b3..29b57c83498a 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2560,6 +2563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3876,6 +3880,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6016,6 +6021,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7212,6 +7218,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix index 498828001830..60b6d40b7c58 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2560,6 +2563,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3875,6 +3879,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6015,6 +6020,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7210,6 +7216,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix index 549ca45a4c64..113ea14326aa 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2072,6 +2073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2253,6 +2255,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2559,6 +2562,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3873,6 +3877,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6012,6 +6017,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7207,6 +7213,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix index 9247ad53615a..c69491b6edbc 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix @@ -635,6 +635,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2070,6 +2071,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2251,6 +2253,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2556,6 +2559,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3869,6 +3873,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6005,6 +6010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7198,6 +7204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix index ea209b423263..78c4dee6dce8 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix @@ -634,6 +634,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2067,6 +2068,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2247,6 +2249,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2551,6 +2554,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3862,6 +3866,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5996,6 +6001,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7185,6 +7191,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix index 0a55c99859e2..f45d8387fce9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix @@ -637,6 +637,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2077,6 +2078,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2258,6 +2260,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -3889,6 +3892,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6048,6 +6052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7248,6 +7253,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix index e11a53d66a44..c7f3548ebb33 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2076,6 +2077,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2257,6 +2259,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2564,6 +2567,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3885,6 +3889,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6041,6 +6046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7241,6 +7247,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix index d287859de56a..a3221e8e3153 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2075,6 +2076,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2256,6 +2258,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2563,6 +2566,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3884,6 +3888,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6039,6 +6044,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7239,6 +7245,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix index 95d66b44ba59..caecbb3ba6d0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2074,6 +2075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2255,6 +2257,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2562,6 +2565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3883,6 +3887,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6032,6 +6037,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7232,6 +7238,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix index 547ba5112736..38d8175b9eb1 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2074,6 +2075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2255,6 +2257,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2562,6 +2565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3880,6 +3884,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6027,6 +6032,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7227,6 +7233,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix index d76e4898be91..ae4c546b77ba 100644 --- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix @@ -636,6 +636,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2074,6 +2075,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2255,6 +2257,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random" = doDistribute super."crypto-random_0_0_8"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; @@ -2562,6 +2565,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3879,6 +3883,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -6023,6 +6028,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyparse" = doDistribute super."polyparse_1_10"; @@ -7223,6 +7229,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix index 7ae2e87b2de9..7b6d12ce7b96 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2049,6 +2050,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2226,6 +2228,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2529,6 +2532,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3830,6 +3834,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5053,6 +5058,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5925,6 +5931,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7106,6 +7113,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix index f2d467b09b77..cb81e63cc6a9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2048,6 +2049,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2225,6 +2227,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2528,6 +2531,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3828,6 +3832,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5051,6 +5056,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5923,6 +5929,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7104,6 +7111,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix index 7e571832448a..6251ae42cb4f 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1334,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2032,6 +2034,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2207,6 +2210,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2508,6 +2512,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3798,6 +3803,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5004,6 +5010,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5867,6 +5874,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7031,6 +7039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix index ee4d3dff5a8f..e360af200b04 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1333,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2031,6 +2033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2206,6 +2209,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2507,6 +2511,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3795,6 +3800,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4997,6 +5003,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5858,6 +5865,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7020,6 +7028,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix index 6164b7f58a54..98a884196840 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1333,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2031,6 +2033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2206,6 +2209,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2507,6 +2511,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3795,6 +3800,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4997,6 +5003,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5858,6 +5865,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7019,6 +7027,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix index 0fbe54367a22..904c8a592c76 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1333,6 +1334,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2031,6 +2033,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2206,6 +2209,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2507,6 +2511,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3794,6 +3799,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4995,6 +5001,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5855,6 +5862,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7015,6 +7023,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix index 1085c9d1353f..b698ca9b988b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1332,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2030,6 +2032,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2205,6 +2208,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2506,6 +2510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3792,6 +3797,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4992,6 +4998,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5852,6 +5859,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7010,6 +7018,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix index 4a83050a9d13..df87e6beb8a3 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1332,6 +1333,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2030,6 +2032,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2205,6 +2208,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2506,6 +2510,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3789,6 +3794,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4989,6 +4995,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5728,6 +5735,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5845,6 +5853,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7002,6 +7011,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix index a7d090ec36a9..5804e6b51157 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix @@ -623,6 +623,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1330,6 +1331,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2027,6 +2029,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2201,6 +2204,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2501,6 +2505,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3779,6 +3784,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4978,6 +4984,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5716,6 +5723,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5833,6 +5841,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6988,6 +6997,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix index 631cf76ca529..ca5d663200b4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix @@ -623,6 +623,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1329,6 +1330,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2024,6 +2026,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2198,6 +2201,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2498,6 +2502,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3771,6 +3776,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4970,6 +4976,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5706,6 +5713,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5823,6 +5831,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6976,6 +6985,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix index 86cf33685bca..af4c80ca6788 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2019,6 +2021,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2193,6 +2196,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2493,6 +2497,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3763,6 +3768,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4962,6 +4968,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5696,6 +5703,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5812,6 +5820,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6964,6 +6973,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix index 71e429d0749e..5ed948039cab 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2019,6 +2021,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2193,6 +2196,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2493,6 +2497,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3762,6 +3767,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4961,6 +4967,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5693,6 +5700,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5809,6 +5817,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6959,6 +6968,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix index 516d30ac378e..afc3887349c9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2045,6 +2046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2222,6 +2224,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2525,6 +2528,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3824,6 +3828,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5047,6 +5052,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5918,6 +5924,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7099,6 +7106,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix index c2b00edaebbd..ca5a26d72154 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2018,6 +2020,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2190,6 +2193,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2490,6 +2494,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3757,6 +3762,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4956,6 +4962,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5688,6 +5695,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5803,6 +5811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6952,6 +6961,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix index 71bf24dcb036..54920ae4951c 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1327,6 +1328,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2017,6 +2019,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2189,6 +2192,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2489,6 +2493,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3755,6 +3760,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4953,6 +4959,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5685,6 +5692,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5798,6 +5806,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6945,6 +6954,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix index 73f903022f5f..5eec2c8256f9 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix @@ -622,6 +622,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1326,6 +1327,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2016,6 +2018,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2188,6 +2191,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2488,6 +2492,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3754,6 +3759,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4950,6 +4956,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5681,6 +5688,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "persistent-redis" = dontDistribute super."persistent-redis"; "persistent-refs" = dontDistribute super."persistent-refs"; "persistent-sqlite" = doDistribute super."persistent-sqlite_2_1_4_2"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5794,6 +5802,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -6941,6 +6950,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix index 5660aee1eed2..2cd7d80315a2 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2045,6 +2046,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2222,6 +2224,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2525,6 +2528,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3822,6 +3826,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5044,6 +5049,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5915,6 +5921,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7095,6 +7102,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix index 2dde8fb4a0e7..69c9268730e5 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2044,6 +2045,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2221,6 +2223,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2524,6 +2527,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3820,6 +3824,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5042,6 +5047,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5910,6 +5916,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7088,6 +7095,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix index 1302aaeebee6..d4b8e2153925 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -2044,6 +2045,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2220,6 +2222,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2522,6 +2525,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3818,6 +3822,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5039,6 +5044,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5907,6 +5913,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7084,6 +7091,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix index cb01a3ab2744..2c7523f006bf 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix @@ -627,6 +627,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1337,6 +1338,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2039,6 +2041,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2215,6 +2218,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2517,6 +2521,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3811,6 +3816,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5032,6 +5038,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5899,6 +5906,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7076,6 +7084,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix index 44648738255c..7f4e246beb7b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1335,6 +1336,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2037,6 +2039,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2213,6 +2216,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2515,6 +2519,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3809,6 +3814,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5030,6 +5036,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5897,6 +5904,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7074,6 +7082,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix index 1c0294f8e04c..8b868d8a092d 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1334,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2036,6 +2038,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2211,6 +2214,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2513,6 +2517,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3806,6 +3811,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5025,6 +5031,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5892,6 +5899,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7065,6 +7073,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix index 72761449f4c7..3630f0112ec0 100644 --- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix +++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix @@ -625,6 +625,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "MFlow" = doDistribute super."MFlow_0_4_5_9"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; @@ -1334,6 +1335,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "asil" = dontDistribute super."asil"; "asn1-data" = doDistribute super."asn1-data_0_7_1"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -2033,6 +2035,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata" = doDistribute super."compdata_0_9"; "compdata-automata" = dontDistribute super."compdata-automata"; @@ -2208,6 +2211,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2510,6 +2514,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3800,6 +3805,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -5016,6 +5022,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5880,6 +5887,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "poll" = dontDistribute super."poll"; "poly-arity" = dontDistribute super."poly-arity"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -7050,6 +7058,7 @@ self: super: assert super.ghc.name == "ghc-7.8.4"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix index a4a309a141e4..12ddb5dbd84b 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -605,6 +606,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1281,6 +1283,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1938,6 +1941,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2103,6 +2107,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2334,18 +2339,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2380,6 +2391,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3601,6 +3613,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4436,6 +4449,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4728,6 +4742,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5424,6 +5439,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5529,6 +5545,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_4_1"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5674,6 +5691,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5764,6 +5782,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6634,6 +6653,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6916,6 +6936,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; "tls" = doDistribute super."tls_1_3_1"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix index f4705ae236b4..d0194ab4c903 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -605,6 +606,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1279,6 +1281,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1935,6 +1938,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2100,6 +2104,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2331,18 +2336,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2377,6 +2388,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3594,6 +3606,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4429,6 +4442,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4720,6 +4734,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5415,6 +5430,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5519,6 +5535,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_4_1"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5664,6 +5681,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5754,6 +5772,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6623,6 +6642,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6905,6 +6925,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; "tls" = doDistribute super."tls_1_3_1"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7357,6 +7378,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix index a6b4ffa8b86b..4b05c6ffe953 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -602,6 +603,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1275,6 +1277,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1931,6 +1934,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2096,6 +2100,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2327,18 +2332,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2373,6 +2384,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3587,6 +3599,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4420,6 +4433,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4710,6 +4724,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5405,6 +5420,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5508,6 +5524,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5653,6 +5670,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5742,6 +5760,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6606,6 +6625,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6886,6 +6906,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; "tls" = doDistribute super."tls_1_3_1"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7336,6 +7357,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix index dac1d68ca467..23dfe503b050 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1273,6 +1275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1835,6 +1838,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1924,6 +1930,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2087,6 +2094,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2318,18 +2326,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2364,6 +2378,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3577,6 +3592,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4408,6 +4424,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4698,6 +4715,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5390,6 +5408,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5493,6 +5512,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5638,6 +5658,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5726,6 +5747,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6139,16 +6161,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6583,6 +6610,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6861,6 +6889,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7310,6 +7340,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix index 624c48a0542f..d080421d95d4 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1273,6 +1275,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_0"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1834,6 +1837,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_8"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1923,6 +1929,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2086,6 +2093,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2317,18 +2325,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_4"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2363,6 +2377,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3576,6 +3591,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4407,6 +4423,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4697,6 +4714,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5388,6 +5406,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5491,6 +5510,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "poll" = dontDistribute super."poll"; "poly-arity" = doDistribute super."poly-arity_0_0_5"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5636,6 +5656,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5724,6 +5745,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6136,16 +6158,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "serversession-backend-acid-state" = doDistribute super."serversession-backend-acid-state_1_0_1"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; @@ -6578,6 +6605,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6856,6 +6884,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7304,6 +7334,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix index 69854c8a3abb..8b4aee0bc1ed 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1271,6 +1273,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1831,6 +1834,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_10"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1920,6 +1926,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2082,6 +2089,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2313,18 +2321,24 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_5"; "diagrams-core" = doDistribute super."diagrams-core_1_3_0_2"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2359,6 +2373,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3568,6 +3583,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -4394,6 +4410,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4683,6 +4700,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5371,6 +5389,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5472,6 +5491,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "polimorf" = dontDistribute super."polimorf"; "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5615,6 +5635,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5703,6 +5724,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -6114,16 +6136,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; @@ -6436,6 +6463,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "stable-maps" = dontDistribute super."stable-maps"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_4_1"; "stack-prism" = dontDistribute super."stack-prism"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -6553,6 +6581,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6827,6 +6856,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7274,6 +7305,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; @@ -7350,7 +7382,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "x-dsp" = dontDistribute super."x-dsp"; "x11-xim" = dontDistribute super."x11-xim"; "x11-xinput" = dontDistribute super."x11-xinput"; + "x509" = doDistribute super."x509_1_6_1"; "x509-util" = dontDistribute super."x509-util"; + "x509-validation" = doDistribute super."x509-validation_1_6_2"; "xattr" = dontDistribute super."xattr"; "xbattbar" = dontDistribute super."xbattbar"; "xcb-types" = dontDistribute super."xcb-types"; diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix index f4b25c6283c3..13a5d10c6c17 100644 --- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix +++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix @@ -122,6 +122,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "BitSyntax" = dontDistribute super."BitSyntax"; "Bitly" = dontDistribute super."Bitly"; "Blobs" = dontDistribute super."Blobs"; + "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1"; "BluePrintCSS" = dontDistribute super."BluePrintCSS"; "Blueprint" = dontDistribute super."Blueprint"; "Bookshelf" = dontDistribute super."Bookshelf"; @@ -601,6 +602,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "MFlow" = dontDistribute super."MFlow"; "MHask" = dontDistribute super."MHask"; "MSQueue" = dontDistribute super."MSQueue"; + "MTGBuilder" = dontDistribute super."MTGBuilder"; "MagicHaskeller" = dontDistribute super."MagicHaskeller"; "MailchimpSimple" = dontDistribute super."MailchimpSimple"; "MaybeT" = dontDistribute super."MaybeT"; @@ -1269,6 +1271,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "asil" = dontDistribute super."asil"; "asn1-data" = dontDistribute super."asn1-data"; "asn1-encoding" = doDistribute super."asn1-encoding_0_9_2"; + "asn1-parse" = doDistribute super."asn1-parse_0_9_1"; "asn1-types" = doDistribute super."asn1-types_0_3_0"; "asn1dump" = dontDistribute super."asn1dump"; "assembler" = dontDistribute super."assembler"; @@ -1827,6 +1830,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "clash-vhdl" = doDistribute super."clash-vhdl_0_5_11"; "classify" = dontDistribute super."classify"; "classy-parallel" = dontDistribute super."classy-parallel"; + "classy-prelude" = doDistribute super."classy-prelude_0_12_3"; + "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_3"; + "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_3"; "clckwrks" = dontDistribute super."clckwrks"; "clckwrks-cli" = dontDistribute super."clckwrks-cli"; "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; @@ -1916,6 +1922,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "compact-socket" = dontDistribute super."compact-socket"; "compact-string" = dontDistribute super."compact-string"; "compact-string-fix" = dontDistribute super."compact-string-fix"; + "compactmap" = dontDistribute super."compactmap"; "compare-type" = dontDistribute super."compare-type"; "compdata-automata" = dontDistribute super."compdata-automata"; "compdata-dags" = dontDistribute super."compdata-dags"; @@ -2078,6 +2085,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; "crypto-classical" = dontDistribute super."crypto-classical"; "crypto-conduit" = dontDistribute super."crypto-conduit"; + "crypto-enigma" = dontDistribute super."crypto-enigma"; "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; "crypto-random-effect" = dontDistribute super."crypto-random-effect"; "crypto-totp" = dontDistribute super."crypto-totp"; @@ -2309,15 +2317,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "dgs" = dontDistribute super."dgs"; "dia-base" = dontDistribute super."dia-base"; "dia-functions" = dontDistribute super."dia-functions"; + "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1"; "diagrams-canvas" = dontDistribute super."diagrams-canvas"; "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; "diagrams-gtk" = dontDistribute super."diagrams-gtk"; + "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6"; "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; + "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_2"; "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; "diagrams-pdf" = dontDistribute super."diagrams-pdf"; "diagrams-pgf" = dontDistribute super."diagrams-pgf"; + "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2"; "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; + "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3"; "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; + "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4"; "diagrams-tikz" = dontDistribute super."diagrams-tikz"; "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; "dicom" = dontDistribute super."dicom"; @@ -2352,6 +2366,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "direct-http" = dontDistribute super."direct-http"; "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; "direct-plugins" = dontDistribute super."direct-plugins"; + "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15"; "directed-cubical" = dontDistribute super."directed-cubical"; "directory-layout" = dontDistribute super."directory-layout"; "dirfiles" = dontDistribute super."dirfiles"; @@ -3553,6 +3568,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "hgl-example" = dontDistribute super."hgl-example"; "hgom" = dontDistribute super."hgom"; "hgopher" = dontDistribute super."hgopher"; + "hgrev" = dontDistribute super."hgrev"; "hgrib" = dontDistribute super."hgrib"; "hharp" = dontDistribute super."hharp"; "hi" = dontDistribute super."hi"; @@ -3939,6 +3955,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "htsn-import" = dontDistribute super."htsn-import"; "http-accept" = dontDistribute super."http-accept"; "http-attoparsec" = dontDistribute super."http-attoparsec"; + "http-client" = doDistribute super."http-client_0_4_23"; "http-client-auth" = dontDistribute super."http-client-auth"; "http-client-conduit" = dontDistribute super."http-client-conduit"; "http-client-lens" = dontDistribute super."http-client-lens"; @@ -4373,6 +4390,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "language-boogie" = dontDistribute super."language-boogie"; "language-c-comments" = dontDistribute super."language-c-comments"; "language-c-inline" = dontDistribute super."language-c-inline"; + "language-c-quote" = doDistribute super."language-c-quote_0_11"; "language-cil" = dontDistribute super."language-cil"; "language-css" = dontDistribute super."language-css"; "language-dot" = dontDistribute super."language-dot"; @@ -4660,6 +4678,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "make-hard-links" = dontDistribute super."make-hard-links"; "make-package" = dontDistribute super."make-package"; "makedo" = dontDistribute super."makedo"; + "managed" = doDistribute super."managed_1_0_0"; "manatee" = dontDistribute super."manatee"; "manatee-all" = dontDistribute super."manatee-all"; "manatee-anything" = dontDistribute super."manatee-anything"; @@ -5345,6 +5364,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "persistent-protobuf" = dontDistribute super."persistent-protobuf"; "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; "persistent-redis" = dontDistribute super."persistent-redis"; + "persistent-template" = doDistribute super."persistent-template_2_1_3_4"; "persistent-vector" = dontDistribute super."persistent-vector"; "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; "persona" = dontDistribute super."persona"; @@ -5445,6 +5465,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "polimorf" = dontDistribute super."polimorf"; "poll" = dontDistribute super."poll"; "polyToMonoid" = dontDistribute super."polyToMonoid"; + "polymap" = dontDistribute super."polymap"; "polynomial" = dontDistribute super."polynomial"; "polynomials-bernstein" = dontDistribute super."polynomials-bernstein"; "polyseq" = dontDistribute super."polyseq"; @@ -5586,6 +5607,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "pseudo-boolean" = dontDistribute super."pseudo-boolean"; "pseudo-trie" = dontDistribute super."pseudo-trie"; "pseudomacros" = dontDistribute super."pseudomacros"; + "psqueues" = doDistribute super."psqueues_0_2_0_2"; "pub" = dontDistribute super."pub"; "publicsuffix" = dontDistribute super."publicsuffix"; "publicsuffixlist" = dontDistribute super."publicsuffixlist"; @@ -5674,6 +5696,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "rados-haskell" = dontDistribute super."rados-haskell"; "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; "rainbow-tests" = dontDistribute super."rainbow-tests"; + "rainbox" = doDistribute super."rainbox_0_18_0_2"; "rake" = dontDistribute super."rake"; "rakhana" = dontDistribute super."rakhana"; "ralist" = dontDistribute super."ralist"; @@ -5863,6 +5886,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "resource-simple" = dontDistribute super."resource-simple"; "respond" = dontDistribute super."respond"; "rest-example" = dontDistribute super."rest-example"; + "rest-gen" = doDistribute super."rest-gen_0_17_1_3"; "restful-snap" = dontDistribute super."restful-snap"; "restricted-workers" = dontDistribute super."restricted-workers"; "restyle" = dontDistribute super."restyle"; @@ -6084,16 +6108,21 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "serial" = dontDistribute super."serial"; "serial-test-generators" = dontDistribute super."serial-test-generators"; "serialport" = dontDistribute super."serialport"; + "servant" = doDistribute super."servant_0_4_4_2"; "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0"; "servant-blaze" = dontDistribute super."servant-blaze"; + "servant-client" = doDistribute super."servant-client_0_4_4_2"; + "servant-docs" = doDistribute super."servant-docs_0_4_4_2"; "servant-ede" = dontDistribute super."servant-ede"; "servant-examples" = dontDistribute super."servant-examples"; + "servant-jquery" = doDistribute super."servant-jquery_0_4_4_2"; "servant-lucid" = dontDistribute super."servant-lucid"; "servant-mock" = dontDistribute super."servant-mock"; "servant-pool" = dontDistribute super."servant-pool"; "servant-postgresql" = dontDistribute super."servant-postgresql"; "servant-response" = dontDistribute super."servant-response"; "servant-scotty" = dontDistribute super."servant-scotty"; + "servant-server" = doDistribute super."servant-server_0_4_4_2"; "servius" = dontDistribute super."servius"; "ses-html" = dontDistribute super."ses-html"; "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; @@ -6405,6 +6434,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "stable-maps" = dontDistribute super."stable-maps"; "stable-memo" = dontDistribute super."stable-memo"; "stable-tree" = dontDistribute super."stable-tree"; + "stack" = doDistribute super."stack_0_1_4_1"; "stack-prism" = dontDistribute super."stack-prism"; "stackage-curator" = dontDistribute super."stackage-curator"; "standalone-haddock" = dontDistribute super."standalone-haddock"; @@ -6522,6 +6552,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "sunroof-compiler" = dontDistribute super."sunroof-compiler"; "sunroof-examples" = dontDistribute super."sunroof-examples"; "sunroof-server" = dontDistribute super."sunroof-server"; + "super-user-spark" = dontDistribute super."super-user-spark"; "supercollider-ht" = dontDistribute super."supercollider-ht"; "supercollider-midi" = dontDistribute super."supercollider-midi"; "superdoc" = dontDistribute super."superdoc"; @@ -6796,6 +6827,8 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "tkhs" = dontDistribute super."tkhs"; "tkyprof" = dontDistribute super."tkyprof"; "tld" = dontDistribute super."tld"; + "tls" = doDistribute super."tls_1_3_2"; + "tls-debug" = doDistribute super."tls-debug_0_4_0"; "tls-extra" = dontDistribute super."tls-extra"; "tmpl" = dontDistribute super."tmpl"; "tn" = dontDistribute super."tn"; @@ -7239,6 +7272,7 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "webcrank" = dontDistribute super."webcrank"; "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; "webcrank-wai" = dontDistribute super."webcrank-wai"; + "webdriver" = doDistribute super."webdriver_0_6_2_1"; "webdriver-snoy" = dontDistribute super."webdriver-snoy"; "webidl" = dontDistribute super."webidl"; "webify" = dontDistribute super."webify"; @@ -7315,7 +7349,9 @@ self: super: assert super.ghc.name == "ghc-7.10.2"; { "x-dsp" = dontDistribute super."x-dsp"; "x11-xim" = dontDistribute super."x11-xim"; "x11-xinput" = dontDistribute super."x11-xinput"; + "x509" = doDistribute super."x509_1_6_1"; "x509-util" = dontDistribute super."x509-util"; + "x509-validation" = doDistribute super."x509-validation_1_6_2"; "xattr" = dontDistribute super."xattr"; "xbattbar" = dontDistribute super."xbattbar"; "xcb-types" = dontDistribute super."xcb-types"; diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 01cc139665a6..d91f8153e20c 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -461,6 +461,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding for the OpenAL Utility Toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freealut;}; "AMI" = callPackage @@ -1666,7 +1667,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "BlogLiterately" = callPackage + "BlogLiterately_0_8_1_1" = callPackage ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs , containers, data-default, directory, filepath, HaXml, haxr , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc @@ -1689,9 +1690,10 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "BlogLiterately_0_8_1_2" = callPackage + "BlogLiterately" = callPackage ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs , containers, data-default, directory, filepath, HaXml, haxr , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc @@ -1714,7 +1716,6 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams_0_1_4_3" = callPackage @@ -5137,6 +5138,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTGL-bytestring" = callPackage @@ -5153,6 +5155,7 @@ self: { librarySystemDepends = [ ftgl ]; description = "Portable TrueType font rendering for OpenGL using the Freetype2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) ftgl;}; "FTPLine" = callPackage @@ -6125,8 +6128,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.0.2"; - sha256 = "e84c2c8eaa22b87277ce700972989b249825fe21a439bebc727e3e90ac7b9378"; + version = "2.1"; + sha256 = "610f42cc26b6bffc168df9f681e532aea4f6cb94c6b705a512cd2a0f23186d17"; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear transformers @@ -6174,8 +6177,8 @@ self: { ({ mkDerivation, base, GLFW-b, GPipe, transformers }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.0"; - sha256 = "1d5fbf132f11a5378d19ac31361a0783d0e3dd4324809df4fa0fbabcdbb34b5c"; + version = "1.1"; + sha256 = "23905c46a7894ce2cb2ab66d02ccdb70324e4e4aae9f45b2ce748ef5a94a3c1a"; libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; @@ -6271,8 +6274,8 @@ self: { ({ mkDerivation, array, base, directory, random, wx, wxcore }: mkDerivation { pname = "GeBoP"; - version = "1.7.4.1"; - sha256 = "c5f5ae69613026e6666f753b94d0440f97ffd6df2c87aba1a7545c2366968d32"; + version = "1.7.5"; + sha256 = "fdf0a97c6c81fbb88973e20167535959bbe0e781af69380ec1c44dc78b665093"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -7251,6 +7254,7 @@ self: { homepage = "https://github.com/m15k/hfuse"; description = "HFuse is a binding for the Linux FUSE library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) fuse;}; "HGL" = callPackage @@ -7927,6 +7931,7 @@ self: { executablePkgconfigDepends = [ opencv ]; description = "A binding for the OpenCV computer vision library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) opencv;}; "HPDF" = callPackage @@ -11743,6 +11748,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "MTGBuilder" = callPackage + ({ mkDerivation, base, containers, mtl, parsec }: + mkDerivation { + pname = "MTGBuilder"; + version = "0.1.0.2"; + sha256 = "a676309a7f5a6f6797c3edb8f9fbf8b1f7b17f38d3be68011b24827629ba63ed"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base containers mtl parsec ]; + description = "Builds decks out of a meta"; + license = stdenv.lib.licenses.mit; + }) {}; + "MagicHaskeller" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , ghc, ghc-paths, haskell-src, html, mtl, network, old-time, pretty @@ -13352,6 +13370,7 @@ self: { homepage = "https://github.com/haskell-openal/ALUT"; description = "A binding to the OpenAL cross-platform 3D audio API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "OpenCL" = callPackage @@ -14211,6 +14230,7 @@ self: { homepage = "http://haskell.org/haskellwiki/PortMidi"; description = "A binding for PortMedia/PortMidi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "PostgreSQL" = callPackage @@ -14888,6 +14908,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" ]; }) {}; "Random123" = callPackage @@ -15443,6 +15464,7 @@ self: { libraryHaskellDepends = [ base SDL ]; description = "Binding to libSDL_mixer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "SDL-mpeg" = callPackage @@ -17899,20 +17921,19 @@ self: { ({ mkDerivation, aeson, base, bimap, bytestring, containers, curl , curlhs, directory, failure, filepath, mtl, optparse-applicative , parsec, pretty-show, regexpr, safe, split, tagsoup - , tagsoup-parsec, template-haskell, text, time, transformers - , utf8-string, vector + , template-haskell, text, time, transformers, utf8-string, vector }: mkDerivation { pname = "VKHS"; - version = "0.5.4"; - sha256 = "ef7ebc7432cb5954f1f63cc458e8c6401422ecbfdff61cb9a6170785abe94118"; + version = "0.5.5"; + sha256 = "7c7e8d1b89c2fb53f8c382939f49249ee13a188c21907bcd4cebc9b21e01948d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bimap bytestring containers curlhs directory failure filepath mtl optparse-applicative parsec pretty-show regexpr safe - split tagsoup tagsoup-parsec template-haskell text time - transformers utf8-string vector + split tagsoup template-haskell text time transformers utf8-string + vector ]; executableSystemDepends = [ curl ]; homepage = "http://github.com/grwlf/vkhs"; @@ -21601,6 +21622,7 @@ self: { homepage = "http://github.com/phaazon/al"; description = "OpenAL 1.1 raw API."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) openal;}; "alarmclock_0_2_0_5" = callPackage @@ -22010,6 +22032,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (Exceptions)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-gui" = callPackage @@ -22029,6 +22052,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "alsa-midi" = callPackage @@ -22065,6 +22089,7 @@ self: { homepage = "https://github.com/ttuegel/alsa-mixer"; description = "Bindings to the ALSA simple mixer API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm" = callPackage @@ -22085,6 +22110,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (PCM audio)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-pcm-tests" = callPackage @@ -22120,6 +22146,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API (MIDI sequencer)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "alsa-seq-tests" = callPackage @@ -27013,35 +27040,6 @@ self: { }) {inherit (pkgs.xorg) libXScrnSaver;}; "arbtt" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 - }: - mkDerivation { - pname = "arbtt"; - version = "0.9.0.6"; - sha256 = "f5f066f471761ed48388b3a80beff4ae3deaa7845666a513fa30dadf7dc4d5ad"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 - ]; - executableSystemDepends = [ libXScrnSaver ]; - testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec - pcre-light process-extras tasty tasty-golden tasty-hunit time - transformers unix utf8-string - ]; - homepage = "http://arbtt.nomeata.de/"; - description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; - }) {inherit (pkgs.xorg) libXScrnSaver;}; - - "arbtt_0_9_0_7" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty @@ -27068,7 +27066,6 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage @@ -27891,7 +27888,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-parse" = callPackage + "asn1-parse_0_9_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring, mtl }: mkDerivation { @@ -27904,9 +27901,10 @@ self: { homepage = "https://github.com/vincenthz/hs-asn1"; description = "Simple monadic parser for ASN1 stream types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asn1-parse_0_9_4" = callPackage + "asn1-parse" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring }: mkDerivation { pname = "asn1-parse"; @@ -27918,7 +27916,6 @@ self: { homepage = "https://github.com/vincenthz/hs-asn1"; description = "Simple monadic parser for ASN1 stream types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "asn1-types_0_3_0" = callPackage @@ -32714,6 +32711,7 @@ self: { libraryPkgconfigDepends = [ directfb ]; description = "Low level bindings to DirectFB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) directfb;}; "bindings-eskit" = callPackage @@ -33010,6 +33008,7 @@ self: { homepage = "https://github.com/fizruk/bindings-lxc"; description = "Direct Haskell bindings to LXC (Linux containers) C API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) lxc;}; "bindings-mmap" = callPackage @@ -33145,6 +33144,7 @@ self: { homepage = "http://floss.scru.org/bindings-sane"; description = "FFI bindings to libsane"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) saneBackends;}; "bindings-sc3" = callPackage @@ -37093,40 +37093,6 @@ self: { }) {}; "cabal-debian" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal - , containers, data-default, debian, deepseq, Diff, directory - , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl - , network-uri, newtype-generics, optparse-applicative, parsec - , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix - , Unixutils, utf8-string - }: - mkDerivation { - pname = "cabal-debian"; - version = "4.31.4"; - sha256 = "f700f3fef9d6ec3e95468cfe65c7b77b4ec560668ec876aeed01d833804c18bd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base bifunctors Cabal containers data-default debian - deepseq Diff directory exceptions filepath hsemail HUnit lens - memoize mtl network-uri newtype-generics optparse-applicative - parsec pretty process pureMD5 regex-tdfa set-extra syb text unix - Unixutils utf8-string - ]; - executableHaskellDepends = [ - base Cabal debian lens mtl pretty Unixutils - ]; - testHaskellDepends = [ - base Cabal containers debian Diff directory filepath hsemail HUnit - lens pretty process text - ]; - doCheck = false; - homepage = "https://github.com/ddssff/cabal-debian"; - description = "Create a Debianization for a Cabal package"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "cabal-debian_4_31_6" = callPackage ({ mkDerivation, ansi-wl-pprint, base, bifunctors, bytestring , bzlib, Cabal, containers, data-default, deepseq, Diff, directory , exceptions, filepath, HaXml, hsemail, HUnit, lens, ListLike @@ -37156,10 +37122,10 @@ self: { base Cabal containers Diff directory filepath hsemail HUnit lens pretty process text ]; + doCheck = false; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -38989,8 +38955,8 @@ self: { }: mkDerivation { pname = "casadi-bindings"; - version = "2.3.0.1"; - sha256 = "98c0c4c823753eb64cb4d11a0850fdb5c30e2e3dd17f689f642eabcf292126a8"; + version = "2.4.1.0"; + sha256 = "a7c0cfdf11abca898a0aa6ecd2258311a3b29f68063a1aaf971aa3dcab4b0a68"; libraryHaskellDepends = [ base binary casadi-bindings-core casadi-bindings-internal cereal containers linear vector vector-binary-instances @@ -39021,12 +38987,16 @@ self: { }) {casadi_control = null;}; "casadi-bindings-core" = callPackage - ({ mkDerivation, base, casadi, casadi-bindings-internal, vector }: + ({ mkDerivation, base, casadi, casadi-bindings-internal, containers + , vector + }: mkDerivation { pname = "casadi-bindings-core"; - version = "2.3.0.1"; - sha256 = "a770ccd0491f1d0eab06bd03b36115122a781e4106906a8489d18d85d7a8ff29"; - libraryHaskellDepends = [ base casadi-bindings-internal vector ]; + version = "2.4.1.0"; + sha256 = "f35fdfc2d8d33c5455d3e7dccce341332c0620db0445f99386f1e7920e053b6c"; + libraryHaskellDepends = [ + base casadi-bindings-internal containers vector + ]; libraryPkgconfigDepends = [ casadi ]; description = "autogenerated low level bindings to casadi"; license = stdenv.lib.licenses.gpl3; @@ -39034,12 +39004,12 @@ self: { }) {casadi = null;}; "casadi-bindings-internal" = callPackage - ({ mkDerivation, base, casadi, vector }: + ({ mkDerivation, base, casadi, containers, vector }: mkDerivation { pname = "casadi-bindings-internal"; - version = "0.1.3.0"; - sha256 = "00b8ba1df8dd1cb2facc4ca4685cd4687c2af60b3ed8369fa1abf97b3bf25fcd"; - libraryHaskellDepends = [ base vector ]; + version = "0.1.3.1"; + sha256 = "7170eebb779a1e0dc18dc26edd55e7136978a1e24624c9953ddc5aee60f1e3a0"; + libraryHaskellDepends = [ base containers vector ]; libraryPkgconfigDepends = [ casadi ]; homepage = "http://github.com/ghorn/casadi-bindings"; description = "low level bindings to CasADi"; @@ -40445,23 +40415,25 @@ self: { }) {}; "chatter" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , deepseq, directory, filepath, fullstop, HUnit, mbox, MonadRandom - , parsec, QuickCheck, quickcheck-instances, random-shuffle - , regex-tdfa, regex-tdfa-text, tasty, tasty-ant-xml, tasty-hunit - , tasty-quickcheck, text, tokenize, transformers, zlib + ({ mkDerivation, array, base, bytestring, cereal, cereal-text + , containers, deepseq, directory, filepath, fullstop, hashable + , HUnit, mbox, MonadRandom, parsec, QuickCheck + , quickcheck-instances, random-shuffle, regex-tdfa, regex-tdfa-text + , tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck, text + , tokenize, transformers, unordered-containers, zlib }: mkDerivation { pname = "chatter"; - version = "0.5.2.0"; - sha256 = "1af1be554513a4fbbcdf385fba89b78cfc977575228423f2c62fce112e27a904"; + version = "0.6.0.0"; + sha256 = "71e2b8df7d7ecc0d771077f130b27460e982594491b39812ce2cd210fafb5e6f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring cereal containers deepseq directory filepath - fullstop mbox MonadRandom parsec QuickCheck quickcheck-instances - random-shuffle regex-tdfa regex-tdfa-text text tokenize - transformers zlib + array base bytestring cereal cereal-text containers deepseq + directory filepath fullstop hashable mbox MonadRandom parsec + QuickCheck quickcheck-instances random-shuffle regex-tdfa + regex-tdfa-text text tokenize transformers unordered-containers + zlib ]; executableHaskellDepends = [ base bytestring cereal containers filepath text @@ -41362,6 +41334,8 @@ self: { pname = "clafer"; version = "0.4.1"; sha256 = "e3015519a90073e986ed67ba753384b536d9d02652c34aa1195adb6f7e12c0d0"; + revision = "1"; + editedCabalFile = "177981f500b77d9bf9b941da7693d895357d4a7cc1181e4ca85561ca5d2e0f1c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -42171,7 +42145,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude" = callPackage + "classy-prelude_0_12_3" = callPackage ({ mkDerivation, base, basic-prelude, bifunctors, bytestring , chunked-data, containers, dlist, enclosed-exceptions, exceptions , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl @@ -42196,6 +42170,34 @@ self: { homepage = "https://github.com/snoyberg/classy-prelude"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude" = callPackage + ({ mkDerivation, base, basic-prelude, bifunctors, bytestring + , chunked-data, containers, dlist, enclosed-exceptions, exceptions + , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl + , mutable-containers, primitive, QuickCheck, semigroups, stm, text + , time, time-locale-compat, transformers, unordered-containers + , vector, vector-instances + }: + mkDerivation { + pname = "classy-prelude"; + version = "0.12.4"; + sha256 = "503064f5574a7786c860395d4c22676e2339021d311daeb327795e35a98fa43b"; + libraryHaskellDepends = [ + base basic-prelude bifunctors bytestring chunked-data containers + dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base + mono-traversable mtl mutable-containers primitive semigroups stm + text time time-locale-compat transformers unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + base containers hspec QuickCheck transformers unordered-containers + ]; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "A typeclass-based Prelude"; + license = stdenv.lib.licenses.mit; }) {}; "classy-prelude-conduit_0_10_2" = callPackage @@ -42340,7 +42342,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-conduit" = callPackage + "classy-prelude-conduit_0_12_3" = callPackage ({ mkDerivation, base, bytestring, classy-prelude, conduit , conduit-combinators, hspec, monad-control, QuickCheck, resourcet , transformers, void @@ -42356,6 +42358,29 @@ self: { testHaskellDepends = [ base bytestring conduit hspec QuickCheck transformers ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "conduit instances for classy-prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-conduit" = callPackage + ({ mkDerivation, base, bytestring, classy-prelude, conduit + , conduit-combinators, hspec, monad-control, QuickCheck, resourcet + , transformers, void + }: + mkDerivation { + pname = "classy-prelude-conduit"; + version = "0.12.4"; + sha256 = "71878fa293f8276c9989f889b73de24777e147183279c733351d32e9a784da61"; + libraryHaskellDepends = [ + base bytestring classy-prelude conduit conduit-combinators + monad-control resourcet transformers void + ]; + testHaskellDepends = [ + base bytestring conduit hspec QuickCheck transformers + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "conduit instances for classy-prelude"; license = stdenv.lib.licenses.mit; @@ -42487,7 +42512,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "classy-prelude-yesod" = callPackage + "classy-prelude-yesod_0_12_3" = callPackage ({ mkDerivation, aeson, base, classy-prelude , classy-prelude-conduit, data-default, http-conduit, http-types , persistent, yesod, yesod-newsfeed, yesod-static @@ -42501,6 +42526,27 @@ self: { http-conduit http-types persistent yesod yesod-newsfeed yesod-static ]; + jailbreak = true; + homepage = "https://github.com/snoyberg/classy-prelude"; + description = "Provide a classy prelude including common Yesod functionality"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "classy-prelude-yesod" = callPackage + ({ mkDerivation, aeson, base, classy-prelude + , classy-prelude-conduit, data-default, http-conduit, http-types + , persistent, yesod, yesod-newsfeed, yesod-static + }: + mkDerivation { + pname = "classy-prelude-yesod"; + version = "0.12.4"; + sha256 = "6c434a6524206849ee11657b14d0350961c63be1b8260d50abec09e2a8da675f"; + libraryHaskellDepends = [ + aeson base classy-prelude classy-prelude-conduit data-default + http-conduit http-types persistent yesod yesod-newsfeed + yesod-static + ]; homepage = "https://github.com/snoyberg/classy-prelude"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; @@ -44023,13 +44069,13 @@ self: { ({ mkDerivation, array, base, containers, random, transformers }: mkDerivation { pname = "combinat"; - version = "0.2.7.0"; - sha256 = "5f4ac7bc353888231472f2d95c7dc35eb2704b2cdae3ca456ef53d0de62d90e5"; + version = "0.2.7.1"; + sha256 = "690588b4cbfb9d92053fed70be71732bcb2b43b3cb091a0209565ec7d3d766f8"; libraryHaskellDepends = [ array base containers random transformers ]; homepage = "http://code.haskell.org/~bkomuves/"; - description = "Generation of various combinatorial objects"; + description = "Generate and manipulate various combinatorial objects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -44485,6 +44531,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "compactmap" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, vector }: + mkDerivation { + pname = "compactmap"; + version = "0.1.1"; + sha256 = "da3304bb30ef354d10c731589ac8c3086b91d2fe72fb1828ed17ce02de85c192"; + revision = "1"; + editedCabalFile = "a303fff361ce77f12115c193fd2fa82e9ebcc1c12e2c99977e540b2841e10cf8"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "A read-only memory-efficient key-value store"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "compare-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -47850,13 +47910,13 @@ self: { }) {}; "coverage" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: + ({ mkDerivation, base, hspec, HUnit, QuickCheck }: mkDerivation { pname = "coverage"; - version = "0.1.0.2"; - sha256 = "ba99dccf43de1021322a870e03fc74b9a46bc5bdffde302859f19870065e6df0"; + version = "0.1.0.3"; + sha256 = "2ea9ea4f529fb99fde5d47814cf0ccf0450c70e03bbfb8275ce30a51f9f72830"; libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; + testHaskellDepends = [ base hspec HUnit QuickCheck ]; jailbreak = true; homepage = "https://github.com/nicodelpiano/coverage"; description = "Exhaustivity Checking Library"; @@ -48981,6 +49041,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "crypto-enigma" = callPackage + ({ mkDerivation, base, containers, MissingH, split }: + mkDerivation { + pname = "crypto-enigma"; + version = "0.0.1.3"; + sha256 = "aba1a8fed1636faa3ff89cbe8114ecc399f6f28985fcb2f3327731dc1e907bc3"; + libraryHaskellDepends = [ base containers MissingH split ]; + description = "An Enigma machine simulator with display"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "crypto-numbers_0_2_3" = callPackage ({ mkDerivation, base, byteable, bytestring, crypto-random, HUnit , QuickCheck, test-framework, test-framework-hunit @@ -50198,6 +50269,7 @@ self: { ]; description = "Functional Combinators for Computer Vision"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "cyclotomic" = callPackage @@ -52728,35 +52800,6 @@ self: { }) {}; "debian" = callPackage - ({ mkDerivation, base, bytestring, bzlib, containers, directory - , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl - , network, network-uri, old-locale, parsec, pretty, process - , process-extras, pureMD5, regex-compat, regex-tdfa - , template-haskell, text, time, unix, Unixutils, utf8-string, zlib - }: - mkDerivation { - pname = "debian"; - version = "3.88.1"; - sha256 = "89451e4c95f798f887edace812ed6bd7418e771dd79097eafb6a1f2015a03ed9"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring bzlib containers directory either exceptions - filepath HaXml HUnit ListLike mtl network network-uri old-locale - parsec pretty process process-extras pureMD5 regex-compat - regex-tdfa template-haskell text time unix Unixutils utf8-string - zlib - ]; - executableHaskellDepends = [ - base directory filepath HaXml pretty process unix - ]; - testHaskellDepends = [ base HUnit parsec pretty regex-tdfa text ]; - homepage = "https://github.com/ddssff/debian-haskell"; - description = "Modules for working with the Debian package system"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "debian_3_89" = callPackage ({ mkDerivation, base, bytestring, bzlib, containers, directory , either, exceptions, filepath, HaXml, HUnit, ListLike, mtl , network, network-uri, old-locale, parsec, pretty, process @@ -52783,7 +52826,6 @@ self: { homepage = "https://github.com/ddssff/debian-haskell"; description = "Modules for working with the Debian package system"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "debian-binary" = callPackage @@ -52805,8 +52847,8 @@ self: { }: mkDerivation { pname = "debian-build"; - version = "0.8.0.0"; - sha256 = "07887be08bd4521fc76e272ed9c418a7c517c57360f07529206ea2b46ace52ad"; + version = "0.9.0.0"; + sha256 = "7199e8a97005bce57cf9e3f157f3923d08891981006353eaf5af226b0a56f601"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54117,7 +54159,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder" = callPackage + "diagrams-builder_0_7_1_1" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -54143,9 +54185,10 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder_0_7_2_0" = callPackage + "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript , diagrams-rasterific, diagrams-svg, directory, exceptions @@ -54171,7 +54214,6 @@ self: { homepage = "http://projects.haskell.org/diagrams"; description = "hint-based build service for the diagrams graphics EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-cairo_1_2_0_4" = callPackage @@ -54744,7 +54786,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-haddock" = callPackage + "diagrams-haddock_0_3_0_6" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring , Cabal, cautious-file, cmdargs, containers, cpphs , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath @@ -54775,9 +54817,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-haddock_0_3_0_7" = callPackage + "diagrams-haddock" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring , Cabal, cautious-file, cmdargs, containers, cpphs , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath @@ -54804,10 +54847,10 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; + doCheck = false; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-hsqml" = callPackage @@ -54825,9 +54868,10 @@ self: { homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; - "diagrams-html5" = callPackage + "diagrams-html5_1_3_0_2" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances , optparse-applicative, split, statestack, static-canvas, text @@ -54844,9 +54888,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-html5_1_3_0_3" = callPackage + "diagrams-html5" = callPackage ({ mkDerivation, base, cmdargs, containers, data-default-class , diagrams-core, diagrams-lib, lens, mtl, NumInstances , optparse-applicative, split, statestack, static-canvas, text @@ -54863,7 +54908,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-lib_1_2_0_7" = callPackage @@ -55111,7 +55155,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-postscript" = callPackage + "diagrams-postscript_1_3_0_2" = callPackage ({ mkDerivation, base, containers, data-default-class , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens , monoid-extras, mtl, semigroups, split, statestack @@ -55128,9 +55172,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-postscript_1_3_0_3" = callPackage + "diagrams-postscript" = callPackage ({ mkDerivation, base, containers, data-default-class , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens , monoid-extras, mtl, semigroups, split, statestack @@ -55147,7 +55192,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Postscript backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-qrcode" = callPackage @@ -55213,7 +55257,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-rasterific" = callPackage + "diagrams-rasterific_1_3_1_3" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split @@ -55231,9 +55275,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-rasterific_1_3_1_4" = callPackage + "diagrams-rasterific" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split @@ -55251,7 +55296,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-rubiks-cube" = callPackage @@ -55351,7 +55395,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-svg" = callPackage + "diagrams-svg_1_3_1_4" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl @@ -55371,9 +55415,10 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-svg_1_3_1_5" = callPackage + "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl @@ -55393,7 +55438,6 @@ self: { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-tikz" = callPackage @@ -56206,7 +56250,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "direct-sqlite" = callPackage + "direct-sqlite_2_3_15" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, directory , HUnit, text }: @@ -56221,6 +56265,24 @@ self: { homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "direct-sqlite" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.16"; + sha256 = "10592458a5a90ae84c7005849924576c31a90422349b4b7ac762a230a056816f"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit text + ]; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = stdenv.lib.licenses.bsd3; }) {}; "directed-cubical" = callPackage @@ -57781,6 +57843,7 @@ self: { homepage = "http://github.com/toothbrush/dotfs"; description = "Filesystem to manage and parse dotfiles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "dotgen" = callPackage @@ -58893,26 +58956,27 @@ self: { }: mkDerivation { pname = "dynobud"; - version = "1.7.1.0"; - sha256 = "a3233e3e5bac04f34a6799c7c2ae2bf478074c0c0dd1b6012b625ad05f1f6717"; + version = "1.8.0.0"; + sha256 = "8851495866fdaecc175c9e795d7accd8c1dd8423b29b2f1e139ca8c36f1f74e5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary casadi-bindings casadi-bindings-core cereal - containers directory distributive generic-accessors hmatrix - hmatrix-gsl jacobi-roots linear mtl Plot-ho-matic process - reflection spatial-math time vector vector-binary-instances + containers data-default-class directory distributive + generic-accessors hmatrix hmatrix-gsl jacobi-roots linear mtl + Plot-ho-matic process reflection spatial-math time vector + vector-binary-instances ]; executableHaskellDepends = [ base bytestring casadi-bindings casadi-bindings-core cereal Chart Chart-gtk cmdargs colour containers data-default-class generic-accessors lens linear mtl not-gloss Plot-ho-matic - semigroups stm unordered-containers vector zeromq4-haskell + semigroups stm time unordered-containers vector zeromq4-haskell ]; testHaskellDepends = [ - base binary casadi-bindings cereal doctest hmatrix hmatrix-gsl - HUnit linear QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 vector + base binary casadi-bindings cereal containers doctest hmatrix + hmatrix-gsl HUnit linear QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 vector ]; jailbreak = true; description = "your dynamic optimization buddy"; @@ -61154,8 +61218,8 @@ self: { }: mkDerivation { pname = "envy"; - version = "0.3.0.1"; - sha256 = "fd3bd8e418ce351edb1a259e5f43d195efe5e1695fa47496a4901b5020b53fe3"; + version = "0.3.0.2"; + sha256 = "b8aaf779fefd85d8836f9cb2dd98abe6cb79391e889f02d4a9851517fe64f280"; libraryHaskellDepends = [ base bytestring containers mtl text time transformers ]; @@ -63896,8 +63960,8 @@ self: { pname = "fay"; version = "0.23.1.8"; sha256 = "66bf327322a2342ce7dee9b981c5e8bd2876935acb1cbc847e0c1635717be29c"; - revision = "2"; - editedCabalFile = "e4c9ff4e2d4684879802958fe2cef7250a88d65827c027a81c5a5b329d47d8c7"; + revision = "3"; + editedCabalFile = "24868a2aec45456bf440513be87e996ff14bc7ed9a10c5959bc831a8e1fd1420"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -65469,8 +65533,8 @@ self: { }: mkDerivation { pname = "filecache"; - version = "0.2.8"; - sha256 = "8e1e14710d68d091b17871105a8cc7b9e38e36299408d63ff7ede19684946d36"; + version = "0.2.9"; + sha256 = "02e6cd64adeeab38b7f6425905332deb8f03824cb4f47a8b8855b846e195dd81"; libraryHaskellDepends = [ base exceptions hashable hinotify lens mtl stm strict-base-types unordered-containers @@ -68215,6 +68279,7 @@ self: { homepage = "https://github.com/chrisdone/freenect"; description = "Interface to the Kinect device"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) freenect; freenect_sync = null;}; "freenect_1_2_1" = callPackage @@ -69762,8 +69827,8 @@ self: { pname = "generic-aeson"; version = "0.2.0.7"; sha256 = "1ff3c270634ba8393ff019d2b2dd47a86d98cc2ec83495324fed6fe3b2fa0c1b"; - revision = "1"; - editedCabalFile = "f14b6017d6c92b2fc7a585bc81fd2ee286c8d73338cf1eb5964006bffeb70abd"; + revision = "2"; + editedCabalFile = "df42343fb6f45e0577832e4964fd96c34d25ff42bf15df65c8c73beaa4f949fc"; libraryHaskellDepends = [ aeson attoparsec base generic-deriving mtl tagged text unordered-containers vector @@ -70315,13 +70380,12 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.1.0.1"; - sha256 = "2f3f18df09069076ca407bd96b636b3d80f69ffad716c9862133b0d9ef8ed140"; + version = "0.1.0.2"; + sha256 = "7b2edbe6619e5da2ac9be1b980134813a04312bac88b68780f62ad7374270532"; libraryHaskellDepends = [ base binary bytestring bytestring-mmap containers iproute reinterpret-cast text ]; - jailbreak = true; description = "Pure haskell interface to MaxMind GeoIP database"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -70567,8 +70631,8 @@ self: { }: mkDerivation { pname = "ghc-events-analyze"; - version = "0.2.1"; - sha256 = "44727566abcbcd824ba54fa39ede8876a8d1225ba4c3b23a0c4d482eee30c051"; + version = "0.2.2"; + sha256 = "0cbcf66eae454ea672bec6f23b97b295fe9a7312c33f7e6b0272c270a7e8e0f3"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -70576,7 +70640,6 @@ self: { mtl optparse-applicative parsec SVGFonts template-haskell th-lift transformers ]; - jailbreak = true; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73770,8 +73833,8 @@ self: { }: mkDerivation { pname = "google-translate"; - version = "0.1.1.1"; - sha256 = "027aaa32a67fb9ee346a09c8b3786e6df20e34dc3f356464908258ea125b74ac"; + version = "0.1.1.2"; + sha256 = "cf5f09f94fe6b938390a4e48865b15bf47aba4d6a03071631666b81c162c5cdc"; libraryHaskellDepends = [ aeson base bytestring either servant servant-client text ]; @@ -74438,6 +74501,7 @@ self: { homepage = "http://github.com/luqui/graphics-drawingcombinators"; description = "A functional interface to 2D drawing in OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "graphics-formats-collada" = callPackage @@ -74799,6 +74863,7 @@ self: { ]; description = "Grid-based multimedia engine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "grm" = callPackage @@ -77553,8 +77618,8 @@ self: { }: mkDerivation { pname = "hackernews"; - version = "0.5.0.0"; - sha256 = "7a2121d9559d2386322cd37a43f96e2fcc7361d2d2fbf86fab4f35516ee448fa"; + version = "0.5.0.1"; + sha256 = "dfef879e6256945f2348996dc0c8b8db0d69887e55ef99cae93a46e14c79720e"; libraryHaskellDepends = [ aeson attoparsec base bytestring either HsOpenSSL http-streams io-streams text time transformers @@ -78937,26 +79002,22 @@ self: { "hapistrano" = callPackage ({ mkDerivation, base, base-compat, directory, either, filepath - , hspec, mtl, old-locale, process, temporary, time - , time-locale-compat, transformers + , hspec, mtl, process, temporary, time, time-locale-compat + , transformers }: mkDerivation { pname = "hapistrano"; - version = "0.2.0.2"; - sha256 = "81c6985053f60dd54201ffd8ed4134aab2e2e34a11e0729fc2c6717e163f83af"; + version = "0.2.1.1"; + sha256 = "dc4c5c8f68ef3ff8eb32f33d9600f4a1478abc0f48a5e75589744ff92e34c5cb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base base-compat either filepath mtl old-locale process time - time-locale-compat transformers - ]; - executableHaskellDepends = [ - base base-compat either filepath mtl old-locale process time - time-locale-compat transformers + base either filepath mtl process time time-locale-compat + transformers ]; + executableHaskellDepends = [ base base-compat ]; testHaskellDepends = [ - base base-compat directory either filepath hspec mtl old-locale - process temporary time time-locale-compat transformers + base directory either filepath hspec mtl process temporary ]; homepage = "https://github.com/stackbuilders/hapistrano"; description = "A deployment library for Haskell applications"; @@ -80522,6 +80583,7 @@ self: { homepage = "http://github.com/cosbynator/haskakafka"; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rdkafka;}; "haskanoid" = callPackage @@ -80541,6 +80603,7 @@ self: { homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "haskarrow" = callPackage @@ -84167,6 +84230,7 @@ self: { homepage = "https://github.com/ivanperez-keera/hcwiid"; description = "Library to interface with the wiimote"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {bluetooth = null; inherit (pkgs) cwiid;}; "hdaemonize_0_5_0_0" = callPackage @@ -86276,6 +86340,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hgrev" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, filepath + , process, template-haskell + }: + mkDerivation { + pname = "hgrev"; + version = "0.1.0.0"; + sha256 = "235e13ae4a5d4f28d4297daaf6685941eac72977db5dd88e51e1b814585cf860"; + revision = "1"; + editedCabalFile = "bf4e264db654def79fe433313df6d0918a85cd851a8f1c063ee138d4e60128fe"; + libraryHaskellDepends = [ + aeson base bytestring directory filepath process template-haskell + ]; + homepage = "https://github.com/LukeHoersten/hgrev"; + description = "Template Haskell splices for including the current Mercurial revision info in code"; + license = stdenv.lib.licenses.mit; + }) {}; + "hgrib" = callPackage ({ mkDerivation, base, c2hs, directory, grib_api, hspec }: mkDerivation { @@ -86402,6 +86484,7 @@ self: { homepage = "https://github.com/phaazon/hid"; description = "Interface to hidapi library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) hidapi;}; "hidapi" = callPackage @@ -86415,6 +86498,7 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "hieraclus" = callPackage @@ -88274,6 +88358,7 @@ self: { homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libbladeRF;}; "hlibev" = callPackage @@ -89716,6 +89801,7 @@ self: { base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + doCheck = false; homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; @@ -89750,6 +89836,7 @@ self: { base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + doCheck = false; homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; @@ -89784,6 +89871,7 @@ self: { base bytestring Cabal HUnit QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; + doCheck = false; homepage = "http://github.com/yogsototh/holy-project"; description = "Start your Haskell project with cabal, git and tests"; license = stdenv.lib.licenses.mit; @@ -95310,6 +95398,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Haskell binding for Qt Quick"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {qt5 = null;}; "hsqml-datamodel" = callPackage @@ -95379,6 +95468,7 @@ self: { homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "hsqml-demo-samples" = callPackage @@ -96289,6 +96379,7 @@ self: { network streaming-commons text time transformers zlib ]; jailbreak = true; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96321,6 +96412,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96351,6 +96443,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96381,6 +96474,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96411,6 +96505,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96441,6 +96536,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96471,6 +96567,7 @@ self: { case-insensitive containers deepseq hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96501,6 +96598,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96531,6 +96629,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96561,6 +96660,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96590,6 +96690,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96619,6 +96720,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96648,6 +96750,7 @@ self: { case-insensitive containers deepseq directory hspec http-types monad-control network streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96678,6 +96781,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96708,6 +96812,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96738,6 +96843,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96768,6 +96874,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96798,6 +96905,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96828,6 +96936,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96858,6 +96967,7 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -96888,13 +96998,14 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client" = callPackage + "http-client_0_4_23" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , data-default-class, deepseq, directory, exceptions, filepath @@ -96918,6 +97029,38 @@ self: { monad-control network network-uri streaming-commons text time transformers zlib ]; + doCheck = false; + homepage = "https://github.com/snoyberg/http-client"; + description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "http-client" = callPackage + ({ mkDerivation, array, async, base, base64-bytestring + , blaze-builder, bytestring, case-insensitive, containers, cookie + , data-default-class, deepseq, directory, exceptions, filepath + , ghc-prim, hspec, http-types, mime-types, monad-control, network + , network-uri, random, streaming-commons, text, time, transformers + , zlib + }: + mkDerivation { + pname = "http-client"; + version = "0.4.24"; + sha256 = "93e4182ef9d3e8b45b75cca0f63b20457823e5aeaba46f6a16de47d7e618e177"; + libraryHaskellDepends = [ + array base base64-bytestring blaze-builder bytestring + case-insensitive containers cookie data-default-class deepseq + exceptions filepath ghc-prim http-types mime-types network + network-uri random streaming-commons text time transformers + ]; + testHaskellDepends = [ + async base base64-bytestring blaze-builder bytestring + case-insensitive containers deepseq directory hspec http-types + monad-control network network-uri streaming-commons text time + transformers zlib + ]; + doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; license = stdenv.lib.licenses.mit; @@ -97096,6 +97239,7 @@ self: { text time transformers utf8-string wai wai-conduit warp warp-tls ]; jailbreak = true; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97125,6 +97269,7 @@ self: { text time transformers utf8-string wai wai-conduit warp warp-tls ]; jailbreak = true; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97153,6 +97298,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97181,6 +97327,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97211,6 +97358,7 @@ self: { http-client http-types HUnit lifted-base network streaming-commons text time transformers utf8-string wai wai-conduit warp warp-tls ]; + doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; license = stdenv.lib.licenses.bsd3; @@ -97794,6 +97942,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http2_1_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , bytestring-builder, containers, directory, doctest, filepath + , Glob, hex, hspec, mwc-random, stm, text, unordered-containers + , vector, word8 + }: + mkDerivation { + pname = "http2"; + version = "1.1.0"; + sha256 = "1860d3e63b418cedd440c496fa813eadc14325a1e3dbb68e49221b2e04e3c996"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring bytestring-builder containers mwc-random stm + unordered-containers + ]; + executableHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + containers directory filepath hex text unordered-containers vector + word8 + ]; + testHaskellDepends = [ + aeson aeson-pretty array base bytestring bytestring-builder + containers directory doctest filepath Glob hex hspec mwc-random stm + text unordered-containers vector word8 + ]; + description = "HTTP/2.0 library including frames and HPACK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "httpd-shed" = callPackage ({ mkDerivation, base, network, network-uri }: mkDerivation { @@ -100781,6 +100960,47 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_8_2_0" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bin-package-db + , bytestring, cereal, cmdargs, containers, directory, filepath, ghc + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint + , hspec, http-client, http-client-tls, HUnit, ipython-kernel, mtl + , parsec, process, random, setenv, shelly, split, stm, strict + , system-argv0, text, transformers, unix, unordered-containers + , utf8-string, uuid, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.8.2.0"; + sha256 = "46ded8d9b827c7e3e0eb40379fbf8bc8bbfa85a1c0feacf463c4673c342d9ba4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts here hlint http-client http-client-tls + ipython-kernel mtl parsec process random shelly split stm strict + system-argv0 text transformers unix unordered-containers + utf8-string uuid vector + ]; + executableHaskellDepends = [ + aeson base bin-package-db bytestring containers directory ghc here + ipython-kernel process strict text transformers unix + ]; + testHaskellDepends = [ + aeson base base64-bytestring bin-package-db bytestring cereal + cmdargs containers directory filepath ghc ghc-parser ghc-paths + haskeline haskell-src-exts here hlint hspec http-client + http-client-tls HUnit ipython-kernel mtl parsec process random + setenv shelly split stm strict system-argv0 text transformers unix + unordered-containers utf8-string uuid vector + ]; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -101002,8 +101222,8 @@ self: { }: mkDerivation { pname = "ihaskell-widgets"; - version = "0.2.0.0"; - sha256 = "b9980311e06991122e46cf7cb4dbd697175876b6f4452e09e72d4320827f2cc2"; + version = "0.2.2.0"; + sha256 = "38340ba45242b1088cd651e404a0c385b4379cefaa4b989e76f4bd87bd9f806a"; libraryHaskellDepends = [ aeson base containers ihaskell ipython-kernel nats scientific singletons text unix unordered-containers vector vinyl @@ -103146,6 +103366,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_8_2_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , directory, filepath, mtl, parsec, process, SHA, temporary, text + , transformers, uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.8.2.0"; + sha256 = "0b028b9910f90aee9c3b4adb8e59b79aed37ab307501c92158594d28c29ca122"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring cereal containers directory filepath mtl + process SHA temporary text transformers uuid zeromq4-haskell + ]; + executableHaskellDepends = [ + base filepath mtl parsec text transformers + ]; + homepage = "http://github.com/gibiansky/IHaskell"; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -104790,6 +105034,7 @@ self: { sha256 = "0da1183c74326d8c3f2ced74e6a1a659e91c7364d2f02fb2551611a6fbcd904c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; + doCheck = false; homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; license = stdenv.lib.licenses.mit; @@ -104804,6 +105049,7 @@ self: { sha256 = "2204d8830f4cae60110a596e53516c1e7e86e9d7a24d338c898045f7c67fbf69"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; + doCheck = false; homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; license = stdenv.lib.licenses.mit; @@ -104818,6 +105064,7 @@ self: { sha256 = "3d7b19d0b5ae59339b705026bed66e72fe5392a792f08859876d6e4131b3c257"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; + doCheck = false; homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; license = stdenv.lib.licenses.mit; @@ -105318,8 +105565,8 @@ self: { }: mkDerivation { pname = "json-rpc-client"; - version = "0.2.1.0"; - sha256 = "3ad6d73b9e554dbeab0ca8b96ad55e5f270b4144c8a20ad85e5939b6a0da45d5"; + version = "0.2.2.0"; + sha256 = "370fb8122243ada541060a4ea201d54f19d3031b7a524ec5176545a31be72740"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105343,8 +105590,8 @@ self: { }: mkDerivation { pname = "json-rpc-server"; - version = "0.2.1.0"; - sha256 = "593c0d9185c5ff8fd983b7abb01061a5f1a659ffca163fdfe9e3d121ad4275e5"; + version = "0.2.2.0"; + sha256 = "49eefc830aa7164662ea2a6263e9ea5d2379ebe21de6c6eaa463847e4c4ce33c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -105572,8 +105819,8 @@ self: { pname = "json-schema"; version = "0.7.4.0"; sha256 = "c549fa4b199efcd885334538cfa15cc77226a1c9c9afa30f5867d75b79d2701c"; - revision = "1"; - editedCabalFile = "9b2252abe33f7c8a3edc99a2583bd1399605908f86116d5475b5d27a0ab5110e"; + revision = "2"; + editedCabalFile = "7c40fcd8bc0386dde997f9b635d1f0c8d8251f38ce7b83c161235861fdb06e04"; libraryHaskellDepends = [ aeson base containers generic-aeson generic-deriving mtl scientific text time unordered-containers vector @@ -108653,7 +108900,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote" = callPackage + "language-c-quote_0_11" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb @@ -108677,6 +108924,33 @@ self: { homepage = "http://www.cs.drexel.edu/~mainland/"; description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "language-c-quote" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , exception-mtl, exception-transformers, filepath, happy + , haskell-src-meta, HUnit, mainland-pretty, mtl, srcloc, syb + , symbol, template-haskell, test-framework, test-framework-hunit + }: + mkDerivation { + pname = "language-c-quote"; + version = "0.11.0.1"; + sha256 = "ca65065a9c5cea2cf02c58398d6352fcf29d9294d1286efa6058bf4ebd0e1dd8"; + libraryHaskellDepends = [ + array base bytestring containers exception-mtl + exception-transformers filepath haskell-src-meta mainland-pretty + mtl srcloc syb symbol template-haskell + ]; + libraryToolDepends = [ alex happy ]; + testHaskellDepends = [ + base bytestring HUnit mainland-pretty srcloc symbol test-framework + test-framework-hunit + ]; + doCheck = false; + homepage = "http://www.cs.drexel.edu/~mainland/"; + description = "C/CUDA/OpenCL/Objective-C quasiquoting library"; + license = stdenv.lib.licenses.bsd3; }) {}; "language-cil" = callPackage @@ -109188,7 +109462,6 @@ self: { testHaskellDepends = [ base base-compat Cabal deepseq doctest lens pretty QuickCheck ]; - doCheck = false; homepage = "https://github.com/peti/language-nix#readme"; description = "Data types and useful functions to represent and manipulate the Nix language"; license = stdenv.lib.licenses.bsd3; @@ -111444,6 +111717,7 @@ self: { homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) systemd;}; "libtagc" = callPackage @@ -114055,6 +114329,7 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "logic-TPTP" = callPackage @@ -114824,8 +115099,8 @@ self: { }: mkDerivation { pname = "luminance"; - version = "0.1"; - sha256 = "1bd7bb005ed35d876c2c6703a9bcb6402b6a2d379b55b0a78344fafef97bb217"; + version = "0.1.1"; + sha256 = "eb8e92603e9cb92ff682f3f50e35f79f966aeb1f0930ca556b3898f63fd79154"; libraryHaskellDepends = [ base contravariant gl mtl resourcet semigroups transformers void ]; @@ -114960,6 +115235,7 @@ self: { homepage = "https://github.com/fizruk/lxc"; description = "High level Haskell bindings to LXC (Linux containers)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "lye" = callPackage @@ -115771,7 +116047,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "managed" = callPackage + "managed_1_0_0" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -115780,9 +116056,10 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "managed_1_0_1" = callPackage + "managed" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "managed"; @@ -115791,7 +116068,6 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "A monad for managed values"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "manatee" = callPackage @@ -118376,6 +118652,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Convert between datatypes of the midi and the alsa packages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midi-music-box" = callPackage @@ -118432,6 +118709,7 @@ self: { homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "midisurface" = callPackage @@ -121917,6 +122195,7 @@ self: { executableHaskellDepends = [ base bytestring hid split ]; description = "A command line tool to change backlit colors of your MSI keyboards"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "mstate" = callPackage @@ -123754,6 +124033,7 @@ self: { jailbreak = true; description = "nanomsg - scalability protocols library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage @@ -129752,6 +130032,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "Haskell binding for C PAM API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) pam;}; "panda" = callPackage @@ -130119,6 +130400,7 @@ self: { aeson base bytestring directory filepath pandoc pandoc-types process temporary text yaml ]; + doHaddock = false; description = "Supports using pandoc with citeproc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -130285,8 +130567,8 @@ self: { }: mkDerivation { pname = "pandoc-types"; - version = "1.12.4.6"; - sha256 = "fbb67e345f17dd706f4500d600a8ec75fbce57b14276eb9b2483585fd3cfacea"; + version = "1.12.4.7"; + sha256 = "560ca3291b5558cf810b17f3bee40b17a4aee1671d38cf468c42aab666081681"; libraryHaskellDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; @@ -131732,8 +132014,8 @@ self: { }: mkDerivation { pname = "pcre-utils"; - version = "0.1.5"; - sha256 = "c9d01a8e8fe37496009334bb037b17bceb94263bc0fc148f9dc564a3a91ed62c"; + version = "0.1.6"; + sha256 = "d2b36b8221dd10146cb2b01565b0b4affef2d8ef8263fc7d074e86ade1b2954b"; libraryHaskellDepends = [ array attoparsec base bytestring mtl regex-pcre-builtin vector ]; @@ -133601,7 +133883,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template" = callPackage + "persistent-template_2_1_3_4" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, ghc-prim , hspec, monad-control, monad-logger, path-pieces, persistent , QuickCheck, tagged, template-haskell, text, transformers @@ -133622,6 +133904,31 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Type-safe, non-relational, multi-backend persistence"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + + "persistent-template" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, ghc-prim + , hspec, monad-control, monad-logger, path-pieces, persistent + , QuickCheck, tagged, template-haskell, text, transformers + , unordered-containers + }: + mkDerivation { + pname = "persistent-template"; + version = "2.1.3.5"; + sha256 = "578d3a3243f46382d61dcc53bae771d7bae8927660104364f4a3ef782e877799"; + libraryHaskellDepends = [ + aeson base bytestring containers ghc-prim monad-control + monad-logger path-pieces persistent tagged template-haskell text + transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring hspec persistent QuickCheck text transformers + ]; + homepage = "http://www.yesodweb.com/book/persistent"; + description = "Type-safe, non-relational, multi-backend persistence"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; @@ -136172,6 +136479,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polymap" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "polymap"; + version = "0.1.1.0"; + sha256 = "9cda6cf03591ac30fdd8bd6796f87016e45dfa10a720d091622e02036fe809b7"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + description = "Polygonal maps"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "polynomial" = callPackage ({ mkDerivation, base, deepseq, pretty, vector, vector-space , vector-th-unbox @@ -138214,6 +138533,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/printxosd"; description = "Simple tool to display some text on an on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "priority-queue" = callPackage @@ -139080,8 +139400,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "2.7.3"; - sha256 = "0309899702da827d8fa3184c08e2de664cb0ba8df007b66caedd66894e85d151"; + version = "2.8.0"; + sha256 = "fb4d796502f24ee0453d3150bbdc27d8bfada5950ccc467dab6d58c065f579f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139186,6 +139506,7 @@ self: { libraryToolDepends = [ c2hs ]; description = "A wrapper for the proteaaudio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) alsaLib;}; "protobuf" = callPackage @@ -139471,30 +139792,6 @@ self: { }) {}; "psc-ide" = callPackage - ({ mkDerivation, aeson, base, containers, directory, filepath - , hspec, lens, lens-aeson, mtl, network, optparse-applicative - , parsec, regex-tdfa, text, wreq - }: - mkDerivation { - pname = "psc-ide"; - version = "0.1.0.0"; - sha256 = "787d26ce0d50409f41a34ad72e857d19d2e346b75e072da6396195e960f8145d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers directory filepath lens lens-aeson mtl parsec - regex-tdfa text wreq - ]; - executableHaskellDepends = [ - base directory mtl network optparse-applicative text - ]; - testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/kRITZCREEK/psc-ide"; - description = "Language support for the PureScript programming language"; - license = stdenv.lib.licenses.mit; - }) {}; - - "psc-ide_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, containers, directory, either , filepath, hspec, lens, lens-aeson, mtl, network , optparse-applicative, parsec, regex-tdfa, text, wreq @@ -139516,7 +139813,6 @@ self: { homepage = "http://github.com/kRITZCREEK/psc-ide"; description = "Language support for the PureScript programming language"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pseudo-boolean" = callPackage @@ -139563,7 +139859,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "psqueues" = callPackage + "psqueues_0_2_0_2" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit , test-framework-quickcheck2 @@ -139579,6 +139875,25 @@ self: { ]; description = "Pure priority search queues"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "psqueues" = callPackage + ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit + , QuickCheck, tagged, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "psqueues"; + version = "0.2.0.3"; + sha256 = "ac8a60de9979f80948d0becfb35cdafe7e1fdfce062c0468e4e2abced9a85c69"; + libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; + testHaskellDepends = [ + array base deepseq ghc-prim hashable HUnit QuickCheck tagged + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "Pure priority search queues"; + license = stdenv.lib.licenses.bsd3; }) {}; "pub" = callPackage @@ -141533,7 +141848,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rainbox" = callPackage + "rainbox_0_18_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, lens, QuickCheck , rainbow, tasty, tasty-quickcheck, text }: @@ -141551,6 +141866,27 @@ self: { homepage = "http://www.github.com/massysett/rainbox"; description = "Two-dimensional box pretty printing, with colors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "rainbox" = callPackage + ({ mkDerivation, base, bytestring, containers, lens, QuickCheck + , rainbow, tasty, tasty-quickcheck, text + }: + mkDerivation { + pname = "rainbox"; + version = "0.18.0.4"; + sha256 = "f8efeb3f81ee5b7d9765f427d9c592e15cb732334ac8330464fe545d301525a1"; + libraryHaskellDepends = [ + base bytestring containers lens rainbow text + ]; + testHaskellDepends = [ + base bytestring containers lens QuickCheck rainbow tasty + tasty-quickcheck text + ]; + homepage = "http://www.github.com/massysett/rainbox"; + description = "Two-dimensional box pretty printing, with colors"; + license = stdenv.lib.licenses.bsd3; }) {}; "rake" = callPackage @@ -143723,8 +144059,8 @@ self: { }: mkDerivation { pname = "regex-genex"; - version = "0.6.2"; - sha256 = "3826c6ab88bd2819c67f2f84959e906ccbc970dc02872bf7f4bdae0069fd26a0"; + version = "0.7.0"; + sha256 = "70d4028bfdafaaffc95d82d38d54949e9c0b102578ecd73a8a00a2669c55e4cc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -145777,6 +146113,8 @@ self: { pname = "rest-core"; version = "0.36.0.6"; sha256 = "c4863ccdd2deee9f790136d5ac53a464682f6b85276aeaff48426832d90e9215"; + revision = "1"; + editedCabalFile = "c04e636b2c6ad925592a1a19e081a11b8c7c4d0e74a34b95856af866e8975e52"; libraryHaskellDepends = [ aeson aeson-utils base bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random @@ -146129,7 +146467,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rest-gen" = callPackage + "rest-gen_0_17_1_3" = callPackage ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder , directory, fclabels, filepath, hashable, haskell-src-exts , HStringTemplate, HUnit, hxt, json-schema, pretty, process @@ -146153,9 +146491,10 @@ self: { ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "rest-gen_0_18_0_0" = callPackage + "rest-gen" = callPackage ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder , directory, fclabels, filepath, hashable, haskell-src-exts , HStringTemplate, HUnit, hxt, json-schema, pretty, process @@ -146167,6 +146506,8 @@ self: { pname = "rest-gen"; version = "0.18.0.0"; sha256 = "bca52143478e12a5fc91630c0df7f2206f8f60639d3a6cc568e4772696e92787"; + revision = "1"; + editedCabalFile = "8199543b3839b7b8e3fa7c6e768a2e6a9bc80ba520ec89db41865435be5cb666"; libraryHaskellDepends = [ aeson base blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt json-schema @@ -146179,7 +146520,6 @@ self: { ]; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rest-happstack_0_2_10_3" = callPackage @@ -146370,6 +146710,8 @@ self: { pname = "rest-stringmap"; version = "0.2.0.6"; sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a"; + revision = "1"; + editedCabalFile = "a814dde006adf0a6f3b0c98956060b4e9759b47da046ca6faaa8eb0e3272e246"; libraryHaskellDepends = [ aeson base containers hashable hxt json-schema tostring unordered-containers @@ -148037,6 +148379,7 @@ self: { homepage = "https://github.com/adamwalker/hrtlsdr"; description = "Bindings to librtlsdr"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rtl-sdr;}; "rtorrent-rpc" = callPackage @@ -148093,6 +148436,7 @@ self: { homepage = "https://github.com/mtolly/rubberband"; description = "Binding to the C++ audio stretching library Rubber Band"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) rubberband;}; "ruby-marshal" = callPackage @@ -150415,6 +150759,7 @@ self: { homepage = "https://github.com/adamwalker/sdr"; description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "seacat" = callPackage @@ -151605,7 +151950,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant" = callPackage + "servant_0_4_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-media, http-types, network-uri @@ -151629,9 +151974,10 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant_0_4_4_3" = callPackage + "servant" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-media, http-types, network-uri @@ -151640,8 +151986,8 @@ self: { }: mkDerivation { pname = "servant"; - version = "0.4.4.3"; - sha256 = "13ca10419a1826a8ecd4b8cf762e58ed25ae31adaf4bdeb8d36c71dfa5869dc1"; + version = "0.4.4.4"; + sha256 = "182842071c4905a3429c1ccbff020af255b6abfd1e7a6473253713c0da80f280"; libraryHaskellDepends = [ aeson attoparsec base bytestring bytestring-conversion case-insensitive http-media http-types network-uri @@ -151655,7 +152001,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-JuicyPixels_0_1_0_0" = callPackage @@ -151705,8 +152050,8 @@ self: { ({ mkDerivation, base, blaze-html, http-media, servant }: mkDerivation { pname = "servant-blaze"; - version = "0.4.4.3"; - sha256 = "8fca95f4325e10a290d6835c72bd31c69e22327548fcb2bc1094c66d3c3a5287"; + version = "0.4.4.4"; + sha256 = "58e3d5922b9031559aebc7ae99e52712d6a208cb2c0164da5baffb4cd55cafa1"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.github.io/"; description = "Blaze-html support for servant"; @@ -151766,7 +152111,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-client" = callPackage + "servant-client_0_4_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , either, exceptions, hspec, http-client, http-client-tls , http-media, http-types, HUnit, network, network-uri, QuickCheck @@ -151790,9 +152135,10 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-client_0_4_4_3" = callPackage + "servant-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq , either, exceptions, hspec, http-client, http-client-tls , http-media, http-types, HUnit, network, network-uri, QuickCheck @@ -151801,8 +152147,8 @@ self: { }: mkDerivation { pname = "servant-client"; - version = "0.4.4.3"; - sha256 = "e83b581ebdabd8d81173605fa40da1acc31f2115cd633188402ca5a5938854f6"; + version = "0.4.4.4"; + sha256 = "650e5aa48c060238a25328e9b9193d20102010359946f7b1979ef328eb1c4134"; libraryHaskellDepends = [ aeson attoparsec base bytestring either exceptions http-client http-client-tls http-media http-types network-uri safe servant @@ -151816,7 +152162,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-docs_0_3_1" = callPackage @@ -151871,7 +152216,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-docs" = callPackage + "servant-docs_0_4_4_2" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , case-insensitive, hashable, hspec, http-media, http-types, lens , servant, string-conversions, text, unordered-containers @@ -151897,17 +152242,18 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-docs_0_4_4_3" = callPackage + "servant-docs" = callPackage ({ mkDerivation, aeson, base, bytestring, bytestring-conversion , case-insensitive, hashable, hspec, http-media, http-types, lens , servant, string-conversions, text, unordered-containers }: mkDerivation { pname = "servant-docs"; - version = "0.4.4.3"; - sha256 = "ca87fe6949cdda55e4745aa3c4863cd68ff3a3904d61a0d9baa556e2f364e89f"; + version = "0.4.4.4"; + sha256 = "9a854eafd12e7707764899f16a0868f712eb022eb0fa2f9eeeaaea8bea4bc4f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -151925,7 +152271,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-ede" = callPackage @@ -151960,8 +152305,8 @@ self: { }: mkDerivation { pname = "servant-examples"; - version = "0.4.4.3"; - sha256 = "7ccdf278c8f5da6b3630040ec4eba3111eeedd2465d5047034f10372defcb760"; + version = "0.4.4.4"; + sha256 = "e180ff93d58ebb467097b337e00f77b42e9780880627ab52a2b8d69363fc7de4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -151970,6 +152315,7 @@ self: { servant-lucid servant-server text time transformers wai wai-extra warp ]; + jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; @@ -152020,7 +152366,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-jquery" = callPackage + "servant-jquery_0_4_4_2" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant , servant-server, stm, text, transformers, warp @@ -152041,17 +152387,18 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-jquery_0_4_4_3" = callPackage + "servant-jquery" = callPackage ({ mkDerivation, aeson, base, charset, filepath, hspec , hspec-expectations, language-ecmascript, lens, servant , servant-server, stm, text, transformers, warp }: mkDerivation { pname = "servant-jquery"; - version = "0.4.4.3"; - sha256 = "1ec131e7b48673c8c7d99f0422d287a34e81f55f6fb2b142377d8e5b4d9288f8"; + version = "0.4.4.4"; + sha256 = "66fbe8414ac6bf6e17fd12b31d6a1fa766ea91f3a2932c22c3accf048e8f7076"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base charset lens servant text ]; @@ -152064,15 +152411,14 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-lucid" = callPackage ({ mkDerivation, base, http-media, lucid, servant }: mkDerivation { pname = "servant-lucid"; - version = "0.4.4.3"; - sha256 = "6d6b836794f1f5bda94c15d4f7950913db3396a6f9d233fd88e43e4fdcb100d2"; + version = "0.4.4.4"; + sha256 = "c42702b20da1f8daea4c2a633e777214e524a2afac96c0b559209351f1f1cd0d"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.github.io/"; description = "Servant support for lucid"; @@ -152085,8 +152431,8 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.4.4.3"; - sha256 = "bef08a756d600298f8762a73bf2b25ceed2377a970c4eb69273cd7f7981753ef"; + version = "0.4.4.4"; + sha256 = "1df192ac10aea342cffd5da509f9c5eca40b659fa3c7b77aad87ec0bbb82f35c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152285,7 +152631,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-server" = callPackage + "servant-server_0_4_4_2" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, directory, doctest, either, exceptions , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl @@ -152314,9 +152660,10 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-server_0_4_4_3" = callPackage + "servant-server" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , bytestring-conversion, directory, doctest, either, exceptions , filemanip, filepath, hspec, hspec-wai, http-types, mmorph, mtl @@ -152326,8 +152673,8 @@ self: { }: mkDerivation { pname = "servant-server"; - version = "0.4.4.3"; - sha256 = "552ccb848fbb99c471f950412c12fe7a6081507678a4108d195299ecdc987fa0"; + version = "0.4.4.4"; + sha256 = "056947b96664674f1a6c65af30001e9e2343357efa96e153198ec0f833f3fdd0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -152345,7 +152692,6 @@ self: { homepage = "http://haskell-servant.github.io/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession" = callPackage @@ -152550,8 +152896,8 @@ self: { }: mkDerivation { pname = "ses-html"; - version = "0.3.0.0"; - sha256 = "1e6a6a172f2379b7c86f63ac304dfe03b907302197a92544462b5def27118eb2"; + version = "0.3.0.1"; + sha256 = "07ce0cc9777d9fac050cb2546de72c56625a47769a046e49b9d11f74c9c8bccf"; libraryHaskellDepends = [ base base64-bytestring blaze-html byteable bytestring cryptohash HsOpenSSL http-streams tagsoup time @@ -152859,6 +153205,7 @@ self: { homepage = "http://patch-tag.com/r/shahn/sfml-audio"; description = "minimal bindings to the audio module of sfml"; license = "unknown"; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;}; "sfmt" = callPackage @@ -153781,21 +154128,21 @@ self: { "shelduck" = callPackage ({ mkDerivation, aeson, async, base, bytestring, hastache, hspec , lens, lens-aeson, rainbow, random, regex-compat, shelly, Spock - , stm, text, transformers, wreq + , stm, text, time, transformers, uuid, wreq }: mkDerivation { pname = "shelduck"; - version = "0.1.2.0"; - sha256 = "3a62ab82b4311c05785e53dba0169122b6d61fd1087110785eecd779f2794e67"; + version = "0.1.3.0"; + sha256 = "a9190676dc9e3b8266ea97a8d9034015a9242c7f1ed9e226423ad14fdec61769"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring hastache lens lens-aeson rainbow random - shelly Spock stm text transformers wreq + shelly Spock stm text time transformers uuid wreq ]; executableHaskellDepends = [ aeson async base bytestring hastache lens lens-aeson rainbow random - shelly Spock stm text transformers wreq + shelly Spock stm text time transformers uuid wreq ]; testHaskellDepends = [ aeson base hspec lens regex-compat stm text transformers wreq @@ -160218,7 +160565,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; - "stack" = callPackage + "stack_0_1_4_1" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring , base64-bytestring, bifunctors, binary, blaze-builder, byteable , bytestring, Cabal, conduit, conduit-combinators, conduit-extra @@ -160281,6 +160628,73 @@ self: { homepage = "https://github.com/commercialhaskell/stack"; description = "The Haskell Tool Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ simons ]; + }) {}; + + "stack" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, base16-bytestring + , base64-bytestring, bifunctors, binary, binary-tagged + , blaze-builder, byteable, bytestring, Cabal, conduit + , conduit-combinators, conduit-extra, containers, cryptohash + , cryptohash-conduit, deepseq, directory, either + , enclosed-exceptions, exceptions, extra, fast-logger, file-embed + , filelock, filepath, fsnotify, gitrev, hashable, hastache, hspec + , http-client, http-client-tls, http-conduit, http-types, ignore + , lifted-base, monad-control, monad-logger, monad-loops, mtl + , old-locale, optparse-applicative, optparse-simple, path + , persistent, persistent-sqlite, persistent-template, pretty + , process, project-template, QuickCheck, resourcet, retry, safe + , split, stm, streaming-commons, tar, template-haskell, temporary + , text, time, transformers, transformers-base, unix, unix-compat + , unordered-containers, vector, vector-binary-instances, void + , word8, yaml, zlib + }: + mkDerivation { + pname = "stack"; + version = "0.1.5.0"; + sha256 = "40a26de423f070fc6c742a77c76e90ffd25d6ff08c6a651b3683f16f63a03e25"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base base16-bytestring base64-bytestring + bifunctors binary binary-tagged blaze-builder byteable bytestring + Cabal conduit conduit-combinators conduit-extra containers + cryptohash cryptohash-conduit deepseq directory enclosed-exceptions + exceptions extra fast-logger file-embed filelock filepath fsnotify + gitrev hashable hastache http-client http-client-tls http-conduit + http-types ignore lifted-base monad-control monad-logger + monad-loops mtl old-locale optparse-applicative optparse-simple + path persistent persistent-sqlite persistent-template pretty + process project-template resourcet retry safe split stm + streaming-commons tar template-haskell temporary text time + transformers transformers-base unix unix-compat + unordered-containers vector vector-binary-instances void word8 yaml + zlib + ]; + executableHaskellDepends = [ + base bytestring Cabal conduit containers directory either + exceptions filelock filepath gitrev hashable http-client + http-conduit lifted-base monad-control monad-logger mtl old-locale + optparse-applicative optparse-simple path process resourcet split + text transformers unordered-containers + ]; + testHaskellDepends = [ + async base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec http-conduit + monad-logger optparse-applicative path process QuickCheck resourcet + retry temporary text transformers unix-compat + ]; + doCheck = false; + enableSharedExecutables = false; + postInstall = '' + exe=$out/bin/stack + mkdir -p $out/share/bash-completion/completions + $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack + ''; + homepage = "https://github.com/commercialhaskell/stack"; + description = "The Haskell Tool Stack"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ simons ]; }) {}; @@ -161050,8 +161464,8 @@ self: { }: mkDerivation { pname = "stateWriter"; - version = "0.2.3"; - sha256 = "1430eabaeb8b553c08857287bbd1ddda16492db355e31081cc7ed29a069d30a7"; + version = "0.2.4"; + sha256 = "b0cb37427724398c3297a9e2ae1e59e8b490b34bd993352ff1020ff2dbbae29b"; libraryHaskellDepends = [ base mtl transformers ]; testHaskellDepends = [ base free hspec mtl QuickCheck ]; description = "A faster variant of the RWS monad transformers"; @@ -163072,8 +163486,8 @@ self: { }: mkDerivation { pname = "stripe-haskell"; - version = "0.1.4.2"; - sha256 = "58d289423a8cc5dc227e451845afcc5da154740010d4cc7bf794759d043319b6"; + version = "0.1.4.3"; + sha256 = "f99ba8cd8097678d09df43301dca054ec573b8ecf9844bea62985178902d101f"; libraryHaskellDepends = [ aeson base bytestring either HsOpenSSL http-streams io-streams mtl random text time transformers unordered-containers @@ -163696,6 +164110,32 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "super-user-spark" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring + , directory, filepath, HTF, HUnit, mtl, optparse-applicative + , parsec, process, shelly, text, transformers, unix, zlib + }: + mkDerivation { + pname = "super-user-spark"; + version = "0.2.0.3"; + sha256 = "0fa3189dcf517a50abab5b83eee5d706ea13cbaaa780e6d14fb38679d924beb7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + mtl optparse-applicative parsec process shelly text transformers + unix zlib + ]; + testHaskellDepends = [ + aeson aeson-pretty base binary bytestring directory filepath HTF + HUnit mtl optparse-applicative parsec process shelly text + transformers unix zlib + ]; + jailbreak = true; + description = "Configure your dotfile deployment with a DSL"; + license = stdenv.lib.licenses.mit; + }) {}; + "supercollider-ht" = callPackage ({ mkDerivation, base, hosc, hsc3, opensoundcontrol-ht, process , random, transformers @@ -166038,6 +166478,8 @@ self: { pname = "tar"; version = "0.4.2.1"; sha256 = "2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080"; + revision = "1"; + editedCabalFile = "4b0749397f9f6aac3506e07c9043371ac8a2c5605dc4370501904f38c1a3c3b4"; libraryHaskellDepends = [ array base bytestring directory filepath time ]; @@ -169424,26 +169866,26 @@ self: { }) {}; "these" = callPackage - ({ mkDerivation, base, bifunctors, containers, mtl, profunctors - , QuickCheck, semigroupoids, semigroups, tasty, tasty-quickcheck - , transformers, vector + ({ mkDerivation, base, bifunctors, containers, data-default-class + , hashable, mtl, profunctors, QuickCheck, quickcheck-instances + , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "these"; - version = "0.6.0.0"; - sha256 = "c8e94f28561e87a1c51498a8529a74983fe68d785b250c118d02a9a25d1b9383"; - revision = "3"; - editedCabalFile = "c65f6b008c1cc77cc3aa788f31c831c0fb64de22ec9ebccf6179cb9654d0697e"; + version = "0.6.1.0"; + sha256 = "a8e9e677b72ab4ea4e922b860abdd5f61ac69cb66e7c9f060f08ac94110f2d0d"; libraryHaskellDepends = [ - base bifunctors containers mtl profunctors semigroupoids semigroups - transformers vector + base bifunctors containers data-default-class hashable mtl + profunctors semigroupoids semigroups transformers + transformers-compat unordered-containers vector ]; testHaskellDepends = [ - base bifunctors QuickCheck tasty tasty-quickcheck transformers - vector + base bifunctors containers hashable QuickCheck quickcheck-instances + tasty tasty-quickcheck transformers unordered-containers vector ]; homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type, with corresponding hybrid error/writer monad transformer"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -169925,6 +170367,7 @@ self: { homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "tidal-vis" = callPackage @@ -170962,7 +171405,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls" = callPackage + "tls_1_3_2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, hourglass, memory, mtl , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 @@ -170984,9 +171427,10 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls_1_3_3" = callPackage + "tls" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, async, base, bytestring , cereal, cryptonite, data-default-class, hourglass, memory, mtl , network, QuickCheck, tasty, tasty-quickcheck, transformers, x509 @@ -171005,11 +171449,9 @@ self: { base bytestring cereal cryptonite data-default-class hourglass mtl QuickCheck tasty tasty-quickcheck x509 x509-validation ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS/SSL protocol native implementation (Server and Client)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-debug_0_3_4" = callPackage @@ -171034,7 +171476,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls-debug" = callPackage + "tls-debug_0_4_0" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-system, x509-validation }: @@ -171051,9 +171493,10 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "Set of programs for TLS testing and debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "tls-debug_0_4_1" = callPackage + "tls-debug" = callPackage ({ mkDerivation, base, bytestring, cryptonite, data-default-class , network, pem, time, tls, x509, x509-store, x509-system , x509-validation @@ -171071,7 +171514,6 @@ self: { homepage = "http://github.com/vincenthz/hs-tls"; description = "Set of programs for TLS testing and debugging"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls-extra" = callPackage @@ -171328,6 +171770,7 @@ self: { homepage = "http://www.polarmobile.com/"; description = "FFI bindings to libtokyotyrant"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;}; "tomato-rubato-openal" = callPackage @@ -171341,6 +171784,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/tomato-rubato"; description = "Easy to use library for audio programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "toml" = callPackage @@ -172761,6 +173205,7 @@ self: { executableHaskellDepends = [ ALUT base ]; description = "Plays music generated by Turing machines with 5 states and 2 symbols"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {}; "turkish-deasciifier" = callPackage @@ -178278,6 +178723,7 @@ self: { ]; description = "An MPD client with vim-like key bindings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) ncurses;}; "vintage-basic" = callPackage @@ -180512,33 +180958,8 @@ self: { }: mkDerivation { pname = "wai-routes"; - version = "0.9.0"; - sha256 = "67a287a1a2347ce4239bce87ecf4b8845866b52493981a58ea4f48654d9ebd8e"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring case-insensitive containers - cookie data-default-class filepath http-types mime-types - monad-loops mtl path-pieces random template-haskell text wai - wai-app-static wai-extra - ]; - testHaskellDepends = [ - aeson base hspec hspec-wai hspec-wai-json wai wai-app-static - ]; - homepage = "https://ajnsit.github.io/wai-routes/"; - description = "Typesafe URLs for Wai applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "wai-routes_0_9_1" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring - , case-insensitive, containers, cookie, data-default-class - , filepath, hspec, hspec-wai, hspec-wai-json, http-types - , mime-types, monad-loops, mtl, path-pieces, random - , template-haskell, text, wai, wai-app-static, wai-extra - }: - mkDerivation { - pname = "wai-routes"; - version = "0.9.1"; - sha256 = "156c4c065fc94da10d6af66abf3c14d0dafb25b785d7b6d953347da6fd17dcd3"; + version = "0.9.2"; + sha256 = "5d7d4868d25e3feeeb2ab85dcf950a5f5fbbd24caf8cc5832edd47cdfbc72ccf"; libraryHaskellDepends = [ aeson base blaze-builder bytestring case-insensitive containers cookie data-default-class filepath http-types mime-types @@ -180551,7 +180972,6 @@ self: { homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-routing" = callPackage @@ -182479,7 +182899,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "webdriver" = callPackage + "webdriver_0_6_2_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, cond, data-default, directory, directory-tree , exceptions, filepath, http-client, http-types, lifted-base @@ -182503,6 +182923,33 @@ self: { homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "webdriver" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, cond, data-default, directory, directory-tree + , exceptions, filepath, http-client, http-types, lifted-base + , monad-control, mtl, network, network-uri, parallel, scientific + , temporary, text, time, transformers, transformers-base + , unordered-containers, vector, zip-archive + }: + mkDerivation { + pname = "webdriver"; + version = "0.6.3.1"; + sha256 = "69af96c4739d9d189cf8bc75a4b33a1fa525e16a062d3e8f95c578c3f35244c3"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring cond + data-default directory directory-tree exceptions filepath + http-client http-types lifted-base monad-control mtl network + network-uri scientific temporary text time transformers + transformers-base unordered-containers vector zip-archive + ]; + testHaskellDepends = [ base parallel text ]; + doCheck = false; + homepage = "https://github.com/kallisti-dev/hs-webdriver"; + description = "a Haskell client for the Selenium WebDriver protocol"; + license = stdenv.lib.licenses.bsd3; }) {}; "webdriver-angular" = callPackage @@ -184191,8 +184638,8 @@ self: { ({ mkDerivation, base, directory, random, wx, wxcore }: mkDerivation { pname = "wxAsteroids"; - version = "1.1"; - sha256 = "91fa3fe53f24d28fbbdfd6af0431471baf4b76cc77447366457829522d615d42"; + version = "1.1.0.1"; + sha256 = "45143005f69843633246948d5070e346324718d7387faf58af8df57828ee319b"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory random wx wxcore ]; @@ -184469,7 +184916,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509" = callPackage + "x509_1_6_1" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck @@ -184489,9 +184936,10 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X509 reader and writer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509_1_6_3" = callPackage + "x509" = callPackage ({ mkDerivation, asn1-encoding, asn1-parse, asn1-types, base , bytestring, containers, cryptonite, hourglass, memory, mtl, pem , tasty, tasty-quickcheck @@ -184508,11 +184956,9 @@ self: { asn1-types base bytestring cryptonite hourglass mtl tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-certificate"; description = "X509 reader and writer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "x509-store_1_5_0" = callPackage @@ -184640,7 +185086,6 @@ self: { asn1-encoding asn1-types base bytestring cryptonite directory pem x509 x509-store x509-system x509-validation ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-certificate"; description = "Utility for X509 certificate and chain"; license = stdenv.lib.licenses.bsd3; @@ -184714,7 +185159,7 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509-validation" = callPackage + "x509-validation_1_6_2" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, byteable , bytestring, containers, cryptonite, data-default-class, hourglass , memory, mtl, pem, x509, x509-store @@ -184731,9 +185176,10 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 Certificate and CRL validation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "x509-validation_1_6_3" = callPackage + "x509-validation" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, byteable , bytestring, containers, cryptonite, data-default-class, hourglass , memory, mtl, pem, x509, x509-store @@ -184750,7 +185196,6 @@ self: { homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 Certificate and CRL validation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xattr" = callPackage @@ -186128,6 +186573,7 @@ self: { homepage = "http://xmobar.org"; description = "A Minimalistic Text Based Status Bar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {Xrender = null; inherit (pkgs.xorg) libXpm; inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;}; @@ -186384,6 +186830,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/xosd"; description = "A binding to the X on-screen display"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = [ "i686-linux" "x86_64-linux" ]; }) {inherit (pkgs) xosd;}; "xournal-builder" = callPackage From d6805a820d50624519607a80ca165612e48373d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 25 Sep 2015 08:17:08 +0200 Subject: [PATCH 062/227] Drop obsolete Haskell overrides. These overrides are now hard-coded directly in hackage2nix. --- .../haskell-modules/configuration-common.nix | 33 ------------------- 1 file changed, 33 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9f7a18fa2dac..5ee7fbd603ce 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -305,40 +305,7 @@ self: super: { hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - holy-project = dontCheck super.holy-project; # http://hydra.cryp.to/build/502002/nixlog/1/raw - holy-project_0_1_1_1 = dontCheck super.holy-project_0_1_1_1; - holy-project_0_2_0_0 = dontCheck super.holy-project_0_2_0_0 ; hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; }); - http-client_0_4_11_1 = dontCheck super.http-client_0_4_11_1; - http-client_0_4_11_2 = dontCheck super.http-client_0_4_11_2; - http-client_0_4_11_3 = dontCheck super.http-client_0_4_11_3; - http-client_0_4_11 = dontCheck super.http-client_0_4_11; - http-client_0_4_12 = dontCheck super.http-client_0_4_12; - http-client_0_4_13 = dontCheck super.http-client_0_4_13; - http-client_0_4_15 = dontCheck super.http-client_0_4_15; - http-client_0_4_16 = dontCheck super.http-client_0_4_16; - http-client_0_4_18_1 = dontCheck super.http-client_0_4_18_1; - http-client_0_4_19 = dontCheck super.http-client_0_4_19; - http-client_0_4_20 = dontCheck super.http-client_0_4_20; - http-client_0_4_21 = dontCheck super.http-client_0_4_21; - http-client_0_4_22 = dontCheck super.http-client_0_4_22; - http-client_0_4_6_1 = dontCheck super.http-client_0_4_6_1; - http-client_0_4_6_2 = dontCheck super.http-client_0_4_6_2; - http-client_0_4_6 = dontCheck super.http-client_0_4_6; - http-client_0_4_7_1 = dontCheck super.http-client_0_4_7_1; - http-client_0_4_7 = dontCheck super.http-client_0_4_7; - http-client_0_4_8_1 = dontCheck super.http-client_0_4_8_1; - http-client_0_4_8 = dontCheck super.http-client_0_4_8; - http-client_0_4_9 = dontCheck super.http-client_0_4_9; - http-client = dontCheck super.http-client; # http://hydra.cryp.to/build/501430/nixlog/1/raw - http-conduit_2_1_5_1 = dontCheck super.http-conduit_2_1_5_1; - http-conduit_2_1_5 = dontCheck super.http-conduit_2_1_5; - http-conduit_2_1_7_1 = dontCheck super.http-conduit_2_1_7_1; - http-conduit_2_1_7_2 = dontCheck super.http-conduit_2_1_7_2; - http-conduit = dontCheck super.http-conduit; # http://hydra.cryp.to/build/501966/nixlog/1/raw - js-jquery_1_11_1 = dontCheck super.js-jquery_1_11_1; - js-jquery_1_11_2 = dontCheck super.js-jquery_1_11_2; - js-jquery = dontCheck super.js-jquery; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 From f546d389b60d011e3d471817578409fddd8a7873 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Wed, 23 Sep 2015 00:49:47 -0300 Subject: [PATCH 063/227] bump ghcjs-dom --- pkgs/development/haskell-modules/configuration-ghcjs.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 3a689105c1c1..59fb8b285bbb 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -78,6 +78,13 @@ self: super: { ghcjs-dom = overrideCabal super.ghcjs-dom (drv: { buildDepends = [ self.base self.mtl self.text self.ghcjs-base ]; + libraryHaskellDepends = [ ]; + src = pkgs.fetchFromGitHub { + owner = "ghcjs"; + repo = "ghcjs-dom"; + rev = "8d77202b46cbf0aed77bb1f1e8d827f27dee90d7"; + sha256 = "01npi286mwg7yr3h9qhxnylnjzbjb4lg5235v5lqfwy76hmmb9lp"; + }; }); ghc-paths = overrideCabal super.ghc-paths (drv: { From 431507d11a29a02176b7d21deb2d9e2b3b1d4e50 Mon Sep 17 00:00:00 2001 From: Renzo Carbonara Date: Thu, 24 Sep 2015 16:11:29 -0300 Subject: [PATCH 064/227] ghcjs packages: reflex, reflex-dom, dependent-sum_0_2_0_1, dependent-map_0_1_1_3, dependent-sum-template --- .../haskell-modules/configuration-ghcjs.nix | 75 +++++++++++++++++-- 1 file changed, 69 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 59fb8b285bbb..7e45edabc4a1 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -91,12 +91,75 @@ self: super: { patches = [ ./patches/ghc-paths-nix-ghcjs.patch ]; }); - reflex-dom = overrideCabal super.reflex-dom (drv: { - buildDepends = [ - self.aeson self.base self.bytestring self.containers self.data-default - self.dependent-map self.dependent-sum self.ghcjs-dom self.lens self.mtl - self.ref-tf self.reflex self.safe self.semigroups self.text self.these - self.time self.transformers + # reflex 0.3, made compatible with the newest GHCJS. + reflex = overrideCabal super.reflex (drv: { + src = pkgs.fetchFromGitHub { + owner = "k0001"; + repo = "reflex"; + rev = "e9b2f777ad07875149614e8337507afd5b1a2466"; + sha256 = "005hr3s6y369pxfdlixi4wabgav0bb653j98788kq9q9ssgijlwn"; + }; + libraryHaskellDepends = [ + self.base self.containers self.dependent-map_0_1_1_3 + self.dependent-sum_0_2_0_1 self.exception-transformers self.mtl + self.primitive self.ref-tf self.semigroups self.template-haskell + self.these self.transformers self.transformers-compat ]; }); + + # reflex-dom 0.2, made compatible with the newest GHCJS. + reflex-dom = overrideCabal super.reflex-dom (drv: { + src = pkgs.fetchFromGitHub { + owner = "k0001"; + repo = "reflex-dom"; + rev = "a117eae8e101198977611f87605a5cb2ae752fc7"; + sha256 = "18m8ng2fgsfbqdvx5jxy23ndyyhafnxflq8apg5psdz3aqkfimzh"; + }; + libraryHaskellDepends = [ + self.aeson self.base self.bifunctors self.bytestring self.containers + self.data-default self.dependent-map_0_1_1_3 self.dependent-sum_0_2_0_1 + self.dependent-sum-template self.directory + self.exception-transformers self.ghcjs-dom self.lens self.mtl self.ref-tf + self.reflex self.safe self.semigroups self.text self.these self.time + self.transformers + ]; + }); + + # required by reflex, reflex-dom + dependent-map_0_1_1_3 = self.callPackage ( + { mkDerivation, base, containers, dependent-sum_0_2_0_1, stdenv + }: + mkDerivation { + pname = "dependent-map"; + version = "0.1.1.3"; + sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4"; + libraryHaskellDepends = [ base containers dependent-sum_0_2_0_1 ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + } + ) {}; + + # required by reflex, reflex-dom + dependent-sum_0_2_0_1 = self.callPackage ( + { mkDerivation, base, stdenv + }: + mkDerivation { + pname = "dependent-sum"; + version = "0.2.1.0"; + sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; + } + ) {}; + + # required by reflex-dom + dependent-sum-template = overrideCabal super.dependent-sum-template (drv: { + libraryHaskellDepends = [ + self.base self.dependent-sum_0_2_0_1 self.template-haskell self.th-extras + ]; + }); + } From 000a2108ba10df725065004e1f3d2fb793078f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 25 Sep 2015 11:36:09 +0200 Subject: [PATCH 065/227] vorbis-tools: security patches and fix meta Patches: CVE-2014-9638, CVE-2014-9639, CVE-2015-6749, and some non-security. Also drop glibc from buildInputs. --- .../audio/vorbis-tools/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix index e4e5b7ff81a3..1f85f4423548 100644 --- a/pkgs/applications/audio/vorbis-tools/default.nix +++ b/pkgs/applications/audio/vorbis-tools/default.nix @@ -1,6 +1,12 @@ -{stdenv, fetchurl, libogg, libvorbis, libao, pkgconfig, curl, glibc -, speex, flac}: +{ stdenv, fetchurl, fetchzip, libogg, libvorbis, libao, pkgconfig, curl +, speex, flac }: +let + debPatch = fetchzip { + url = "mirror://debian/pool/main/v/vorbis-tools/vorbis-tools_1.4.0-6.debian.tar.xz"; + sha256 = "1xmmpdvxyr84lazlg23c6ck5ic97ga2rkiqabb1d98ix2zdzyqz5"; + }; +in stdenv.mkDerivation { name = "vorbis-tools-1.4.0"; src = fetchurl { @@ -8,14 +14,23 @@ stdenv.mkDerivation { sha256 = "1g12bnh5ah08v529y72kfdz5lhvy75iaz7f9jskyby23m9dkk2d3"; }; - buildInputs = [ libogg libvorbis libao pkgconfig curl speex glibc flac ]; + postPatch = '' + for patch in $(ls "${debPatch}"/patches/*.{diff,patch} | grep -v debian_subdir) + do patch -p1 < "$patch" + done + ''; - meta = { + buildInputs = [ libogg libvorbis libao pkgconfig curl speex flac ]; + + meta = with stdenv.lib; { + description = "Extra tools for Ogg-Vorbis audio codec"; longDescription = '' A set of command-line tools to manipulate Ogg Vorbis audio files, notably the `ogg123' player and the `oggenc' encoder. ''; homepage = http://xiph.org/vorbis/; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.all; }; } + From 59bc47c9ede58f3cdfdfea18297375627ac99c6c Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Tue, 22 Sep 2015 15:49:17 +0200 Subject: [PATCH 066/227] nixos networking: add vswitch option Add a configuration option for Open vSwitch that is similar to the option for the Linux kernel ethernet bridge. --- nixos/modules/services/networking/dhcpcd.nix | 1 + .../tasks/network-interfaces-scripted.nix | 40 ++++++++++ .../tasks/network-interfaces-systemd.nix | 3 + nixos/modules/tasks/network-interfaces.nix | 80 ++++++++++++++++++- 4 files changed, 123 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 8552395fdb16..b31d479ab4fd 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -18,6 +18,7 @@ let map (i: i.name) (filter (i: if i.useDHCP != null then !i.useDHCP else i.ip4 != [ ] || i.ipAddress != null) interfaces) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) + ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.vswitches)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) ++ config.networking.dhcpcd.denyInterfaces; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 328d94cbb05c..d8b1592c36bb 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -220,6 +220,45 @@ in ''; }); + createVswitchDevice = n: v: nameValuePair "${n}-netdev" + (let + managedInterfaces = filter (x: hasAttr x cfg.interfaces) v.interfaces; + managedInterfaceServices = concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) managedInterfaces; + virtualInterfaces = filter (x: (hasAttr x cfg.interfaces) && cfg.interfaces.${x}.virtual) v.interfaces; + virtualInterfaceServices = concatMap (i: [ "${i}-netdev.service" ]) virtualInterfaces; + deps = map subsystemDevice v.interfaces; + ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules; + in + { description = "Open vSwitch Interface ${n}"; + wantedBy = [ "network.target" "vswitchd.service" (subsystemDevice n) ]; + requires = optionals v.bindInterfaces (deps ++ managedInterfaceServices ++ virtualInterfaceServices); + requiredBy = optionals v.bindInterfaces (managedInterfaceServices ++ virtualInterfaceServices); + bindsTo = deps ++ [ "vswitchd.service" ]; + partOf = [ "vswitchd.service" ]; + after = [ "network-pre.target" "vswitchd.service" ] ++ deps ++ managedInterfaceServices ++ virtualInterfaceServices; + before = [ "network-interfaces.target" (subsystemDevice n) ]; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + path = [ pkgs.iproute config.virtualisation.vswitch.package ]; + script = '' + echo "Removing old Open vSwitch ${n}..." + ovs-vsctl --if-exists del-br ${n} + + echo "Adding Open vSwitch ${n}..." + ovs-vsctl -- add-br ${n} ${concatMapStrings (i: " -- add-port ${n} ${i}") v.interfaces} \ + ${concatMapStrings (x: " -- set-controller ${n} " + x) v.controllers} \ + ${concatMapStrings (x: " -- " + x) (splitString "\n" v.extraOvsctlCmds)} + + echo "Adding OpenFlow rules for Open vSwitch ${n}..." + ovs-ofctl add-flows ${n} ${ofRules} + ''; + postStop = '' + ip link set ${n} down || true + ovs-ofctl del-flows ${n} || true + ovs-vsctl --if-exists del-br ${n} + ''; + }); + createBondDevice = n: v: nameValuePair "${n}-netdev" (let deps = map subsystemDevice v.interfaces; @@ -335,6 +374,7 @@ in map configureAddrs interfaces ++ map createTunDevice (filter (i: i.virtual) interfaces)) // mapAttrs' createBridgeDevice cfg.bridges + // mapAttrs' createVswitchDevice cfg.vswitches // mapAttrs' createBondDevice cfg.bonds // mapAttrs' createMacvlanDevice cfg.macvlans // mapAttrs' createSitDevice cfg.sits diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 8223c5a4941e..301ee43fd0e5 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -35,6 +35,9 @@ in assertions = [ { assertion = cfg.defaultGatewayWindowSize == null; message = "networking.defaultGatewayWindowSize is not supported by networkd."; + } { + assertion = cfg.vswitches == {}; + message = "networking.vswichtes are not supported by networkd."; } ] ++ flip mapAttrsToList cfg.bridges (n: { rstp, ... }: { assertion = !rstp; message = "networking.bridges.${n}.rstp is not supported by networkd."; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9931c977e8f0..7af3160e2d42 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -12,7 +12,8 @@ let hasBonds = cfg.bonds != { }; slaves = concatMap (i: i.interfaces) (attrValues cfg.bonds) - ++ concatMap (i: i.interfaces) (attrValues cfg.bridges); + ++ concatMap (i: i.interfaces) (attrValues cfg.bridges) + ++ concatMap (i: i.interfaces) (attrValues cfg.vswitches); slaveIfs = map (i: cfg.interfaces.${i}) (filter (i: cfg.interfaces ? ${i}) slaves); @@ -371,6 +372,81 @@ in options = [ interfaceOpts ]; }; + networking.vswitches = mkOption { + default = { }; + example = + { vs0.interfaces = [ "eth0" "eth1" ]; + vs1.interfaces = [ "eth2" "wlan0" ]; + }; + description = + '' + This option allows you to define Open vSwitches that connect + physical networks together. The value of this option is an + attribute set. Each attribute specifies a vswitch, with the + attribute name specifying the name of the vswitch's network + interface. + ''; + + type = types.attrsOf types.optionSet; + + options = { + + interfaces = mkOption { + example = [ "eth0" "eth1" ]; + type = types.listOf types.str; + description = + "The physical network interfaces connected by the vSwitch."; + }; + + bindInterfaces = mkOption { + type = types.bool; + default = false; + description = '' + If true, then the interfaces of the vSwitch are brought 'up' and especially + also 'down' together with the vSwitch. That requires that every interfaces + is configured as a systemd network services. + ''; + }; + + controllers = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ptcp:6653:[::1]" ]; + description = '' + Specify the controller targets. For the allowed options see man 8 ovs-vsctl. + ''; + }; + + openFlowRules = mkOption { + type = types.lines; + default = ""; + example = '' + actions=normal + ''; + description = '' + OpenFlow rules to insert into the Open vSwitch. All openFlowRules are + loaded with ovs-ofctl within one atomic operation. + ''; + }; + + extraOvsctlCmds = mkOption { + type = types.lines; + default = ""; + example = '' + set-fail-mode secure + set Bridge stp_enable=true + ''; + description = '' + Commands to manipulate the Open vSwitch database. Every line executed with ovs-vsctl. + All commands are bundled together with the operations for adding the interfaces + into one atomic operation. + ''; + }; + + }; + + }; + networking.bridges = mkOption { default = { }; example = @@ -766,6 +842,8 @@ in services.mstpd = mkIf needsMstpd { enable = true; }; + virtualisation.vswitch = mkIf (cfg.vswitches != { }) { enable = true; }; + }; } From baf1d1dcd77a66450adb54e22b5748566b06a8d7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 25 Sep 2015 12:06:58 +0200 Subject: [PATCH 067/227] nixos/tests/virtualbox: Don't parallelize VM boot. I'm not quite sure why the official Hydra gets a kernel panic in one of two VMs using the exact same kernels: https://hydra.nixos.org/build/26339384 Because the kernel panic happens before stage 1, let's wait for the first VM to boot up and after the bootup is done, start the second one in hope that it won't trigger the panic. Oddly enough, whenever I run the test on my own Hydra and on my local machines, I don't get anything like that. Signed-off-by: aszlig --- nixos/tests/virtualbox.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index 2b5b5a180fca..01fcd15fd8bb 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -424,11 +424,10 @@ in { vbm("startvm test1"); waitForStartup_test1; + waitForVMBoot_test1; vbm("startvm test2"); waitForStartup_test2; - - waitForVMBoot_test1; waitForVMBoot_test2; $machine->screenshot("net_booted"); From 592f0f7eadbf3db956aa832ca91496a09dd1acb7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 25 Sep 2015 13:37:37 +0200 Subject: [PATCH 068/227] firefox: Drop crash_OTMC+GTK3.patch. The patch only applies for Firefox versions between 37.0 and 40.1. Because we're on version 41.0 the changes are already included upstream and thus the patch doesn't apply and is even unnecessary. As for version 38.3 for ESR, the patch doesn't apply as well if compiled with enableGTK3. Of course, this is a bit unfortunate but I don't have the time right now to properly rebase the patch on 38.3. Signed-off-by: aszlig Reported-by: devhell <"^"@regexmail.net> --- .../networking/browsers/firefox/default.nix | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ce5eac7a2ff8..9f027a25c175 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -4,7 +4,7 @@ , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite , hunspell, libevent, libstartup_notification, libvpx , cairo, gstreamer, gst_plugins_base, icu, libpng, jemalloc, libpulseaudio -, enableGTK3 ? false, fetchpatch +, enableGTK3 ? false , debugBuild ? false , # If you want the resulting program to call itself "Firefox" instead # of "Shiretoko" or whatever, enable this option. However, those @@ -28,17 +28,6 @@ common = { pname, version, sha1 }: stdenv.mkDerivation rec { inherit sha1; }; - patches = if !enableGTK3 then null else [(fetchpatch { - name = "crash_OTMC+GTK3.patch"; - # backported from 40.1 - # https://bugzilla.mozilla.org/show_bug.cgi?id=1127752 - # https://bugzilla.redhat.com/show_bug.cgi?id=1256875 - url = "http://pkgs.fedoraproject.org/cgit/firefox.git/plain/" - + "mozilla-1127752.patch?id=571fefe2c8f741b92c865e9122af56f6258b3fc1"; - sha256 = "04yq4lcq8ln2fmknz4c0zah77wxqp2mcgr8pjx860dmcmzvyi3p5"; - })]; - patchFlags = "-p2"; - buildInputs = [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi From 48200a96e0063fa25132d1e5907ab1271f3205ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 25 Sep 2015 14:24:47 +0200 Subject: [PATCH 069/227] doc/release notes (15.09): mention `texlive` --- nixos/doc/manual/release-notes/rl-1509.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 098613f9685a..93c75aa6269b 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -243,6 +243,18 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.cabal-install + + A newly packaged TeX Live 2015 is provided in pkgs.texlive, + split into 6500 nix packages. For basic user documentation see + the source. + Beware of an issue when installing a too large package set. + + The plan is to deprecate and maybe delete the original TeX packages + until the next release. + + From 9142c02cb97d1b5dbb83f6032df55025b050141e Mon Sep 17 00:00:00 2001 From: obadz Date: Wed, 23 Sep 2015 13:00:26 +0100 Subject: [PATCH 070/227] pithos: 1.0.1 -> 1.1.1 --- pkgs/applications/audio/pithos/default.nix | 37 ++++++++++------------ 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index bb863d2501ce..0483882ccb09 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -1,40 +1,35 @@ -# Based on Richard Wallace's post here: http://comments.gmane.org/gmane.linux.distributions.nixos/14734 +{ fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify, gst_all_1 }: -{ fetchurl, stdenv, pythonPackages, gtk3, libnotify, gst_all_1 }: pythonPackages.buildPythonPackage rec { name = "pithos-${version}"; - version = "1.0.1"; + version = "1.1.1"; - src = fetchurl { - url = "https://github.com/pithos/pithos/archive/${version}.tar.gz"; - sha256 = "67b83927d5111067aefbf034d23880f96b1a2d300464e8491efa80e97e67f50f"; + src = fetchFromGitHub { + owner = "pithos"; + repo = "pithos"; + rev = version; + sha256 = "0373z7g1wd3g1xl8m4ipx5n2ka67a2wcn387nyk8yvgdikm14jm3"; }; postPatch = '' substituteInPlace setup.py --replace "/usr/share" "$out/share" ''; - buildInputs = with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad libnotify ]; - - pythonPath = with pythonPackages; [ pygobject3 dbus pylast ]; - - propogatedBuildInputs = pythonPath; + propagatedBuildInputs = + [ gtk3 gobjectIntrospection libnotify ] ++ + (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad ]) ++ + (with pythonPackages; [ pygobject3 pylast ]); postInstall = '' - wrapProgram "$out/bin/pithos" --prefix GST_PLUGIN_SYSTEM_PATH_1_0 ":" "$GST_PLUGIN_SYSTEM_PATH_1_0" + wrapProgram "$out/bin/pithos" \ + --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" ''; meta = with stdenv.lib; { - description = "Pandora player"; - - longDescription = '' - Pandora Internet Radio player for GNOME - ''; - - homepage = http://pithos.github.io/ ; - + description = "Pandora Internet Radio player for GNOME"; + homepage = http://pithos.github.io/; license = licenses.gpl3; - maintainers = with maintainers; [ obadz ]; }; } From bc2dc7de5e4d8c073b9adf28176516fa968a3d34 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:30:59 +0200 Subject: [PATCH 071/227] bwm_ng: 0.6 -> 0.6.1 --- pkgs/tools/networking/bwm-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 6fa0c20b0acd..91eec73b9dca 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "bwm-ng-0.6"; + name = "bwm-ng-0.6.1"; src = fetchurl { url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; - sha256 = "1pgzc8y2y73n72qvbd2g0dkbkw5h0f83k5h9id1rsck8w9c464y1"; + sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; }; buildInputs = [ ncurses ]; From 8ca7e4c2d1b5ace88660bdf86760982cd500cc65 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:33:42 +0200 Subject: [PATCH 072/227] bwm_ng: Move version to own variable --- pkgs/tools/networking/bwm-ng/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/bwm-ng/default.nix b/pkgs/tools/networking/bwm-ng/default.nix index 91eec73b9dca..353425108a2e 100644 --- a/pkgs/tools/networking/bwm-ng/default.nix +++ b/pkgs/tools/networking/bwm-ng/default.nix @@ -1,8 +1,11 @@ { stdenv, fetchurl, ncurses }: +let + version = "0.6.1"; +in stdenv.mkDerivation rec { - name = "bwm-ng-0.6.1"; - + name = "bwm-ng-${version}"; + src = fetchurl { url = "http://www.gropp.org/bwm-ng/${name}.tar.gz"; sha256 = "1w0dwpjjm9pqi613i8glxrgca3rdyqyp3xydzagzr5ndc34z6z02"; @@ -42,7 +45,7 @@ stdenv.mkDerivation rec { This was influenced by the old bwm util written by Barney (barney@freewill.tzo.com) which had some issues with faster interfaces and was very simple. Since i had almost all code done anyway for other projects, i decided to create my own version. I actually don't know if netstat input is useful at all. I saw this elsewhere, so i added it. Its target is "netstat 1.42 (2001-04-15)" linux or Free/Open/netBSD. If there are other formats i would be happy to add them. - + (from homepage) ''; }; From 0a818afe22ca207e3304c357b7429c159b8f9b31 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:37:16 +0200 Subject: [PATCH 073/227] joe: 4.0 -> 4.1 --- pkgs/applications/editors/joe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 9f4d56bf8ad4..14cfd81586ca 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "joe-4.0"; + name = "joe-4.1"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; - sha256 = "0599xp90idl3dkplz72p33d2rfg0hb5yd38rhqdvz5zxfzzssmn5"; + sha256 = "1nznzr9h0rh8g15c56yxzwpn2labx9sgsak0wcnpj7wmpnr12ql1"; }; meta = with stdenv.lib; { From 1adaab27e2863d639686de7b589f44621a225242 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:40:28 +0200 Subject: [PATCH 074/227] joe: Move version to own variable --- pkgs/applications/editors/joe/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/joe/default.nix b/pkgs/applications/editors/joe/default.nix index 14cfd81586ca..b08f98a054c2 100644 --- a/pkgs/applications/editors/joe/default.nix +++ b/pkgs/applications/editors/joe/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl } : stdenv.mkDerivation rec { - name = "joe-4.1"; + version = "4.1"; + name = "joe-${version}"; src = fetchurl { url = "mirror://sourceforge/joe-editor/${name}.tar.gz"; From bea75f4c781d2637d48a7c6b392e4ed388c54457 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 25 Sep 2015 15:47:57 +0200 Subject: [PATCH 075/227] libgit2: 0.21.2 -> 0.23.2 --- pkgs/development/libraries/git2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index 823f09b8bced..3f0412bf8397 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}: stdenv.mkDerivation rec { - version = "0.21.2"; + version = "0.23.2"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "0icf119lhha96rk8m6s38sczjr0idr7yczw6knby61m81a25a96y"; + sha256 = "1d3901bmgvdnmzrx21afi1d0llsqmca3ckj942p0i2wpdpr1kbcp"; }; cmakeFlags = "-DTHREADSAFE=ON"; From 0c95190fff80db7cf526109b01a466108eb2616c Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Fri, 25 Sep 2015 19:36:23 +0300 Subject: [PATCH 076/227] qtox: fix git hash revision --- .../networking/instant-messengers/qtox/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 5c8a03eb8efc..5863eb0d8055 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -2,12 +2,16 @@ libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: +let + revision = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; +in + stdenv.mkDerivation rec { name = "qtox-dev-20150821"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; - rev = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; + rev = "${revision}"; md5 = "b2f9cf283136b6e558876ca2e6d128a3"; }; @@ -21,6 +25,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; preConfigure = '' + # patch .pro file for proper set of the git hash + sed -i '/git rev-parse/d' qtox.pro + sed -i 's/$$quote($$GIT_VERSION)/${revision}/' qtox.pro + # since .pro have hardcoded paths, we need to explicitly set paths here export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags glib-2.0)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gdk-pixbuf-2.0)" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags gtk+-2.0)" @@ -44,9 +52,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "QT Tox client"; + description = "Qt Tox client"; license = licenses.gpl3; - maintainers = with maintainers; [ viric jgeerds ]; + maintainers = with maintainers; [ viric jgeerds akaWolf ]; platforms = platforms.all; }; } From 1bfa084cdc51fa8bcaee4225c9e0a0d2923b8bb0 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Fri, 25 Sep 2015 19:47:51 +0300 Subject: [PATCH 077/227] qtox: 20150821 -> 20150925 --- .../networking/instant-messengers/qtox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index 5863eb0d8055..170702e44d13 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -3,16 +3,16 @@ pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper }: let - revision = "2f6b5e052f2a625d506e83f880c5d68b49118f95"; + revision = "1673b43e26c853f6446f228fec083af166cbf446"; in stdenv.mkDerivation rec { - name = "qtox-dev-20150821"; + name = "qtox-dev-20150925"; src = fetchgit { url = "https://github.com/tux3/qTox.git"; rev = "${revision}"; - md5 = "b2f9cf283136b6e558876ca2e6d128a3"; + md5 = "785f5b305cdcdf777d93ee823a5b9f49"; }; buildInputs = From 2549373cb9b33866452e93a404f80adf4030c36b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Fri, 25 Sep 2015 22:16:43 +0300 Subject: [PATCH 078/227] fio: Minor refactor - Use postPatch for patching, so don't need to manually override configurePhase and installPhase. - Add python to buildInputs, so fio2gnuplot gets patchShebangs'd. - Add platforms, so it gets built by Hydra. --- pkgs/tools/system/fio/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 6e1d899d6b50..8589cbe92363 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libaio, zlib }: +{ stdenv, fetchFromGitHub, libaio, python, zlib }: let version = "2.2.10"; in @@ -12,23 +12,18 @@ stdenv.mkDerivation rec { sha256 = "0hg72k8cifw6lc46kyiic7ai4gqn2819d6g998vmx01jnlcixp8q"; }; - buildInputs = [ libaio zlib ]; + buildInputs = [ libaio python zlib ]; enableParallelBuilding = true; - configurePhase = '' - substituteInPlace tools/plot/fio2gnuplot \ - --replace /usr/share/fio $out/share/fio - ./configure + postPatch = '' + substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio ''; - installPhase = '' - make install prefix=$out - ''; - - meta = { + meta = with stdenv.lib; { homepage = "http://git.kernel.dk/?p=fio.git;a=summary"; description = "Flexible IO Tester - an IO benchmark tool"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; + platforms = platforms.linux; }; } From 84c0098117e329ef370153a1ecaa19ee72f336b5 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Sat, 26 Sep 2015 00:42:16 +0300 Subject: [PATCH 079/227] Unprivileged overlayfs mounts kernel patch from ubuntu This allows to create overlayfs mounts by unprivileged containers (i.e. in user and mount namespace). It's super-useful for containers. The patch is trivial as I understand from the patch description it's does not have security implications (on top of what user namespaces already have). And it's enabled in ubuntu long time ago. Here is a proof: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1357025 --- pkgs/os-specific/linux/kernel/patches.nix | 5 ++ .../ubuntu-unprivileged-overlayfs.patch | 69 +++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 18e73ae68d45..de1b16347e16 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -68,6 +68,11 @@ rec { patch = ./ubuntu-fan-4.patch; }; + ubuntu_unprivileged_overlayfs = + { name = "ubuntu-unprivileged-overlayfs"; + patch = ./ubuntu-unprivileged-overlayfs.patch; + }; + tuxonice_3_10 = makeTuxonicePatch { version = "2013-11-07"; kernelVersion = "3.10.18"; diff --git a/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch new file mode 100644 index 000000000000..cfa8009e71ef --- /dev/null +++ b/pkgs/os-specific/linux/kernel/ubuntu-unprivileged-overlayfs.patch @@ -0,0 +1,69 @@ +From 7415cb7b31569e9266229d4ebc79ccec4841ab04 Mon Sep 17 00:00:00 2001 +From: Serge Hallyn +Date: Fri, 7 Feb 2014 09:32:46 -0600 +Subject: [PATCH] UBUNTU: SAUCE: Overlayfs: allow unprivileged mounts + +Unprivileged mounting, here, refers to root in a non-initial user +namespace performing the mount. In particular, it requires +CAP_SYS_ADMIN toward the task's mounts namespace, alleviating +the concerns of manipulating mount environment for setuid-root +binaries on the host. + +We refuse unprivileged mounting of most filesystem types because +we do not trust the in-kernel superblock parsers to correctly +handle malicious input. + +However, overlayfs does not parse any user-provided data other +than the pathnames passed in. Therefore unprivileged mounting +of overlayfs should be safe. + +Allowing unprivileged mounting of overlayfs filesystems would +allow Ubuntu Trusty users to create overlayfs-based container +snapshots, which would be a huge usability improvement. + +This patch enables unprivileged mounting of overlayfs. + +I tested a few simple combinations, and found that, when +doing (the equivalent of) + +mount -t overlayfs -oupperdir=u,lowerdir=l l t + +(u for upper, l for lower, t for target), + +1. overlayfs mount is always allowed, regardless of ownership +of u, l, or t. However + +2. Creation of new files is allowed so long as u is owned by + T. Otherwise, regardless of ownerships of l and t it is + denied. (This is expected; t was the mountpoint and + 'disapears', so its ownership is irrelevant) + +3. modification of a file 'hithere' which is in l but not yet + in u, and which is not owned by T, is not allowed, even if + writes to u are allowed. This may be a bug in overlayfs, + but it is safe behavior. It also will not cause a problem + for lxc since lxc will ensure that files are mapped into T's + namespace. + +Signed-off-by: Serge Hallyn +Signed-off-by: Tim Gardner +Signed-off-by: Andy Whitcroft +--- + fs/overlayfs/super.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c +index 9473e79..50890c2 100644 +--- a/fs/overlayfs/super.c ++++ b/fs/overlayfs/super.c +@@ -668,6 +668,7 @@ static struct file_system_type ovl_fs_type = { + .name = "overlayfs", + .mount = ovl_mount, + .kill_sb = kill_anon_super, ++ .fs_flags = FS_USERNS_MOUNT, + }; + MODULE_ALIAS_FS("overlayfs"); + +-- +2.1.0.rc1 + From eebe362911f5e41e7d2e47d16808eeb05b2895d9 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Wed, 23 Sep 2015 22:08:05 -0400 Subject: [PATCH 080/227] xfce.thunar-archive-plugin: init at 0.3.1 (close #10029) A `thunar` plugin that adds archive manipulation features to right click on file/directory menu. It can use either gnome or kde archive managers. Detection of backend based on `*.desktop` files mime types. Should supercede non-functional pre-existing `xfce.thunar_archive_plugin` (which for some unknown reason is building the volume manager plugin). Also removed `xfce.thunar_archive_plugin` because superceded. Tests: - When plugin package is installed, the supplementary menu entries appear in thunar. - Succesfully extracted an archive using backend `file-roller` through thunar menu entry. + minor changes from vcunat, mainly meta. --- .../xfce/core/thunar-archive-plugin.nix | 25 -------- pkgs/desktops/xfce/default.nix | 6 +- .../xfce/thunar-plugins/archive/default.nix | 58 +++++++++++++++++++ 3 files changed, 62 insertions(+), 27 deletions(-) delete mode 100644 pkgs/desktops/xfce/core/thunar-archive-plugin.nix create mode 100644 pkgs/desktops/xfce/thunar-plugins/archive/default.nix diff --git a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix b/pkgs/desktops/xfce/core/thunar-archive-plugin.nix deleted file mode 100644 index 62a90578bd30..000000000000 --- a/pkgs/desktops/xfce/core/thunar-archive-plugin.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, thunar, intltool, exo, gtk, udev, libxfce4ui, libxfce4util, xfconf }: - -stdenv.mkDerivation rec { - name = "thunar-archive-plugin-${version}"; - maj_ver = "0.3"; - version = "${maj_ver}.1"; - - src = fetchurl { - url = "mirror://xfce/src/thunar-plugins/${name}/${maj_ver}/${name}.tar.bz2"; - sha256 = "1sxw09fwyn5sr6ipxk7r8gqjyf41c2v7vkgl0l6mhy5mcb48f27z"; - }; - - buildInputs = [ pkgconfig thunar intltool exo gtk udev libxfce4ui libxfce4util xfconf ]; - enableParallelBuilding = true; - - preFixup = "rm $out/share/icons/hicolor/icon-theme.cache"; - - meta = { - homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; - description = "The Thunar Archive Plugin allows you to create and extract archive files using the file context menus in the Thunar file manager"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.iElectric ]; - }; -} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index a9903c941bfe..5fdab2ab81e6 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -26,8 +26,10 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od libxfcegui4 = callPackage ./core/libxfcegui4.nix { }; thunar = callPackage ./core/thunar.nix { }; thunar_volman = callPackage ./core/thunar-volman.nix { }; # ToDo: probably inside Thunar now - thunar_archive_plugin = callPackage ./core/thunar-archive-plugin.nix { }; - thunar-dropbox-plugin = callPackage ./thunar-plugins/dropbox { }; + thunar-archive-plugin + = callPackage ./thunar-plugins/archive { }; + thunar-dropbox-plugin + = callPackage ./thunar-plugins/dropbox { }; tumbler = callPackage ./core/tumbler.nix { }; xfce4panel = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4 xfce4session = callPackage ./core/xfce4-session.nix { }; diff --git a/pkgs/desktops/xfce/thunar-plugins/archive/default.nix b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix new file mode 100644 index 000000000000..78e5f5002cd4 --- /dev/null +++ b/pkgs/desktops/xfce/thunar-plugins/archive/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub, pkgconfig, xfce4_dev_tools +, gtk +, thunar +, exo, libxfce4util, libxfce4ui +, xfconf, udev, libnotify +}: + +stdenv.mkDerivation rec { + p_name = "thunar-archive-plugin"; + ver_maj = "0.3"; + ver_min = "1"; + name = "${p_name}-${ver_maj}.${ver_min}"; + + src = fetchFromGitHub { + owner = "xfce-mirror"; + repo = p_name; + rev = "72b23eefc348bee31e06a04f968e430bc7dfa51e"; + sha256 = "0l8715x23qmk0jkywiza3qx0xxmafxi4grp7p82kkc5df5ccs8kx"; + }; + + buildInputs = [ + pkgconfig + xfce4_dev_tools + thunar + exo gtk libxfce4util libxfce4ui + xfconf udev libnotify + ]; + + preConfigure = '' + ./autogen.sh + ''; + + /* + File roller `*.desktop` situation + --------------------------------- + + For some odd reason, in nix os, gnome file-roller's desktop file has the non-standard name + `org.gnome.FileRoller.desktop`. In order to be compatible with this odd context, create + a `*.tap` file of the same name. + + IMPORTANT: Adapt or remove the symbolic link if the situation changes. + */ + preFixup = '' + pushd $out/libexec/thunar-archive-plugin > /dev/null + ln -s ./file-roller.tap org.gnome.FileRoller.tap + popd > /dev/null + rm $out/share/icons/hicolor/icon-theme.cache + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://foo-projects.org/~benny/projects/thunar-archive-plugin/; + description = "Thunar plugin providing file context menus for archives"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} From 1f73d482d6c837f92bb5aa4dc50097baa1873418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 26 Sep 2015 09:29:13 +0200 Subject: [PATCH 081/227] beets: fix tarball evaluation by asserting isLinux /cc #10069. --- pkgs/tools/audio/beets/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 8c693d9145fb..51e81ef9193e 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -136,7 +136,7 @@ in buildPythonPackage rec { runHook preCheck LANG=en_US.UTF-8 \ - LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive \ + LOCALE_ARCHIVE=${assert stdenv.isLinux; glibcLocales}/lib/locale/locale-archive \ BEETS_TEST_SHELL="${testShell}" \ BASH_COMPLETION_SCRIPT="${completion}" \ HOME="$(mktemp -d)" \ @@ -168,5 +168,6 @@ in buildPythonPackage rec { homepage = http://beets.radbox.org; license = licenses.mit; maintainers = with maintainers; [ aszlig iElectric pjones ]; + platforms = platforms.linux; }; } From 02c25001953eaebbdea13fb28a865c958860ce97 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 26 Sep 2015 11:00:02 +0200 Subject: [PATCH 082/227] release-notes/15.09: Use